Skip to content

Commit 89e7418

Browse files
committed
feat(data): add Microsoft Edge testing; update WebKit Docker image
1 parent 2910235 commit 89e7418

File tree

1 file changed

+35
-8
lines changed

1 file changed

+35
-8
lines changed

.circleci/config.yml

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,24 @@ executors:
2424
working_directory: ~/amplify-js
2525

2626
js-test-executor:
27+
docker:
28+
- image: cypress/included:12.4.1
29+
- image: verdaccio/verdaccio
30+
auth:
31+
username: $DOCKERHUB_USERNAME
32+
password: $DOCKERHUB_ACCESS_TOKEN
33+
resource_class: large
34+
35+
# TODO: Update tests that use this image to use the updated `js-test-executor`
36+
# After upgrading the Docker image to 12.4.1, we had to make several updates to our samples (see
37+
# https://github.com/aws-amplify/amplify-js-samples-staging/pull/522).
38+
# This is because our current implementation of setting network status in our E2E tests began to
39+
# fail (i.e. this is no longer supported). We updated our samples to instead use the Reachability
40+
# component's helper function for setting network status
41+
# (see https://github.com/aws-amplify/amplify-js/blob/main/packages/core/src/Util/Reachability.ts#L42-L54).
42+
# However, several JS tests were still failing after attempting to remediate. An item has been
43+
# added to the JS backlog for follow-up.
44+
js-test-executor-prev:
2745
docker:
2846
- image: cypress/included:8.7.0
2947
- image: verdaccio/verdaccio
@@ -39,7 +57,7 @@ executors:
3957

4058
webkit-test-executor:
4159
docker:
42-
- image: mcr.microsoft.com/playwright:v1.29.2-focal
60+
- image: mcr.microsoft.com/playwright:v1.30.0-focal
4361
- image: verdaccio/verdaccio
4462
auth:
4563
username: $DOCKERHUB_USERNAME
@@ -401,6 +419,7 @@ jobs:
401419
echo $SSH_HOST_PUBLIC_KEY >> ~/.ssh/known_hosts
402420
git clone $AMPLIFY_JS_SAMPLES_STAGING_URL
403421
cd amplify-js-samples-staging
422+
git checkout edge-testing-2
404423
branchExists=true
405424
git ls-remote --heads origin <<pipeline.git.branch>> | grep <<pipeline.git.branch>> >/dev/null || branchExists=false
406425
if [ "$branchExists" = true ]; then git checkout <<pipeline.git.branch>>; fi
@@ -418,7 +437,8 @@ jobs:
418437
parameters:
419438
browser:
420439
type: string
421-
executor: js-test-executor
440+
# TODO: see `js-test-executor` TODO above
441+
executor: js-test-executor-prev
422442
<<: *test_env_vars
423443
working_directory: ~/amplify-js-samples-staging/samples
424444
steps:
@@ -448,7 +468,8 @@ jobs:
448468
parameters:
449469
browser:
450470
type: string
451-
executor: js-test-executor
471+
# TODO: see `js-test-executor` TODO above
472+
executor: js-test-executor-prev
452473
<<: *test_env_vars
453474
working_directory: ~/amplify-js-samples-staging/samples
454475
steps:
@@ -1353,7 +1374,8 @@ jobs:
13531374
browser: << parameters.browser >>
13541375

13551376
integ_react_iot_reconnect:
1356-
executor: js-test-executor
1377+
# TODO: see `js-test-executor` TODO above
1378+
executor: js-test-executor-prev
13571379
<<: *test_env_vars
13581380
working_directory: ~/amplify-js-samples-staging/samples/react/pubsub/reconnection-iot
13591381
steps:
@@ -1368,7 +1390,8 @@ jobs:
13681390
browser: chrome
13691391

13701392
integ_react_api_reconnect:
1371-
executor: js-test-executor
1393+
# TODO: see `js-test-executor` TODO above
1394+
executor: js-test-executor-prev
13721395
<<: *test_env_vars
13731396
working_directory: ~/amplify-js-samples-staging/samples/react/pubsub/reconnection-api
13741397
steps:
@@ -1515,7 +1538,7 @@ jobs:
15151538
git config --global user.name $GITHUB_USER
15161539
git status
15171540
git --no-pager diff
1518-
yarn publish:$CIRCLE_BRANCH
1541+
# yarn publish:$CIRCLE_BRANCH
15191542
15201543
post_release:
15211544
executor: build-executor
@@ -1553,10 +1576,14 @@ releasable_branches: &releasable_branches
15531576
- 1.0-stable
15541577
- geo/main
15551578
- in-app-messaging/main
1579+
- edge-testing-2
15561580

15571581
test_browsers: &test_browsers
15581582
browser: [chrome, firefox]
15591583

1584+
all_test_browsers: &all_test_browsers
1585+
browser: [chrome, firefox, edge]
1586+
15601587
datastore_auth_scenarios: &datastore_auth_scenarios
15611588
scenario: [
15621589
owner-based-default, # TODO: Add `owner-based-operations` when tests pass
@@ -2007,7 +2034,7 @@ workflows:
20072034
<<: *releasable_branches
20082035
matrix:
20092036
parameters:
2010-
<<: *test_browsers
2037+
<<: *all_test_browsers
20112038
- integ_react_datastore_custom_pk_unconnected_models_webkit:
20122039
requires:
20132040
- integ_setup
@@ -2040,7 +2067,7 @@ workflows:
20402067
<<: *releasable_branches
20412068
matrix:
20422069
parameters:
2043-
<<: *test_browsers
2070+
<<: *all_test_browsers
20442071
- integ_react_datastore_background_process_manager_webkit:
20452072
requires:
20462073
- integ_setup

0 commit comments

Comments
 (0)