diff --git a/package.json b/package.json index 5b128915..22e68b76 100644 --- a/package.json +++ b/package.json @@ -51,14 +51,13 @@ "karma": "~0.12.0", "karma-babel-preprocessor": "^4.0.1", "karma-browserify": "^4.0.0", + "karma-chrome-launcher": "^0.2.2", "karma-cli": "0.0.4", "karma-coverage": "0.2.6", "karma-jasmine": "^0.3.6", - "karma-phantomjs-launcher": "0.2.0", "karma-spec-reporter": "0.0.20", "moment": "^2.11.1", "morgan": "^1.6.1", - "phantomjs-prebuilt": "^2.1.1", "pretty-hrtime": "^1.0.0", "protractor": "^2.2.0", "protractor-http-mock": "^0.1.18", diff --git a/test/karma.conf.js b/test/karma.conf.js index 224fd7e0..afdc8b0d 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -33,7 +33,7 @@ module.exports = function(config) { autoWatch: true, - browsers: ['PhantomJS'], + browsers: ['Chrome'], singleRun: true, @@ -43,7 +43,7 @@ module.exports = function(config) { 'karma-coverage', 'karma-jasmine', 'karma-spec-reporter', - 'karma-phantomjs-launcher' + 'karma-chrome-launcher' ], browserify: { diff --git a/test/protractor.conf.js b/test/protractor.conf.js index ebd38951..53654f09 100644 --- a/test/protractor.conf.js +++ b/test/protractor.conf.js @@ -1,7 +1,5 @@ 'use strict'; -var phantomjs = require('phantomjs'); - var gulpConfig = require('../gulp/config'); exports.config = { diff --git a/test/unit/controllers/grouped_runs_spec.js b/test/unit/controllers/grouped_runs_spec.js index 837a6e51..f0c84840 100644 --- a/test/unit/controllers/grouped_runs_spec.js +++ b/test/unit/controllers/grouped_runs_spec.js @@ -33,7 +33,7 @@ describe('GroupedRunsController', function() { var expectedResponse = { timedelta: [ { - datetime: '2014-11-19', + datetime: '2014-11-19T00:00:00.000Z', job_data: [ { fail: 1, diff --git a/test/unit/controllers/home_spec.js b/test/unit/controllers/home_spec.js index af724726..2afb8eb8 100644 --- a/test/unit/controllers/home_spec.js +++ b/test/unit/controllers/home_spec.js @@ -65,7 +65,7 @@ describe('HomeController', function() { var timestamp; beforeEach(function() { - var date = new Date('2015-10-01T20:00:00'); + var date = new Date('2015-10-01T20:00:00.000Z'); timestamp = date.getTime(); var metrics = { passes: 3, failures: 4, failRate: 0.57 }; var stats = [{ date: date, metrics: metrics }]; diff --git a/test/unit/controllers/job_spec.js b/test/unit/controllers/job_spec.js index 52cb0f6b..6cc71215 100644 --- a/test/unit/controllers/job_spec.js +++ b/test/unit/controllers/job_spec.js @@ -32,7 +32,7 @@ describe('JobController', function() { function mockHealthService() { var expectedResponse = { tests: { - '2014-11-19T01:00:00': { + '2014-11-19T01:00:00.000Z': { 'tempest.api.compute.admin.test_fixed_ips:FixedIPsTestJson.test_list_fixed_ip_details': { fail: 1, pass: 27,