Skip to content

Commit c30c684

Browse files
authored
Merge pull request #895 from radiolips/master
Update Travis, use Chrome Headless for tests
2 parents 8036294 + 984fce2 commit c30c684

File tree

5 files changed

+155
-322
lines changed

5 files changed

+155
-322
lines changed

.travis.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
language: node_js
22
node_js:
3-
- 7.7.2
3+
- 8.11.1
44
env:
55
- CXX=g++-4.8
6+
sudo: required
67
addons:
8+
chrome: stable
79
apt:
810
sources:
911
- ubuntu-toolchain-r-test
1012
packages:
1113
- g++-4.8
1214
before_install:
13-
- npm install -g protractor@3.3.0
15+
#- npm install -g protractor@3.3.0
1416
install:
15-
- npm install -g npm@2
17+
- npm install -g npm@6.0.1
1618
- npm install -g grunt-cli
1719
- npm install -g bower
18-
- npm install selenium-webdriver
19-
- bower install
20+
#- npm install selenium-webdriver
2021
- npm install
21-
- ./node_modules/protractor/bin/webdriver-manager update --standalone
22+
- bower install
23+
#- ./node_modules/protractor/bin/webdriver-manager update --standalone
2224
before_script:
23-
- export CHROME_BIN=chromium-browser
24-
- export DISPLAY=:99.0
25-
- sh -e /etc/init.d/xvfb start
25+
#- export CHROME_BIN=chromium-browser
26+
#- export DISPLAY=:99.0
27+
#- sh -e /etc/init.d/xvfb start
2628
script:
2729
- npm run build
2830
- npm test

karma.conf.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module.exports = function(config) {
3333
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
3434
preprocessors: {
3535
'src/gridstack.js': ['coverage'],
36-
'src/gridstack.jQueryUI.js': ['coverage'],
36+
'src/gridstack.jQueryUI.js': ['coverage']
3737
},
3838

3939

@@ -67,8 +67,13 @@ module.exports = function(config) {
6767

6868
// start these browsers
6969
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
70-
browsers: ['PhantomJS'],
71-
70+
browsers: ['ChromeHeadlessCustom'],
71+
customLaunchers: {
72+
ChromeHeadlessCustom: {
73+
base: 'ChromeHeadless',
74+
flags: ['--window-size=800,600']
75+
}
76+
},
7277

7378
// Continuous Integration mode
7479
// if true, Karma captures browsers, runs the tests and exits

0 commit comments

Comments
 (0)