Skip to content

Commit 38c906c

Browse files
committed
chore(protractor): update protractor to ~4.0.11
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.11. 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 9687081 commit 38c906c

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.travis.yml

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

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
"portfinder": "1.0.9",
9898
"postcss-discard-comments": "^2.0.4",
9999
"postcss-loader": "^0.9.1",
100-
"protractor": "^3.3.0",
101100
"quick-temp": "0.1.5",
102101
"raw-loader": "^0.5.1",
103102
"readline2": "0.1.1",

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"start": "ng serve",
88
"lint": "tslint \"<%= sourceDir %>/**/*.ts\"",
99
"test": "ng test",
10-
"pree2e": "webdriver-manager update",
10+
"pree2e": "webdriver-manager update --standalone false --gecko false",
1111
"e2e": "protractor"
1212
},
1313
"private": true,
@@ -45,10 +45,9 @@
4545
"karma-cli": "^1.0.1",
4646
"karma-jasmine": "^1.0.2",
4747
"karma-remap-istanbul": "^0.2.1",
48-
"protractor": "4.0.9",
48+
"protractor": "~4.0.11",
4949
"ts-node": "1.2.1",
5050
"tslint": "^4.0.2",
51-
"typescript": "~2.0.3",
52-
"webdriver-manager": "10.2.5"
51+
"typescript": "~2.0.3"
5352
}
5453
}

0 commit comments

Comments
 (0)