Skip to content
This repository has been archived by the owner on Apr 15, 2020. It is now read-only.

Commit

Permalink
Merge fc47e35 into b71b820
Browse files Browse the repository at this point in the history
  • Loading branch information
greenkeeper[bot] committed Apr 5, 2019
2 parents b71b820 + fc47e35 commit 93d3e01
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
language: node_js
addons:
chrome: stable
cache:
directories:
- node_modules
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-uglify": "^4.0.0",
"grunt-release-it": "^1.0.1",
"karma": "^3.1.1",
"karma": "^4.0.1",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.0.0",
"karma-coveralls": "^2.0.0",
"karma-mocha": "^1.0.1",
"karma-mocha-reporter": "^2.0.5",
"karma-phantomjs-launcher": "^1.0.0",
"load-grunt-tasks": "^4.0.0",
"mocha": "^6.0.0",
"phantomjs-prebuilt": "^2.1.8",
"sinon": "^6.0.1",
"puppeteer": "^1.14.0",
"sinon": "^7.2.4",
"unexpected": "^11.0.1",
"unexpected-sinon": "^10.2.1"
"unexpected-sinon": "^10.11.1"
},
"dependencies": {
"angular": "^1.2.24"
Expand Down
6 changes: 4 additions & 2 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ if (process.env.TRAVIS) {
reporters.push('coveralls');
}

process.env.CHROME_BIN = require('puppeteer').executablePath();

module.exports = function (config) {
config.set({
browsers: [ 'PhantomJS' ],
browsers: [ 'ChromeHeadless' ],
plugins: [
'karma-mocha',
'karma-coverage',
'karma-coveralls',
'karma-phantomjs-launcher',
'karma-chrome-launcher',
'karma-mocha-reporter'
],
frameworks: [ 'mocha' ],
Expand Down

0 comments on commit 93d3e01

Please sign in to comment.