delay jasmine and mocha execution

pact-foundation · Jul 9, 2016 · 160df60 · 160df60
1 parent 2ac8590
commit 160df60
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/karma/jasmine/client-spec.js b/karma/jasmine/client-spec.js
@@ -8,9 +8,8 @@
     beforeAll(function(done) {
       client = example.createClient('http://localhost:1234')
       projectsProvider = Pact({ consumer: 'Karma Jasmine', provider: 'Hello' })
-      setTimeout(function () {
-        done()
-      }, 2000)
+      // required for slower Travis CI environment
+      setTimeout(function () { done() }, 2000)
     });
 
     afterAll(function (done) {

diff --git a/karma/mocha/client-spec.js b/karma/mocha/client-spec.js
@@ -5,11 +5,17 @@
 
     var client, projectsProvider;
 
-    // ugly but works... guess would be good to bring jasmine-beforeAll
-    beforeEach(function() {
+    before(function(done) {
       client = example.createClient('http://localhost:1234');
       projectsProvider = Pact({ consumer: 'Karma Mocha', provider: 'Hello' })
-    });
+      // required for slower Travis CI environment
+      setTimeout(function () { done() }, 1000)
+    })
+
+    after(function (done) {
+      projectsProvider.finalize()
+        .then(function () { done() }, function (err) { done(err) })
+    })
 
     describe("sayHello", function () {
       beforeEach(function (done) {
@@ -24,11 +30,8 @@
             headers: { "Content-Type": "application/json" },
             body: { reply: "Hello" }
           }
-        }).then(function () { done() })
-      })
-
-      afterEach(function (done) {
-        projectsProvider.finalize().then(function () { done() })
+        })
+        .then(function () { done() }, function (err) { done(err) })
       })
 
       it("should say hello", function(done) {
@@ -69,13 +72,10 @@
                 }, { min: 1 })
               }
             }
-          }).then(function () { done() })
+          })
+          .then(function () { done() }, function (err) { done(err) })
       })
 
-      afterEach(function (done) {
-        projectsProvider.finalize().then(function () { done() })
-      });
-
       it("should return some friends", function(done) {
         //Run the tests
         client.findFriendsByAgeAndChildren('33', ['Mary Jane', 'James'])
@@ -106,13 +106,10 @@
             headers: { "Content-Type": "application/json" },
             body: { reply: "Bye" }
           }
-        }).then(function () { done() })
+        })
+        .then(function () { done() }, function (err) { done(err) })
       })
 
-      afterEach(function (done) {
-        projectsProvider.finalize().then(function () { done() })
-      });
-
       it("should unfriend me", function(done) {
         //Run the tests
         client.unfriendMe()
@@ -139,7 +136,8 @@
             willRespondWith: {
               status: 404
             }
-          }).then(function () { done() })
+          })
+          .then(function () { done() }, function (err) { done(err) })
         })
 
         it("returns an error message", function (done) {

diff --git a/karma/mocha/karma.conf.js b/karma/mocha/karma.conf.js
@@ -12,7 +12,9 @@ module.exports = function (config) {
     frameworks: ['mocha', 'chai', 'pact'],
 
     // pact config
-    pact: {},
+    pact: {
+      port: 1234
+    },
 
     // list of files / patterns to load in the browser
     files: [
@@ -54,7 +56,7 @@ module.exports = function (config) {
     customLaunchers: {
       PhantomJS_without_security: {
         base: 'PhantomJS',
-        flags: ['--web-security=false']
+        flags: ['--web-security=no']
       }
     },