Skip to content

Commit 5a159f3

Browse files
committed
Merge remote-tracking branch 'origin/master' into ClientSideIndexDeleteAllIndexesNoTestingHooks
2 parents d00fe82 + 5f6304d commit 5a159f3

File tree

3 files changed

+37
-20
lines changed

3 files changed

+37
-20
lines changed

.github/workflows/test-all.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ jobs:
1717
# Install Chrome so the correct version of webdriver can be installed by chromedriver when
1818
# setting up the repo. This must be done to build and execute Auth properly.
1919
- name: install Chrome stable
20-
# Install Chrome version 110.0.5481.177-1 as some Auth tests start to fail on version 111.
21-
# Temporary: Auth team will explore what's going wrong with the auth tests.
20+
# Pin Chrome version 114.0.5735.90-1 to avoid install failures like "No such object: chromedriver/LATEST_RELEASE_115.0.5790".
21+
# The failure happens because https://chromedriver.chromium.org/downloads only goes up to version 114.
22+
# TODO(b/297380444) Update script to install the latest Chrome and ChromeDriver.
2223
run: |
2324
sudo apt-get update
2425
sudo apt-get install wget
25-
sudo wget http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_110.0.5481.177-1_amd64.deb
26-
sudo apt-get install -f ./google-chrome-stable_110.0.5481.177-1_amd64.deb --allow-downgrades
26+
sudo wget http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb
27+
sudo apt-get install -f ./google-chrome-stable_114.0.5735.90-1_amd64.deb --allow-downgrades
2728
- uses: actions/checkout@v3
2829
- name: Set up Node (16)
2930
uses: actions/setup-node@v3
@@ -102,13 +103,14 @@ jobs:
102103
steps:
103104
# install Chrome so the correct version of webdriver can be installed by chromedriver when setting up the repo
104105
- name: install Chrome stable
105-
# Install Chrome version 110.0.5481.177-1 as some Auth tests start to fail on version 111.
106-
# Temporary: Auth team will explore what's going wrong with the auth tests.
106+
# Pin Chrome version 114.0.5735.90-1 to avoid install failures like "No such object: chromedriver/LATEST_RELEASE_115.0.5790".
107+
# The failure happens because https://chromedriver.chromium.org/downloads only goes up to version 114.
108+
# TODO(b/297380444) Update script to install the latest Chrome and ChromeDriver.
107109
run: |
108110
sudo apt-get update
109111
sudo apt-get install wget
110-
sudo wget http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_110.0.5481.177-1_amd64.deb
111-
sudo apt-get install -f ./google-chrome-stable_110.0.5481.177-1_amd64.deb --allow-downgrades
112+
sudo wget http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb
113+
sudo apt-get install -f ./google-chrome-stable_114.0.5735.90-1_amd64.deb --allow-downgrades
112114
- name: Download build archive
113115
uses: actions/download-artifact@v3
114116
with:

.github/workflows/test-changed-auth.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ jobs:
1414
steps:
1515
# install Chrome first, so the correct version of webdriver can be installed by chromedriver when setting up the repo
1616
- name: install Chrome stable
17-
# Install Chrome version 110.0.5481.177-1 as test starts to fail on version 111.
18-
# Temporary: Auth team will explore what's going wrong with the auth tests.
17+
# Pin Chrome version 114.0.5735.90-1 to avoid install failures like "No such object: chromedriver/LATEST_RELEASE_115.0.5790".
18+
# The failure happens because https://chromedriver.chromium.org/downloads only goes up to version 114.
19+
# TODO(b/297380444) Update script to install the latest Chrome and ChromeDriver.
1920
run: |
2021
sudo apt-get update
2122
sudo apt-get install wget
22-
sudo wget http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_110.0.5481.177-1_amd64.deb
23-
sudo apt-get install -f ./google-chrome-stable_110.0.5481.177-1_amd64.deb --allow-downgrades
23+
sudo wget http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb
24+
sudo apt-get install -f ./google-chrome-stable_114.0.5735.90-1_amd64.deb --allow-downgrades
2425
- name: Checkout Repo
2526
uses: actions/checkout@master
2627
with:
@@ -48,16 +49,17 @@ jobs:
4849

4950
runs-on: ubuntu-20.04
5051

51-
# Chrome webdriver version is pinned to avoid install failures like "No such object: chromedriver/LATEST_RELEASE_115.0.5790"
52-
# These are installed even in the Firefox test due to `yarn` command which pulls the devDependency listed in package.json.
52+
# Pin Chrome version 114.0.5735.90-1 to avoid install failures like "No such object: chromedriver/LATEST_RELEASE_115.0.5790".
53+
# The failure happens because https://chromedriver.chromium.org/downloads only goes up to version 114.
54+
# TODO(b/297380444) Update script to install the latest Chrome and ChromeDriver.
5355
steps:
5456
- name: install Firefox stable
5557
run: |
5658
sudo apt-get update
5759
sudo apt-get install firefox
5860
sudo apt-get install wget
59-
sudo wget http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_110.0.5481.177-1_amd64.deb
60-
sudo apt-get install -f ./google-chrome-stable_110.0.5481.177-1_amd64.deb --allow-downgrades
61+
sudo wget http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb
62+
sudo apt-get install -f ./google-chrome-stable_114.0.5735.90-1_amd64.deb --allow-downgrades
6163
6264
- name: Checkout Repo
6365
uses: actions/checkout@master

packages/auth/test/integration/webdriver/redirect.test.ts

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,13 @@ import { START_FUNCTION } from './util/auth_driver';
3939
use(chaiAsPromised);
4040

4141
browserDescribe('WebDriver redirect IdP test', driver => {
42-
beforeEach(async () => {
43-
await driver.pause(200); // Race condition on auth init
42+
afterEach(async function () {
43+
this.timeout(25000); // Starting browsers can be slow.
44+
45+
// Redirect tests are flaky on Chrome v111+
46+
// Stop and re-initialize the webdrive instance to prevent flakiness.
47+
await driver.stop();
48+
await driver.start('chrome');
4449
});
4550

4651
it('allows users to sign in', async () => {
@@ -327,7 +332,11 @@ browserDescribe('WebDriver redirect IdP test', driver => {
327332
expect(user.email).to.eq(user1.email);
328333
});
329334

330-
it('reauthenticate throws for wrong user', async () => {
335+
it('reauthenticate throws for wrong user', async function () {
336+
// Test is ignored for now as it fails on Chrome version 111+.
337+
// TODO(b/297245662): Investigate and unskip the test.
338+
this.skip();
339+
331340
// Sign in using pre-poulated user
332341
await driver.callNoWait(RedirectFunction.IDP_REDIRECT);
333342

@@ -350,7 +359,11 @@ browserDescribe('WebDriver redirect IdP test', driver => {
350359
);
351360
});
352361

353-
it('handles aborted sign ins', async () => {
362+
it('handles aborted sign ins', async function () {
363+
// Test is ignored for now as it fails on Chrome version 111+.
364+
// TODO(b/297245662): Investigate and unskip the test.
365+
this.skip();
366+
354367
await driver.callNoWait(RedirectFunction.IDP_REDIRECT);
355368
const widget = new IdPPage(driver.webDriver);
356369

0 commit comments

Comments
 (0)