Skip to content

Commit

Permalink
Added chrome browsers tests
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorhakes committed Jan 13, 2016
1 parent 56aa7cc commit 93dbd53
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
language: node_js
node_js:
- 0.10
- 0.12
before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
8 changes: 4 additions & 4 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = function (config) {

// list of files / patterns to load in the browser
files: [
'tests/Promise.js'
'test/Promise.js'
],


Expand All @@ -26,7 +26,7 @@ module.exports = function (config) {
// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {
'tests/Promise.js': ['browserify']
'test/Promise.js': ['browserify']
},


Expand Down Expand Up @@ -55,7 +55,7 @@ module.exports = function (config) {

// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers: ['PhantomJS'],
browsers: ['Chrome'],


// Continuous Integration mode
Expand All @@ -69,7 +69,7 @@ module.exports = function (config) {
plugins: [
'karma-browserify',
'karma-mocha',
'karma-phantomjs-launcher'
'karma-chrome-launcher'
]
})
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Lightweight promise polyfill. A+ compliant",
"main": "Promise.js",
"scripts": {
"test": "./node_modules/.bin/promises-aplus-tests tests/adapter.js && JASMINE_CONFIG_PATH=jasmine.json ./node_modules/jasmine/bin/jasmine.js;"
"test": "./node_modules/.bin/mocha && ./node_modules/.bin/karma start --single-run"
},
"repository": {
"type": "git",
Expand All @@ -22,6 +22,7 @@
"jasmine": "^2.3.1",
"karma": "^0.13.19",
"karma-browserify": "^4.4.2",
"karma-chrome-launcher": "^0.2.2",
"karma-mocha": "^0.2.1",
"karma-phantomjs-launcher": "^0.2.3",
"mocha": "^2.3.4",
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 93dbd53

Please sign in to comment.