dc/ng2-file-upload
4
0
Fork 0
Code Issues 395 Pull Requests 27 Packages Projects Releases 4 Wiki Activity

fix(ci): fix xvfb service issue

Browse Source
This commit is contained in:
Vitaliy Makogon
2019-10-22 16:04:21 +03:00
parent 2888f4cb11
commit 33ac156208
4 changed files with 333 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -1,11 +1,13 @@
language: node_js language: node_js
node_js: node_js:
- "6" - "10"
services:
- xvfb
before_install: before_install:
- export CHROME_BIN=chromium-browser - export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0 - export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
script: script:
- npm run pretest - npm run pretest

1115
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

17
package.json
View File

@@ -73,17 +73,16 @@
"gitignore-to-glob": "0.3.0", "gitignore-to-glob": "0.3.0",
"google-code-prettify": "1.0.5", "google-code-prettify": "1.0.5",
"html-loader": "^0.5.5", "html-loader": "^0.5.5",
"jasmine": "2.5.3", "jasmine-core": "3.1.0",
"jasmine-core": "2.5.2",
"jasmine-data-provider": "2.2.0", "jasmine-data-provider": "2.2.0",
"jasmine-spec-reporter": "3.2.0", "jasmine-spec-reporter": "4.2.1",
"karma": "1.4.0", "karma": "4.1.0",
"karma-chrome-launcher": "^2.0.0", "karma-chrome-launcher": "2.2.0",
"karma-cli": "^1.0.1", "karma-cli": "^1.0.1",
"karma-coverage-istanbul-reporter": "^1.3.0", "karma-coverage-istanbul-reporter": "1.4.3",
"karma-jasmine": "^1.0.2", "karma-jasmine": "1.1.2",
"karma-remap-istanbul": "0.4.0", "karma-remap-istanbul": "0.6.0",
"karma-sauce-launcher": "1.1.0", "karma-sauce-launcher": "1.2.0",
"lite-server": "2.2.2", "lite-server": "2.2.2",
"lodash": "4.17.4", "lodash": "4.17.4",
"markdown-loader": "^5.1.0", "markdown-loader": "^5.1.0",

18
test/karma.conf.js
View File

@@ -23,12 +23,20 @@ module.exports = function (config) {
colors: true, colors: true,
logLevel: config.LOG_INFO, logLevel: config.LOG_INFO,
autoWatch: true, autoWatch: true,
browsers: ['Chrome'], browsers: ['ChromeHeadless'],
browserNoActivityTimeout: 20000,
browserDisconnectTolerance: 2,
browserDisconnectTimeout: 5000,
singleRun: true, singleRun: true,
customLaunchers: { customLaunchers: {
Chrome_travis_ci: { Chrome_travis_ci: {
base: 'Chrome', base: 'ChromeHeadless',
flags: ['--no-sandbox'] flags: [
'--headless',
'--disable-gpu',
'--no-sandbox',
'--remote-debugging-port=9222'
]
} }
}, },
mime: { 'text/x-typescript': ['ts','tsx'] }, mime: { 'text/x-typescript': ['ts','tsx'] },
@@ -59,10 +67,10 @@ module.exports = function (config) {
}, },
public: 'public' public: 'public'
}; };
configuration.captureTimeout = 0; configuration.captureTimeout = 60000;
configuration.customLaunchers = customLaunchers(); configuration.customLaunchers = customLaunchers();
configuration.browsers = Object.keys(configuration.customLaunchers); configuration.browsers = Object.keys(configuration.customLaunchers);
configuration.concurrency = 3; configuration.concurrency = 4;
configuration.browserDisconnectTolerance = 2; configuration.browserDisconnectTolerance = 2;
configuration.browserNoActivityTimeout = 20000; configuration.browserNoActivityTimeout = 20000;
configuration.browserDisconnectTimeout = 5000; configuration.browserDisconnectTimeout = 5000;