#251 Make all tests use port 9001 stop server,

at least when all succeed.
webgme · Mar 18, 2015 · 1403dd3 · 1403dd3
1 parent 358feaa
commit 1403dd3
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 20 deletions.
diff --git a/test/addon/core/TestAddOn.spec.js b/test/addon/core/TestAddOn.spec.js
@@ -49,7 +49,6 @@ describe('TestAddOn', function () {
                 gmeConfig: gmeConfig,
                 storage: null
             };
-        gmeConfig.server.port = 9001;
         server = WebGME.standaloneServer(gmeConfig);
         server.start(function () {
             getConnectedStorage('sessionId', gmeConfig, function (err, storage) {
@@ -72,7 +71,7 @@ describe('TestAddOn', function () {
                         };
                         addon.start(startParam, function (err) {
                             expect(err).equal(null);
-                            done();
+                            server.stop(done);
                         });
                     });
 

diff --git a/test/client/js/client.basic.js b/test/client/js/client.basic.js
@@ -25,7 +25,6 @@ describe('Client tests', function () {
 
         testTerritory;
 
-    gmeConfig.server.port = 9003;
     gmeConfig.addOn.enable = true;
 
     requirejs.config({

diff --git a/test/common/util/opencontext.spec.js b/test/common/util/opencontext.spec.js
@@ -274,7 +274,6 @@ describe('openContext', function () {
                 gmeConfig: gmeConfig,
                 storage: null
             };
-            gmeConfig.server.port = 9001;
             server = WebGME.standaloneServer(gmeConfig);
             server.start(function (err) {
                 storage = new WebGME.clientStorage({
@@ -314,7 +313,6 @@ describe('openContext', function () {
                     });
                 });
             });
-
         });
 
         it('should open existing project', function (done) {

diff --git a/test/issue/171_nonexistent_branch_crash.js b/test/issue/171_nonexistent_branch_crash.js
@@ -26,7 +26,6 @@ describe('issue 171 server crashes when trying to switch to non-existent branch'
         }
     });
 
-    gmeConfig.server.port = 9003;
     server = new WebGME.standaloneServer(gmeConfig);
     ClientClass = requirejs('client/js/client');
 

diff --git a/test/middleware/blob/Artifact.spec.js b/test/middleware/blob/Artifact.spec.js
@@ -24,7 +24,6 @@ describe('Artifact', function () {
         before(function (done) {
             // we have to set the config here
             var gmeConfig = testFixture.getGmeConfig();
-            gmeConfig.server.port = 9006;
             gmeConfig.server.https.enable = false;
             serverBaseUrl = 'http://127.0.0.1:' + gmeConfig.server.port;
             bcParam.serverPort = gmeConfig.server.port;

diff --git a/test/middleware/blob/BlobClient.spec.js b/test/middleware/blob/BlobClient.spec.js
@@ -24,7 +24,6 @@ describe('BlobClient', function () {
         before(function (done) {
             // we have to set the config here
             var gmeConfig = testFixture.getGmeConfig();
-            gmeConfig.server.port = 9006;
             gmeConfig.server.https.enable = false;
             serverBaseUrl = 'http://127.0.0.1:' + gmeConfig.server.port;
             bcParam.serverPort = gmeConfig.server.port;
@@ -331,7 +330,6 @@ describe('BlobClient', function () {
             // we have to set the config here
             nodeTLSRejectUnauthorized = process.env.NODE_TLS_REJECT_UNAUTHORIZED;
             var gmeConfig = testFixture.getGmeConfig();
-            gmeConfig.server.port = 9006;
             gmeConfig.server.https.enable = true;
             serverBaseUrl = 'https://127.0.0.1:' + gmeConfig.server.port;
             bcParam.serverPort = gmeConfig.server.port;

diff --git a/test/middleware/blob/BlobServer.spec.js b/test/middleware/blob/BlobServer.spec.js
@@ -22,7 +22,6 @@ describe('BlobServer', function () {
     beforeEach(function (done) {
         // we have to set the config here
         var gmeConfig = testFixture.getGmeConfig();
-        gmeConfig.server.port = 9006;
         gmeConfig.server.https.enable = false;
         serverBaseUrl = 'http://127.0.0.1:' + gmeConfig.server.port;
         bcParam.serverPort = gmeConfig.server.port;

diff --git a/test/middleware/executor/Executor.spec.js b/test/middleware/executor/Executor.spec.js
@@ -22,7 +22,6 @@ describe('Executor', function () {
                 return;
             }
             gmeConfig = testFixture.getGmeConfig();
-            gmeConfig.server.port = 9006;
             done();
         });
     });

diff --git a/test/middleware/executor/ExecutorClient.spec.js b/test/middleware/executor/ExecutorClient.spec.js
@@ -21,7 +21,6 @@ describe('ExecutorClient', function () {
         var gmeConfig = testFixture.getGmeConfig(),
             param = {};
 
-        gmeConfig.server.port = 9006;
         gmeConfig.executor.enable = true;
 
         param.serverPort = gmeConfig.server.port;

diff --git a/test/middleware/executor/worker/node_worker.spec.js b/test/middleware/executor/worker/node_worker.spec.js
@@ -86,7 +86,6 @@ describe('NodeWorker', function () {
             before(function (done) {
                 var gmeConfig = testFixture.getGmeConfig();
                 this.timeout(5000);
-                gmeConfig.server.port = 9005;
                 gmeConfig.executor.enable = true;
                 gmeConfig.executor.nonce = null;
                 gmeConfig.server.https.enable = false;
@@ -129,7 +128,6 @@ describe('NodeWorker', function () {
             before(function (done) {
                 var gmeConfig = testFixture.getGmeConfig();
                 this.timeout(5000);
-                gmeConfig.server.port = 9005;
                 gmeConfig.executor.enable = true;
                 gmeConfig.executor.nonce = 'aReallyLongSecret';
                 gmeConfig.server.https.enable = false;
@@ -428,7 +426,6 @@ describe('NodeWorker', function () {
             it('worker should not attach', function (done) {
                 var gmeConfig = testFixture.getGmeConfig();
                 this.timeout(5000);
-                gmeConfig.server.port = 9005;
                 gmeConfig.executor.enable = true;
                 gmeConfig.executor.nonce = 'aReallyLongSecret';
                 gmeConfig.server.https.enable = false;
@@ -462,7 +459,6 @@ describe('NodeWorker', function () {
             before(function (done) {
                 var gmeConfig = testFixture.getGmeConfig();
                 this.timeout(5000);
-                gmeConfig.server.port = 9005;
                 gmeConfig.executor.enable = true;
                 gmeConfig.executor.nonce = 'aReallyLongSecret';
                 gmeConfig.server.https.enable = true;

diff --git a/test/plugin/PluginManagerBase.spec.js b/test/plugin/PluginManagerBase.spec.js
@@ -83,7 +83,6 @@ describe('Plugin Manager Base', function () {
 
             gmeConfig = testFixture.getGmeConfig();
 
-        gmeConfig.server.port = 9006;
         gmeConfig.server.https.enable = false;
 
         before(function (done) {

diff --git a/test/server/standalone.spec.js b/test/server/standalone.spec.js
@@ -32,7 +32,6 @@ describe('standalone server', function () {
         this.timeout(5000);
         // we have to set the config here
         var gmeConfig = testFixture.getGmeConfig()
-        gmeConfig.server.port = 9001;
 
         server = WebGME.standaloneServer(gmeConfig);
         server.start(function () {
@@ -321,7 +320,6 @@ describe('standalone server', function () {
         before(function (done) {
             // we have to set the config here
             var gmeConfig = testFixture.getGmeConfig();
-            gmeConfig.server.port = 9001;
             gmeConfig.visualization.decoratorPaths  = [];
 
             server = WebGME.standaloneServer(gmeConfig);
@@ -409,7 +407,6 @@ describe('standalone server', function () {
                 serverReady = Q.defer(),
                 gmeConfig = testFixture.getGmeConfig();
 
-            gmeConfig.server.port = 9001;
             gmeConfig.authentication.enable = true;
             gmeConfig.authentication.allowGuests = false;