Skip to content
This repository was archived by the owner on Nov 19, 2018. It is now read-only.

Commit 21926b0

Browse files
author
rnicholus
committed
SauceLabs is just too shitty to continue using
1 parent 6e6d7c8 commit 21926b0

File tree

4 files changed

+9
-62
lines changed

4 files changed

+9
-62
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ node_js:
44
- '5.0'
55
env:
66
global:
7+
- DISPLAY=:99.0
78
- SAUCE_USERNAME: react-fine-uploader2
89
- secure: QW6G2+DfOiH01dRd8qlj/Xc58maGsj7NKge7fIOqBF2SO42RyGAzRCLyeI2A7Sj0lcytIP2X1ILLhNMVsAMa0ldTnBa3hDmonBOvgGmLxbe13EsM+2sfsqAigOiIoUwk5yUk/v4pOCFmEf3BCE9jEp5S0q197Ii8tuH99AO9vKz1wFJ21fZZf9+N8tJcXaBpR7nfeN80G0Fs+ddQktYCq+644CQveqghwx1Vbi2wztkTZKMcSdCYh8pQaieZf2PnIGi/StcOry6jBOlfl8H243vpdmHJJssztHiylomjtPjsxnB5PdwtlZZNIgy/+/cGYcE9RRNwEpOe1Z10NvukSjW/hmYEo8It3xakdYhV3jQU8GTCSxu2D8QyR/pW0JjxDyybmGhE5ElQaGMSUdJ/5+FF/aTuzmfly8eAZX1+64XOZSEwbUi+A2hDZ2HIJU+jaGwXouzUqYCvsjn+tAn2mlURdGCaooqWoCVxpnP2MBFKhRuyL2aX6MgqRkZ1GOHH5SAo/ufPd5j8tRQ7BwEcyX1zit/EiutPhkhsO3fdW2EBs5EjrNxK5x+tFATml1iawdvy2m+h8kvwQ3oA2ja8gGBuIcdYKft+iHGk7ozUxOHvzTVQ1tNlFoM05drNDGn2Ld23j8ih7jtaHb1lAprqUBNodiStBxUIqmsRMO/zwMs=
10+
before_script:
11+
- sh -e /etc/init.d/xvfb start
912
addons:
13+
firefox: latest
1014
jwt:
1115
secure: adRnCigFL/pHJdZzRtb4cEw2vGsrvqyWKVfR77nhTTPrgk9TiIvPd1/w9ufQJhhYkYtq2TqdWVmuw7wzBYiu2RiTWHeTEDmACUkfJbWPBt9xfUiOOgcNvLKGMICoeKEeiX+yK0FRGv+V6vInyOVCl+yEJ3nH4Rf9a2UbCLZaB/HTnhu8ejjwz7mnklbsGnGHyUi9VRIz24u02lxXVOZrrAQNsNdxDz8Lyu2RGAbFGdN+iw8alRVLhErv0n8TgWm5CUBoon3e1g6gEoXswLqNWrpJXagQeamHaflpehGJ0zubqXohf3OP4hxRD7apeeAvXfT7/O0uQCGnLQAlgH3bHWCx6O9xSshfpfoevnsKlTxMHyIc4hx76yA3picCKwRdtnnJbBOqSIT9/8VAhp3WJxOWbGwp0J44u5E4PjHuL5h5kt0NOFADyysS+/RLG3GZN4VJ9qzFb1uQ4qeJpS5/6iRFiwbS09h/TP8F4XjuY478xuSR4fhUH1qz0EA3R6PRtjRP1nFSOdqH3SZd10rFphUij+uOoDpUaAI5FFqld0+iBO2/hiQEdJSCm+/gk0n+hyqnHJfNIvTMC7OFOKLR2+yWZC4saRNKu/BcIdY9BA/VurQAUykrlwP+bp3GvqTnWCHuRNpNuAoz6h3ITeCq8Rm+ZW5O3JFB4H1EQUf+6L8=

config/karma.conf.js

Lines changed: 3 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,5 @@
11
var path = require('path'),
2-
webpackConfig = require('./webpack.config'),
3-
customLaunchers = {
4-
sl_chrome: {
5-
base: 'SauceLabs',
6-
browserName: 'chrome',
7-
platform: 'Windows 7',
8-
version: 'latest'
9-
},
10-
sl_firefox: {
11-
base: 'SauceLabs',
12-
browserName: 'firefox',
13-
platform: 'Windows 10',
14-
version: 'latest'
15-
},
16-
sl_ios_safari: {
17-
base: 'SauceLabs',
18-
appiumVersion: '1.5.2',
19-
browserName: 'Safari',
20-
deviceName: "iPhone 6",
21-
platformName: 'iOS',
22-
platformVersion: '9.2',
23-
name: 'iPhone 6'
24-
},
25-
sl_osx_safari: {
26-
base: 'SauceLabs',
27-
browserName: 'Safari',
28-
platform: 'OS X 10.11',
29-
version: '9.0'
30-
},
31-
sl_ie_11: {
32-
base: 'SauceLabs',
33-
browserName: 'internet explorer',
34-
platform: 'Windows 8.1',
35-
version: '11.0'
36-
},
37-
sl_edge: {
38-
base: 'SauceLabs',
39-
browserName: 'MicrosoftEdge',
40-
platform: 'Windows 10',
41-
version: '13.10586'
42-
}
43-
}
2+
webpackConfig = require('./webpack.config');
443

454
webpackConfig.module.rules[0].query = { plugins: ['rewire'] }
465
webpackConfig.devtool = 'inline-source-map'
@@ -57,15 +16,11 @@ module.exports = function (config) {
5716
preprocessors[path.resolve('src/test/unit/tests.bundle.js')] = ['webpack', 'sourcemap']
5817
return preprocessors
5918
}()),
60-
sauceLabs: {
61-
testName: 'react-fine-uploader tests'
62-
},
63-
customLaunchers: customLaunchers,
64-
browsers: Object.keys(customLaunchers),
19+
browsers: ['Firefox'],
6520
browserNoActivityTimeout: 30000,
6621
captureTimeout: 120000,
6722
concurrency: 5,
68-
reporters: ['spec', 'saucelabs'],
23+
reporters: ['spec'],
6924
singleRun: true,
7025
webpack: webpackConfig,
7126
webpackMiddleware: {

config/karma.dev.conf.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-fine-uploader",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"license": "MIT",
55
"description": "React UI components for using Fine Uploader in a React-based project.",
66
"author": {
@@ -51,7 +51,6 @@
5151
"karma": "1.5.0",
5252
"karma-firefox-launcher": "1.0.1",
5353
"karma-jasmine": "1.1.0",
54-
"karma-sauce-launcher": "1.1.0",
5554
"karma-sourcemap-loader": "0.3.7",
5655
"karma-spec-reporter": "0.0.30",
5756
"karma-webpack": "2.0.3",
@@ -76,6 +75,6 @@
7675
"release": "npm run test && npm run build && npm run push-to-npm",
7776
"start": "(php -S 0.0.0.0:9090 -t src/test/manual -c src/test/manual/php.ini)",
7877
"start-no-s3": "php -S 0.0.0.0:9090 -t src/test/manual -c src/test/manual/php.ini",
79-
"test": "npm run lint && if [ $CI ]; then karma start config/karma.conf; else karma start config/karma.dev.conf; fi"
78+
"test": "npm run lint && karma start config/karma.conf"
8079
}
8180
}

0 commit comments

Comments
 (0)