Skip to content

Commit

Permalink
Merge pull request #23 from Financial-Times/moar-stable-browser-tests…
Browse files Browse the repository at this point in the history
…-maybe-dunno

Moar stable browser tests maybe dunno
  • Loading branch information
adgad authored May 31, 2018
2 parents cb19f1d + e104bad commit 0836f73
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 16 deletions.
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
machine:
node:
version: 6.10.3
version: 8.11.1
21 changes: 14 additions & 7 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,17 @@ module.exports = function (karma) {
'Promise',
'matchMedia',
'HTMLPictureElement',
// the following polyfills are included pending https://github.com/Financial-Times/polyfill-service/issues/653
'CustomEvent|always|gated',
'fetch|always|gated',
'Array.prototype.find|always|gated',
'Array.prototype.findIndex|always|gated'
].join(',') + '&excludes=Symbol,Symbol.iterator,Symbol.species,Map,Set',
'fetch',
'Array.prototype.find',
'Array.prototype.findIndex',
'IntersectionObserver',
'Map',
'Array.from',
'NodeList.prototype.@@iterator',
'Array.prototype.@@iterator',
'EventSource',
'Number.isInteger'
].join(',') + '&flags=gated&source=n-syndication-tests',
'src/js/*.js',
'test/**/*.spec.js'
],
Expand Down Expand Up @@ -84,7 +89,9 @@ module.exports = function (karma) {

// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: true
singleRun: true,
browserNoActivityTimeout: 50000,
browserDisconnectTolerance: 3
};

if (process.env.CI) {
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"main": "main.js",
"description": "Implementation for the syndication indicator, for users who subscribe to the new FT syndication platform",
"devDependencies": {
"@financial-times/n-gage": "^1.17.3",
"@financial-times/n-heroku-tools": "^6.19.1",
"@financial-times/n-gage": "^2.0.2",
"@financial-times/n-heroku-tools": "^7.3.0",
"autoprefixer": "^6.3.6",
"babel-core": "^6.25.0",
"babel-loader": "^7.0.0",
Expand All @@ -18,21 +18,21 @@
"bower": "^1.8.0",
"bower-resolve-webpack-plugin": "^1.0.3",
"chai": "^4.0.2",
"eslint": "4.2.0",
"eslint": "^4.2.0",
"extract-css-block-webpack-plugin": "^1.3.0",
"extract-text-webpack-plugin": "^2.1.0",
"karma": "^1.4.1",
"karma": "^2.0.2",
"karma-browserstack-launcher": "^1.3.0",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^2.0.0",
"karma-firefox-launcher": "^1.0.1",
"karma-html-reporter": "^0.2.7",
"karma-mocha": "^1.3.0",
"karma-safari-launcher": "^1.0.0",
"karma-browserstack-launcher": "^1.3.0",
"karma-sinon": "^1.0.5",
"karma-sinon-chai": "^1.3.1",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.2",
"karma-webpack": "^3.0.0",
"lintspaces-cli": "^0.6.0",
"mocha": "^3.4.2",
"nock": "^9.0.13",
Expand All @@ -47,7 +47,7 @@
"dependencies": {},
"config": {},
"engines": {
"node": ">=6.10.3"
"node": "^8.11.1"
},
"scripts": {
"commit": "commit-wizard",
Expand Down
2 changes: 1 addition & 1 deletion test/src/js/config.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ const underTest = require('../../../src/js/config');

describe('./src/js/config', function () {
it('config should be an Object', function () {
expect(underTest).to.be.an('object');
expect(typeof underTest).to.equal('object');
});
});

0 comments on commit 0836f73

Please sign in to comment.