Skip to content

Commit 76a5e32

Browse files
committed
chore(protractor): update protractor to ~4.0.13
package.json - Removed Protractor. `npm test` does not appear to be using Protractor. - Chromedriver 2.25 does not work well with Chromium, use Chrome. packages/angular-cli/blueprints/ng2/files/package.json - Update to protractor 4.0.13. see [changelog](https://github.com/angular/protractor/blob/master/CHANGELOG.md) - Remove webdriver-manager as a dependency. Protractor includes webdriver-manager as a dependency. - Since packages/angular-cli/blueprints/ng2/files/protractor.conf.js uses directConnect with chrome, the pree2e step does not need to download the selenium standalone server or gecko driver.
1 parent 901a64f commit 76a5e32

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.travis.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,14 @@ before_install:
4949
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap caskroom/cask; fi
5050
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask install google-chrome --force; fi
5151
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir ~/.config && echo "--no-sandbox" > ~/.config/chrome-flags.conf; fi
52+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then CHROME_BIN=/usr/bin/google-chrome; fi
5253
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi
5354
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi
54-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CHROME_BIN=chromium-browser; fi
55-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "--no-sandbox" > ~/.config/chromium-flags.conf; fi
55+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update; fi
56+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libappindicator1 fonts-liberation; fi
57+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb; fi
58+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo dpkg -i google-chrome*.deb; fi
59+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "--no-sandbox" > ~/.config/chrome-flags.conf; fi
5660
- if [[ "$TARGET" == "mobile" ]]; then export MOBILE_TEST=true; fi
5761
- npm install -g npm
5862
- npm config set spin false

packages/angular-cli/blueprints/ng2/files/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"start": "ng serve",
99
"lint": "tslint \"<%= sourceDir %>/**/*.ts\"",
1010
"test": "ng test",
11-
"pree2e": "webdriver-manager update",
11+
"pree2e": "webdriver-manager update --standalone false --gecko false",
1212
"e2e": "protractor"
1313
},
1414
"private": true,
@@ -39,10 +39,9 @@
3939
"karma-cli": "^1.0.1",
4040
"karma-jasmine": "^1.0.2",
4141
"karma-remap-istanbul": "^0.2.1",
42-
"protractor": "4.0.9",
42+
"protractor": "~4.0.13",
4343
"ts-node": "1.2.1",
4444
"tslint": "^4.0.2",
45-
"typescript": "~2.0.3",
46-
"webdriver-manager": "10.2.5"
45+
"typescript": "~2.0.3"
4746
}
4847
}

0 commit comments

Comments
 (0)