Skip to content

C
coopwire-hypothesis
Commit 52b4235d authored by Sean Hammond's avatar Sean Hammond Committed by GitHub
Browse files
Options

Merge pull request #16 from hypothesis/test-infra-upgrade 

Upgrade PhantomJS from 1.x to 2.x
parents 94af10d1 dbbcfb39
Hide whitespace changes
Inline Side-by-side
Showing with 187 additions and 113 deletions
gulpfile.js
View file @ 52b4235d
......@@ -318,6 +318,14 @@ function runKarma(baseConfig, opts, done) {
},
};
// Work around a bug in Karma 1.10 which causes console log messages not to
// be displayed when using a non-default reporter.
// See https://github.com/karma-runner/karma/pull/2220
var BaseReporter = require('karma/lib/reporters/base');
BaseReporter.decoratorFactory.$inject =
BaseReporter.decoratorFactory.$inject.map(dep =>
dep.replace('browserLogOptions', 'browserConsoleLogOptions'));
var karma = require('karma');
new karma.Server(Object.assign({}, {
configFile: path.resolve(__dirname, baseConfig),
......
h/static/scripts/directive/test/timestamp-test.js
View file @ 52b4235d
'use strict';
var angular = require('angular');
var escapeStringRegexp = require('escape-string-regexp');
var util = require('./util');
......@@ -83,7 +84,7 @@ describe('timestamp', function () {
// The exact format of the result will depend on the current locale,
// but check that at least the current year and time are present
assert.match(element.ctrl.absoluteTimestamp, new RegExp('.*2016.*' +
expectedDate.toLocaleTimeString()));
escapeStringRegexp(expectedDate.toLocaleTimeString())));
});
});
});
h/static/scripts/karma-phantomjs-polyfill.js
View file @ 52b4235d
......@@ -19,6 +19,10 @@ require('raf').polyfill();
// app itself.
require('./polyfills');
// PhantomJS 2.x includes a `URL` constructor so `new URL` works
// but it appears to be broken.
require('js-polyfills/url');
// disallow console output during tests
['debug', 'log', 'warn', 'error'].forEach(function (method) {
var realFn = window.console[method];
......
npm-shrinkwrap.json
View file @ 52b4235d
......@@ -461,11 +461,6 @@
"from": "base64id@0.1.0",
"resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"
},
"batch": {
"version": "0.5.3",
"from": "batch@>=0.5.3 <0.6.0",
"resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"
},
"beeper": {
"version": "1.1.0",
"from": "beeper@>=1.0.0 <2.0.0",
......@@ -524,9 +519,16 @@
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.3.tgz"
},
"body-parser": {
"version": "1.15.1",
"version": "1.15.2",
"from": "body-parser@>=1.12.4 <2.0.0",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.15.1.tgz"
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz",
"dependencies": {
"qs": {
"version": "6.2.0",
"from": "qs@6.2.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz"
}
}
},
"boom": {
"version": "2.10.1",
......@@ -670,9 +672,9 @@
"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz"
},
"bytes": {
"version": "2.3.0",
"from": "bytes@2.3.0",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-2.3.0.tgz"
"version": "2.4.0",
"from": "bytes@2.4.0",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"
},
"callsite": {
"version": "1.0.0",
......@@ -827,6 +829,18 @@
"from": "colors@1.0.3",
"resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
},
"combine-lists": {
"version": "1.0.0",
"from": "combine-lists@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.0.tgz",
"dependencies": {
"lodash": {
"version": "4.13.1",
"from": "lodash@>=4.5.0 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
}
}
},
"combine-source-map": {
"version": "0.7.2",
"from": "combine-source-map@>=0.7.1 <0.8.0",
......@@ -1288,9 +1302,9 @@
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz"
},
"engine.io": {
"version": "1.6.9",
"from": "engine.io@1.6.9",
"resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.6.9.tgz"
"version": "1.6.10",
"from": "engine.io@1.6.10",
"resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.6.10.tgz"
},
"engine.io-client": {
"version": "1.6.9",
......@@ -1661,6 +1675,11 @@
"from": "fs-readdir-recursive@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz"
},
"fs.realpath": {
"version": "1.0.0",
"from": "fs.realpath@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
},
"fstream": {
"version": "1.0.8",
"from": "fstream@>=1.0.0 <2.0.0",
......@@ -2021,14 +2040,14 @@
}
},
"http-errors": {
"version": "1.4.0",
"from": "http-errors@>=1.4.0 <1.5.0",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.4.0.tgz"
"version": "1.5.0",
"from": "http-errors@>=1.5.0 <1.6.0",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz"
},
"http-proxy": {
"version": "1.13.2",
"version": "1.14.0",
"from": "http-proxy@>=1.13.0 <2.0.0",
"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.13.2.tgz"
"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.14.0.tgz"
},
"http-signature": {
"version": "1.1.1",
......@@ -2456,10 +2475,15 @@
"resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz"
},
"karma": {
"version": "0.13.22",
"from": "karma@>=0.13.22 <0.14.0",
"resolved": "https://registry.npmjs.org/karma/-/karma-0.13.22.tgz",
"version": "1.1.0",
"from": "karma@latest",
"resolved": "https://registry.npmjs.org/karma/-/karma-1.1.0.tgz",
"dependencies": {
"bluebird": {
"version": "3.4.1",
"from": "bluebird@>=3.3.0 <4.0.0",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.1.tgz"
},
"colors": {
"version": "1.1.2",
"from": "colors@>=1.1.0 <2.0.0",
......@@ -2471,26 +2495,26 @@
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.0.tgz"
},
"glob": {
"version": "7.0.3",
"from": "glob@>=7.0.0 <8.0.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz"
"version": "7.0.5",
"from": "glob@>=7.0.3 <8.0.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"
},
"minimatch": {
"version": "3.0.0",
"version": "3.0.2",
"from": "minimatch@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"
}
}
},
"karma-browserify": {
"version": "5.0.4",
"from": "karma-browserify@>=5.0.3 <6.0.0",
"resolved": "https://registry.npmjs.org/karma-browserify/-/karma-browserify-5.0.4.tgz",
"version": "5.0.5",
"from": "karma-browserify@latest",
"resolved": "https://registry.npmjs.org/karma-browserify/-/karma-browserify-5.0.5.tgz",
"dependencies": {
"minimatch": {
"version": "3.0.0",
"from": "minimatch@3.0.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
"version": "3.0.2",
"from": "minimatch@^3.0.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"
}
}
},
......@@ -2500,36 +2524,66 @@
"resolved": "https://registry.npmjs.org/karma-chai/-/karma-chai-0.1.0.tgz"
},
"karma-mocha": {
"version": "0.2.2",
"from": "karma-mocha@>=0.2.2 <0.3.0",
"resolved": "https://registry.npmjs.org/karma-mocha/-/karma-mocha-0.2.2.tgz"
"version": "1.1.1",
"from": "karma-mocha@latest",
"resolved": "https://registry.npmjs.org/karma-mocha/-/karma-mocha-1.1.1.tgz"
},
"karma-mocha-reporter": {
"version": "2.0.0",
"from": "karma-mocha-reporter@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.0.0.tgz",
"version": "2.0.4",
"from": "karma-mocha-reporter@latest",
"resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.0.4.tgz"
},
"karma-phantomjs-launcher": {
"version": "1.0.1",
"from": "karma-phantomjs-launcher@latest",
"resolved": "https://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.1.tgz",
"dependencies": {
"chalk": {
"version": "1.1.1",
"from": "chalk@1.1.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
"bl": {
"version": "1.0.3",
"from": "bl@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"
},
"supports-color": {
"version": "2.0.0",
"from": "supports-color@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
"extend": {
"version": "3.0.0",
"from": "extend@~3.0.0",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
},
"isarray": {
"version": "1.0.0",
"from": "isarray@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
},
"lodash": {
"version": "4.13.1",
"from": "lodash@^4.0.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
},
"phantomjs-prebuilt": {
"version": "2.1.7",
"from": "phantomjs-prebuilt@>=2.1.7 <3.0.0",
"resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.7.tgz"
},
"qs": {
"version": "5.2.0",
"from": "qs@>=5.2.0 <5.3.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
},
"readable-stream": {
"version": "2.0.6",
"from": "readable-stream@>=2.0.5 <2.1.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
},
"request": {
"version": "2.67.0",
"from": "request@>=2.67.0 <2.68.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz"
}
}
},
"karma-phantomjs-launcher": {
"version": "0.2.3",
"from": "karma-phantomjs-launcher@>=0.2.3 <0.3.0",
"resolved": "https://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.2.3.tgz"
},
"karma-sinon": {
"version": "1.0.4",
"from": "karma-sinon@>=1.0.4 <2.0.0",
"resolved": "https://registry.npmjs.org/karma-sinon/-/karma-sinon-1.0.4.tgz"
"version": "1.0.5",
"from": "karma-sinon@latest",
"resolved": "https://registry.npmjs.org/karma-sinon/-/karma-sinon-1.0.5.tgz"
},
"kew": {
"version": "0.7.0",
......@@ -2646,6 +2700,18 @@
"from": "lodash._root@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"
},
"lodash._stringtopath": {
"version": "4.8.0",
"from": "lodash._stringtopath@>=4.8.0 <4.9.0",
"resolved": "https://registry.npmjs.org/lodash._stringtopath/-/lodash._stringtopath-4.8.0.tgz",
"dependencies": {
"lodash._basetostring": {
"version": "4.12.0",
"from": "lodash._basetostring@>=4.12.0 <4.13.0",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz"
}
}
},
"lodash.debounce": {
"version": "4.0.6",
"from": "lodash.debounce@>=4.0.3 <5.0.0",
......@@ -2656,6 +2722,11 @@
"from": "lodash.escape@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz"
},
"lodash.get": {
"version": "4.3.0",
"from": "lodash.get@>=4.3.0 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.3.0.tgz"
},
"lodash.isarguments": {
"version": "3.0.8",
"from": "lodash.isarguments@>=3.0.0 <4.0.0",
......@@ -2712,9 +2783,9 @@
"resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.2.tgz"
},
"log4js": {
"version": "0.6.36",
"version": "0.6.37",
"from": "log4js@>=0.6.31 <0.7.0",
"resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.36.tgz",
"resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.37.tgz",
"dependencies": {
"readable-stream": {
"version": "1.0.34",
......@@ -3403,43 +3474,6 @@
"from": "phantom-ownpropertynames@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/phantom-ownpropertynames/-/phantom-ownpropertynames-1.0.0.tgz"
},
"phantomjs": {
"version": "1.9.20",
"from": "phantomjs@>=1.9.7 <2.0.0",
"resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.20.tgz",
"dependencies": {
"bl": {
"version": "1.0.3",
"from": "bl@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"
},
"extend": {
"version": "3.0.0",
"from": "extend@>=3.0.0 <3.1.0",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
},
"isarray": {
"version": "1.0.0",
"from": "isarray@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
},
"qs": {
"version": "5.2.0",
"from": "qs@>=5.2.0 <5.3.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
},
"readable-stream": {
"version": "2.0.6",
"from": "readable-stream@>=2.0.5 <2.1.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
},
"request": {
"version": "2.67.0",
"from": "request@>=2.67.0 <2.68.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz"
}
}
},
"pify": {
"version": "2.3.0",
"from": "pify@>=2.0.0 <3.0.0",
......@@ -3748,6 +3782,11 @@
"from": "q@>=1.1.2 <2.0.0",
"resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
},
"qjobs": {
"version": "1.1.4",
"from": "qjobs@>=1.1.4 <2.0.0",
"resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.4.tgz"
},
"qs": {
"version": "6.1.0",
"from": "qs@>=6.1.0 <6.2.0",
......@@ -3789,9 +3828,9 @@
"resolved": "https://registry.npmjs.org/raven-js/-/raven-js-2.3.0.tgz"
},
"raw-body": {
"version": "2.1.6",
"from": "raw-body@>=2.1.5 <2.2.0",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.6.tgz"
"version": "2.1.7",
"from": "raw-body@>=2.1.7 <2.2.0",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"
},
"read": {
"version": "1.0.7",
......@@ -4096,6 +4135,11 @@
"from": "sequencify@>=0.0.7 <0.1.0",
"resolved": "http://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
},
"setprototypeof": {
"version": "1.0.1",
"from": "setprototypeof@1.0.1",
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz"
},
"sha.js": {
"version": "2.4.5",
"from": "sha.js@>=2.3.6 <3.0.0",
......@@ -4162,9 +4206,9 @@
"resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
},
"socket.io": {
"version": "1.4.6",
"from": "socket.io@>=1.4.5 <2.0.0",
"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.4.6.tgz"
"version": "1.4.7",
"from": "socket.io@1.4.7",
"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.4.7.tgz"
},
"socket.io-adapter": {
"version": "0.4.0",
......@@ -4272,9 +4316,9 @@
"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
},
"statuses": {
"version": "1.2.1",
"from": "statuses@>=1.2.1 <2.0.0",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"
"version": "1.3.0",
"from": "statuses@>=1.3.0 <2.0.0",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz"
},
"stream-array": {
"version": "1.1.1",
......@@ -4472,6 +4516,11 @@
"from": "title-case@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/title-case/-/title-case-1.1.2.tgz"
},
"tmp": {
"version": "0.0.28",
"from": "tmp@0.0.28",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz"
},
"to-array": {
"version": "0.1.4",
"from": "to-array@0.1.4",
......@@ -4560,9 +4609,21 @@
"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz"
},
"type-is": {
"version": "1.6.12",
"from": "type-is@>=1.6.11 <1.7.0",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.12.tgz"
"version": "1.6.13",
"from": "type-is@>=1.6.13 <1.7.0",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz",
"dependencies": {
"mime-db": {
"version": "1.23.0",
"from": "mime-db@>=1.23.0 <1.24.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
},
"mime-types": {
"version": "2.1.11",
"from": "mime-types@>=2.1.11 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"
}
}
},
"typedarray": {
"version": "0.0.6",
......
package.json
View file @ 52b4235d
......@@ -36,6 +36,7 @@
"dom-seek": "^1.0.1",
"end-of-stream": "^1.1.0",
"escape-html": "^1.0.3",
"escape-string-regexp": "^1.0.5",
"exorcist": "^0.4.0",
"extend": "^2.0.0",
"gulp": "^3.9.1",
......@@ -51,13 +52,13 @@
"jquery": "1.11.1",
"js-polyfills": "^0.1.16",
"jscs": "^3.0.2",
"karma": "^0.13.22",
"karma-browserify": "^5.0.3",
"karma": "^1.1.0",
"karma-browserify": "^5.0.5",
"karma-chai": "^0.1.0",
"karma-mocha": "^0.2.2",
"karma-mocha-reporter": "^2.0.0",
"karma-phantomjs-launcher": "^0.2.3",
"karma-sinon": "^1.0.4",
"karma-mocha": "^1.1.1",
"karma-mocha-reporter": "^2.0.4",
"karma-phantomjs-launcher": "^1.0.1",
"karma-sinon": "^1.0.5",
"lodash.debounce": "^4.0.3",
"lodash.get": "^4.3.0",
"mkdirp": "^0.5.1",
......@@ -65,7 +66,6 @@
"ng-tags-input": "^3.1.1",
"node-uuid": "^1.4.3",
"phantom-ownpropertynames": "^1.0.0",
"phantomjs": "^1.9.7",
"postcss": "^5.0.6",
"postcss-url": "^5.1.1",
"proxyquire": "^1.7.4",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment