Skip to content

Commit dd6fde5

Browse files
committed
ci: fix protractor tests
1 parent c3814b6 commit dd6fde5

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

scripts/test.sh

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,27 @@ do
5959
ngx new --no-analytics --automate "$CWD/$file" "$TEST_APP_NAME" --no-insights
6060
npm run test:ci
6161

62-
# force specific puppeteer/webdriver version to match up
63-
if [ "$NGX_PACKAGE_MANAGER" == "yarn" ]; then
64-
yarn add npm i puppeteer@12.0.1
65-
# yarn run webdriver-manager update --versions.chrome 79.0.3945.36 --gecko=false
62+
USE_PROTRACTOR=$(npm list --depth 0 --parseable protractor)
63+
64+
if [ -z "$USE_PROTRACTOR" ]; then
65+
# force specific puppeteer/webdriver version to match up
66+
if [ "$NGX_PACKAGE_MANAGER" == "yarn" ]; then
67+
yarn add npm i puppeteer@16.2.0
68+
yarn run webdriver-manager update --versions.chrome 104.0.5112.79 --gecko=false
69+
else
70+
npm i puppeteer@16.2.0
71+
npx webdriver-manager update --versions.chrome 104.0.5112.79 --gecko=false
72+
fi
73+
74+
# force usage of local chrome binary, in headless mode
75+
PROTRACTOR_CHROME_BIN=$(node -p "require('puppeteer').executablePath()") \
76+
PROTRACTOR_CHROME_ARGS='["lang=en-US","--headless","--disable-gpu","--window-size=1024,768"]' \
77+
npm run e2e --if-present -- --webdriver-update=false
6678
else
67-
npm i puppeteer@12.0.1
68-
# npx webdriver-manager update --versions.chrome 79.0.3945.36 --gecko=false
79+
npm run e2e:ci --if-present
6980
fi
7081

71-
# force usage of local chrome binary, in headless mode
72-
PROTRACTOR_CHROME_BIN=$(node -p "require('puppeteer').executablePath()") \
73-
PROTRACTOR_CHROME_ARGS='["lang=en-US","--headless","--disable-gpu","--window-size=1024,768"]' \
74-
npm run e2e --if-present # -- --webdriver-update=false
75-
82+
npm run e2e --if-present
7683
npm run build -- --no-progress
7784

7885
if [ -n "$TEST_ANDROID" ]; then

0 commit comments

Comments
 (0)