Skip to content

Commit

Permalink
upgraded some dependencies, introduced makefile to execute browser-st…
Browse files Browse the repository at this point in the history
…ack tests sequentially
  • Loading branch information
dereke committed Mar 22, 2017
1 parent 61ece90 commit f584e6b
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 11 deletions.
18 changes: 18 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
.PHONY: test

test:
mocha
karma start

test-all:
export BM_TIMEOUT=5000
mocha
karma start --single-run --browsers browserstack-windows-chrome
karma start --single-run --browsers browserstack-osx-chrome
karma start --single-run --browsers browserstack-firefox
karma start --single-run --browsers browserstack-safari
karma start --single-run --browsers browserstack-safari-ios
karma start --single-run --browsers browserstack-edge
karma start --single-run --browsers browserstack-ie11
karma start --single-run --browsers browserstack-ie10
karma start --single-run --browsers browserstack-ie9
20 changes: 14 additions & 6 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,17 @@ var browsers = {
'browserstack-firefox': {
base: 'BrowserStack',
browser : 'Firefox',
browser_version : '47.0',
os : 'OS X',
os_version : 'El Capitan',
browser_version : '52.0',
os : 'Windows',
os_version : '10',
resolution : '1024x768'
},
'browserstack-safari': {
base: 'BrowserStack',
browser : 'Safari',
browser_version : '9.1',
os : 'OS X',
os_version : 'El Capitan',
os_version : 'Sierra',
resolution : '1024x768'
},
'browserstack-safari-ios': {
Expand All @@ -114,12 +114,20 @@ var browsers = {
os : 'ios',
os_version : '9.1',
},
'browserstack-chrome': {
'browserstack-windows-chrome': {
base: 'BrowserStack',
browser : 'Chrome',
browser_version : '52.0',
os : 'Windows',
os_version : '10',
resolution : '1024x768'
},
'browserstack-osx-chrome': {
base: 'BrowserStack',
browser : 'Chrome',
browser_version : '52.0',
os : 'OS X',
os_version : 'El Capitan',
os_version : 'Sierra',
resolution : '1024x768'
},
'browserstack-ie9': {
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "reliable dom testing",
"main": "index.js",
"scripts": {
"test": "mocha && karma start --single-run"
"test": "make test"
},
"author": "Tim Macfarlane <[email protected]>",
"license": "MIT",
Expand All @@ -14,18 +14,18 @@
"chai-as-promised": "6.0.0",
"detect-node": "^2.0.3",
"hyperdom": "^0.2.0",
"karma": "1.3.0",
"karma": "1.5.0",
"karma-browserify": "5.1.0",
"karma-browserstack-launcher": "1.1.1",
"karma-chrome-launcher": "2.0.0",
"karma-cli": "1.0.1",
"karma-env-preprocessor": "0.1.1",
"karma-firefox-launcher": "^1.0.0",
"karma-ievms": "0.1.0",
"karma-mocha": "1.2.0",
"karma-mocha": "1.3.0",
"karma-mocha-reporter": "2.2.0",
"lie": "^3.0.1",
"mocha": "3.1.2",
"lie": "3.1.1",
"mocha": "3.2.0",
"vdom-query": "https://github.com/featurist/vdom-query",
"virtual-dom": "^2.1.1",
"watchify": "^3.7.0"
Expand Down

0 comments on commit f584e6b

Please sign in to comment.