Skip to content

Commit

Permalink
test(*): run tests on PhantomJS in place of Chrome
Browse files Browse the repository at this point in the history
  • Loading branch information
urish committed Mar 26, 2016
1 parent 768a2f1 commit 00a5396
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 21 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@ language: node_js
sudo: false
node_js:
- "0.12"
before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
16 changes: 2 additions & 14 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,9 @@ module.exports = function (config) {
colors: true,
logLevel: config.LOG_INFO,
autoWatch: false,
browsers: ['Chrome'],
singleRun: true,

// See http://stackoverflow.com/a/27873086/830623
customLaunchers: {
Chrome_travis_ci: {
base: 'Chrome',
flags: ['--no-sandbox']
}
}
browsers: ['PhantomJS'],
singleRun: true
};

if (process.env.TRAVIS){
_config.browsers = ['Chrome_travis_ci'];
}

config.set(_config);
};
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,22 @@
},
"homepage": "https://github.com/urish/angular2-moment#readme",
"peerDependencies": {
"angular2": "^2.0.0-beta.6"
"angular2": "^2.0.0-beta.6"
},
"dependencies": {
"moment": "^2.11.2"
},
"devDependencies": {
"angular2": "2.0.0-beta.12",
"angular2": "2.0.0-beta.12",
"es6-promise": "3.1.2",
"es6-shim": "0.35.0",
"jasmine-core": "2.4.1",
"karma": "0.13.22",
"karma-chrome-launcher": "0.2.3",
"karma-jasmine": "0.3.8",
"karma-phantomjs-launcher": "^1.0.0",
"karma-sourcemap-loader": "0.3.7",
"karma-webpack": "1.7.0",
"phantomjs-prebuilt": "^2.1.7",
"reflect-metadata": "0.1.2",
"rxjs": "5.0.0-beta.2",
"ts-loader": "0.8.1",
Expand Down

0 comments on commit 00a5396

Please sign in to comment.