THRIFT-2355 Add SSL and Web Socket Support to Node and JavaScript
Patch: Randy Abernethy
diff --git a/lib/js/Gruntfile.js b/lib/js/Gruntfile.js
index 9a8bb0d..321063f 100644
--- a/lib/js/Gruntfile.js
+++ b/lib/js/Gruntfile.js
@@ -40,8 +40,14 @@
InstallThriftJS: {
command: 'mkdir test/build; mkdir test/build/js; cp src/thrift.js test/build/js/thrift.js'
},
+ InstallThriftNodeJSDep: {
+ command: 'cd ../nodejs; npm install'
+ },
ThriftGen: {
command: 'thrift -gen js -gen js:node -o test ../../test/ThriftTest.thrift'
+ },
+ ThriftGenJQ: {
+ command: 'thrift -gen js:jquery -gen js:node -o test ../../test/ThriftTest.thrift'
}
},
external_daemon: {
@@ -50,19 +56,73 @@
startCheck: function(stdout, stderr) {
return (/Thrift Server running on port/).test(stdout);
},
- nodeSpawnOptions: {cwd: "test"}
+ nodeSpawnOptions: {
+ cwd: "test",
+ env: {NODE_PATH: "../../nodejs/lib:../../nodejs/node_modules"}
+ }
},
cmd: "node",
args: ["server_http.js"]
+ },
+ ThriftTestServer_TLS: {
+ options: {
+ startCheck: function(stdout, stderr) {
+ return (/Thrift Server running on port/).test(stdout);
+ },
+ nodeSpawnOptions: {
+ cwd: "test",
+ env: {NODE_PATH: "../../nodejs/lib:../../nodejs/node_modules"}
+ }
+ },
+ cmd: "node",
+ args: ["server_https.js"]
}
},
qunit: {
- all: {
+ ThriftJS: {
options: {
urls: [
'http://localhost:8088/test-nojq.html'
]
}
+ },
+ ThriftJSJQ: {
+ options: {
+ urls: [
+ 'http://localhost:8088/test.html'
+ ]
+ }
+ },
+ ThriftWS: {
+ options: {
+ urls: [
+ 'http://localhost:8088/testws.html'
+ ]
+ }
+ },
+ ThriftJS_TLS: {
+ options: {
+ '--ignore-ssl-errors': true,
+ urls: [
+ 'https://localhost:8089/test-nojq.html'
+ ]
+ }
+ },
+ ThriftJSJQ_TLS: {
+ options: {
+ '--ignore-ssl-errors': true,
+ urls: [
+ 'https://localhost:8089/test.html'
+ ]
+ }
+ },
+ ThriftWS_TLS: {
+ options: {
+ '--ignore-ssl-errors': true,
+ urls: [
+ 'https://localhost:8089/testws.html'
+ ]
+ }
}
},
jshint: {
@@ -87,6 +147,15 @@
grunt.loadNpmTasks('grunt-external-daemon');
grunt.loadNpmTasks('grunt-shell');
- grunt.registerTask('test', ['jshint', 'shell', 'external_daemon', 'qunit']);
- grunt.registerTask('default', ['jshint', 'shell', 'external_daemon', 'qunit', 'concat', 'uglify', 'jsdoc']);
+ grunt.registerTask('test', ['jshint', 'shell:InstallThriftJS', 'shell:InstallThriftNodeJSDep', 'shell:ThriftGen',
+ 'external_daemon:ThriftTestServer', 'external_daemon:ThriftTestServer_TLS',
+ 'qunit:ThriftJS', 'qunit:ThriftJS_TLS',
+ 'shell:ThriftGenJQ', 'qunit:ThriftJSJQ', 'qunit:ThriftJSJQ_TLS'
+ ]);
+ grunt.registerTask('default', ['jshint', 'shell:InstallThriftJS', 'shell:InstallThriftNodeJSDep', 'shell:ThriftGen',
+ 'external_daemon:ThriftTestServer', 'external_daemon:ThriftTestServer_TLS',
+ 'qunit:ThriftJS', 'qunit:ThriftJS_TLS',
+ 'shell:ThriftGenJQ', 'qunit:ThriftJSJQ', 'qunit:ThriftJSJQ_TLS',
+ 'concat', 'uglify', 'jsdoc'
+ ]);
};