From 230578d4bc1a0ae85e4abe26e04b0656b94cb30a Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Tue, 23 Sep 2014 09:55:17 -0700 Subject: [PATCH] use the fabulous screencast-reporter --- package.json | 1 + test/browser_build_unit_tests.html | 6 ++--- test/browser_unit_tests.html | 37 +++++------------------------ test/unit/browser_builds/angular.js | 8 +++++-- test/utils/server.js | 2 ++ 5 files changed, 18 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index 30aad1108..682d3bc1b 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "load-grunt-tasks": "~0.2.0", "mocha": "~1.21.4", "mocha-lcov-reporter": "0.0.1", + "mocha-screencast-reporter": "~0.1.4", "moment": "~2.4.0", "nock": "~0.28.3", "open": "0.0.4", diff --git a/test/browser_build_unit_tests.html b/test/browser_build_unit_tests.html index 9c3816279..b220f18fb 100644 --- a/test/browser_build_unit_tests.html +++ b/test/browser_build_unit_tests.html @@ -4,16 +4,16 @@ Mocha Tests +
+ diff --git a/test/browser_unit_tests.html b/test/browser_unit_tests.html index 7a0f5871e..a777402db 100644 --- a/test/browser_unit_tests.html +++ b/test/browser_unit_tests.html @@ -4,47 +4,22 @@ Mocha Tests +
+ \ No newline at end of file diff --git a/test/unit/browser_builds/angular.js b/test/unit/browser_builds/angular.js index 65c7ec637..420d17c68 100644 --- a/test/unit/browser_builds/angular.js +++ b/test/unit/browser_builds/angular.js @@ -101,7 +101,9 @@ describe('Angular esFactory', function () { return $http(config); }); - return client.ping(); + return client.ping({ + requestTimeout: 1000 + }); }); }); @@ -135,7 +137,9 @@ describe('Angular esFactory', function () { }); }); - var prom = client.ping(); + var prom = client.ping({ + requestTimeout: 1000 + }); return prom.then(function () { expect($httpParams).to.have.property('headers'); expect($httpParams.headers).to.have.property('Authorization', authHeader); diff --git a/test/utils/server.js b/test/utils/server.js index ca7dc56bd..9ac386f64 100644 --- a/test/utils/server.js +++ b/test/utils/server.js @@ -91,6 +91,8 @@ app .get('/expect.js', sendFile(root + '/node_modules/expect.js/expect.js')) .get('/mocha.css', sendFile(root + '/node_modules/mocha/mocha.css')) .get('/mocha.js', sendFile(root + '/node_modules/mocha/mocha.js')) + .get('/screencast-reporter.css', sendFile(root + '/node_modules/mocha-screencast-reporter/screencast-reporter.css')) + .get('/screencast-reporter.js', sendFile(root + '/node_modules/mocha-screencast-reporter/screencast-reporter.js')) // libs .get('/angular.js', sendFile(root + '/bower_components/angular/angular.js'))