Skip to content

Commit e52d418

Browse files
crobinson42crobinson42
authored
Merge pull request #74 from js-data/ci
Circle CI 2.0 & sauce lab tests
2 parents 5e2708c + 72b228a commit e52d418

5 files changed

Lines changed: 4762 additions & 1502 deletions

File tree

‎circle.yml‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
1-
general:
2-
branches:
3-
ignore:
4-
- gh-pages
5-
machine:
6-
node:
7-
version: 5.7.0
8-
dependencies:
9-
pre:
10-
- npm i -g npm
11-
- npm i -g codecov
12-
- npm i js-data@rc
13-
test:
14-
post:
15-
- cat ./coverage/lcov.info | codecov
16-
general:
17-
artifacts:
18-
- "dist"
19-
- "fetch/dist"
1+
version: 2
2+
jobs:
3+
test:
4+
docker:
5+
- image: circleci/node:8
6+
steps:
7+
- checkout
8+
- run: npm install
9+
- run: sudo npm i -g codecov
10+
- run:
11+
name: Test
12+
command: npm test
13+
- run:
14+
name: Generate code coverage
15+
command: cat ./coverage/lcov.info | codecov
16+
- store_artifacts:
17+
path: dist
18+
destination: fetch/dist
19+
20+
workflows:
21+
version: 2
22+
build_and_test:
23+
jobs:
24+
- test

‎fetch/karma.conf.js‎

Lines changed: 54 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,57 @@
1+
var browsers = ['PhantomJS']
2+
13
var customLaunchers = {
2-
bs_ie9_windows7: {
3-
base: 'BrowserStack',
4-
browser: 'ie',
5-
browser_version: '9.0',
6-
os: 'Windows',
7-
os_version: '7'
4+
sl_chrome: {
5+
base: 'SauceLabs',
6+
browserName: 'chrome',
7+
platform: 'Windows 10',
8+
version: 'latest'
9+
},
10+
sl_firefox: {
11+
base: 'SauceLabs',
12+
browserName: 'firefox',
13+
platform: 'Windows 10',
14+
version: 'latest'
15+
},
16+
sl_safari_9: {
17+
base: 'SauceLabs',
18+
browserName: 'safari',
19+
platform: 'OS X 10.11',
20+
version: '9.0'
821
},
9-
bs_safari7_osxmavericks: {
10-
base: 'BrowserStack',
11-
browser: 'safari',
12-
browser_version: '7.1',
13-
os: 'OS X',
14-
os_version: 'Mavericks'
22+
sl_edge: {
23+
base: 'SauceLabs',
24+
browserName: 'microsoftedge',
25+
platform: 'Windows 10',
26+
version: 'latest'
1527
},
16-
bs_firefox41_windows7: {
17-
base: 'BrowserStack',
18-
browser: 'firefox',
19-
browser_version: '41.0',
20-
os: 'Windows',
21-
os_version: '7'
28+
sl_ie_11: {
29+
base: 'SauceLabs',
30+
browserName: 'internet explorer',
31+
platform: 'Windows 8.1',
32+
version: '11'
2233
},
23-
bs_chrome46_windows7: {
24-
base: 'BrowserStack',
25-
browser: 'chrome',
26-
browser_version: '46.0',
27-
os: 'Windows',
28-
os_version: '7'
34+
sl_ie_10: {
35+
base: 'SauceLabs',
36+
browserName: 'internet explorer',
37+
platform: 'Windows 2012',
38+
version: '10'
39+
},
40+
sl_ie_9: {
41+
base: 'SauceLabs',
42+
browserName: 'internet explorer',
43+
platform: 'Windows 2008',
44+
version: '9'
45+
},
46+
sl_android_5: {
47+
base: 'SauceLabs',
48+
browserName: 'android',
49+
platform: 'Linux',
50+
version: '5.1'
2951
}
3052
}
3153

32-
var browsers = ['PhantomJS']
33-
if (
34-
process.env.BROWSERSTACK_USERNAME &&
35-
process.env.BROWSERSTACK_ACCESS_KEY
36-
) {
54+
if (process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY) {
3755
browsers = browsers.concat(Object.keys(customLaunchers))
3856
}
3957

@@ -46,7 +64,7 @@ module.exports = function (config) {
4664
'karma-mocha',
4765
'karma-chai',
4866
'karma-phantomjs-launcher',
49-
'karma-browserstack-launcher'
67+
'karma-sauce-launcher'
5068
],
5169
autoWatch: false,
5270
browsers: browsers,
@@ -58,9 +76,12 @@ module.exports = function (config) {
5876
'fetch/karma.start.js',
5977
'test/*.test.js'
6078
],
61-
browserStack: {
62-
username: process.env.BROWSERSTACK_USERNAME,
63-
accessKey: process.env.BROWSERSTACK_ACCESS_KEY
79+
sauceLabs: {
80+
testName: 'JSDataHttp fetch Tests',
81+
public: 'public',
82+
recordVideo: false,
83+
recordScreenshots: false,
84+
build: process.env.CIRCLE_BUILD_NUM ? ('circle-' + process.env.CIRCLE_BUILD_NUM) : ('local-' + new Date().getTime())
6485
},
6586
customLaunchers: customLaunchers,
6687
reporters: ['dots'],

‎karma.conf.js‎

Lines changed: 54 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,57 @@
1+
var browsers = ['PhantomJS']
2+
13
var customLaunchers = {
2-
bs_ie9_windows7: {
3-
base: 'BrowserStack',
4-
browser: 'ie',
5-
browser_version: '9.0',
6-
os: 'Windows',
7-
os_version: '7'
4+
sl_chrome: {
5+
base: 'SauceLabs',
6+
browserName: 'chrome',
7+
platform: 'Windows 10',
8+
version: 'latest'
9+
},
10+
sl_firefox: {
11+
base: 'SauceLabs',
12+
browserName: 'firefox',
13+
platform: 'Windows 10',
14+
version: 'latest'
15+
},
16+
sl_safari_9: {
17+
base: 'SauceLabs',
18+
browserName: 'safari',
19+
platform: 'OS X 10.11',
20+
version: '9.0'
821
},
9-
bs_safari7_osxmavericks: {
10-
base: 'BrowserStack',
11-
browser: 'safari',
12-
browser_version: '7.1',
13-
os: 'OS X',
14-
os_version: 'Mavericks'
22+
sl_edge: {
23+
base: 'SauceLabs',
24+
browserName: 'microsoftedge',
25+
platform: 'Windows 10',
26+
version: 'latest'
1527
},
16-
bs_firefox41_windows7: {
17-
base: 'BrowserStack',
18-
browser: 'firefox',
19-
browser_version: '41.0',
20-
os: 'Windows',
21-
os_version: '7'
28+
sl_ie_11: {
29+
base: 'SauceLabs',
30+
browserName: 'internet explorer',
31+
platform: 'Windows 8.1',
32+
version: '11'
2233
},
23-
bs_chrome46_windows7: {
24-
base: 'BrowserStack',
25-
browser: 'chrome',
26-
browser_version: '46.0',
27-
os: 'Windows',
28-
os_version: '7'
34+
sl_ie_10: {
35+
base: 'SauceLabs',
36+
browserName: 'internet explorer',
37+
platform: 'Windows 2012',
38+
version: '10'
39+
},
40+
sl_ie_9: {
41+
base: 'SauceLabs',
42+
browserName: 'internet explorer',
43+
platform: 'Windows 2008',
44+
version: '9'
45+
},
46+
sl_android_5: {
47+
base: 'SauceLabs',
48+
browserName: 'android',
49+
platform: 'Linux',
50+
version: '5.1'
2951
}
3052
}
3153

32-
var browsers = ['PhantomJS']
33-
if (
34-
process.env.BROWSERSTACK_USERNAME &&
35-
process.env.BROWSERSTACK_ACCESS_KEY
36-
) {
54+
if (process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY) {
3755
browsers = browsers.concat(Object.keys(customLaunchers))
3856
}
3957

@@ -46,7 +64,7 @@ module.exports = function (config) {
4664
'karma-mocha',
4765
'karma-chai',
4866
'karma-phantomjs-launcher',
49-
'karma-browserstack-launcher'
67+
'karma-sauce-launcher'
5068
],
5169
autoWatch: false,
5270
browsers: browsers,
@@ -57,9 +75,12 @@ module.exports = function (config) {
5775
'karma.start.js',
5876
'test/*.test.js'
5977
],
60-
browserStack: {
61-
username: process.env.BROWSERSTACK_USERNAME,
62-
accessKey: process.env.BROWSERSTACK_ACCESS_KEY
78+
sauceLabs: {
79+
testName: 'JSDataHttp Tests',
80+
public: 'public',
81+
recordVideo: false,
82+
recordScreenshots: false,
83+
build: process.env.CIRCLE_BUILD_NUM ? ('circle-' + process.env.CIRCLE_BUILD_NUM) : ('local-' + new Date().getTime())
6384
},
6485
customLaunchers: customLaunchers,
6586
reporters: ['dots'],

0 commit comments

Comments
 (0)