feat(data): update E2E config to remove deprecated CPK + related mode…

…l tests; update new tests to use extended browser list (#11839)
aws-amplify · Aug 25, 2023 · 8d1f79a · 8d1f79a
2 parents bf80b0d + 4ce41a5
commit 8d1f79a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 168 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1266,75 +1266,6 @@ jobs:
           spec: next-owner-based-default
           browser: << parameters.browser >>
 
-  # TODO: re-enable or backfill test cases
-  # integ_react_datastore_custom_pk_unconnected_models:
-  #   parameters:
-  #     browser:
-  #       type: string
-  #   executor: js-test-executor
-  #   <<: *test_env_vars
-  #   working_directory: ~/amplify-js-samples-staging/samples/react/datastore/v2/custom-pk-unconnected-models
-  #   steps:
-  #     - prepare_test_env
-  #     - integ_test_js:
-  #         test_name: 'DataStore - Custom Primary Key (Connected Models)'
-  #         framework: react
-  #         category: datastore
-  #         sample_name: v2/custom-pk-unconnected-models
-  #         spec: custom-pk-unconnected-models
-  #         browser: << parameters.browser >>
-
-  # TODO: re-enable or backfill test cases
-  # integ_react_datastore_custom_pk_unconnected_models_webkit:
-  #   executor: webkit-test-executor
-  #   <<: *test_env_vars
-  #   working_directory: ~/amplify-js-samples-staging/samples/react/datastore/v2/custom-pk-unconnected-models
-  #   steps:
-  #     - prepare_test_env
-  #     - integ_test_js:
-  #         test_name: 'DataStore - Custom Primary Key (Connected Models)'
-  #         framework: react
-  #         category: datastore
-  #         sample_name: v2/custom-pk-unconnected-models
-  #         spec: custom-pk-unconnected-models
-  #         browser: webkit
-
-  # TODO: re-enable or backfill test cases
-  # integ_react_datastore_custom_pk_has_one:
-  #   parameters:
-  #     browser:
-  #       type: string
-  #   executor: js-test-executor
-  #   <<: *test_env_vars
-  #   working_directory: ~/amplify-js-samples-staging/samples/react/datastore/v2/custom-pk-has-one
-  #   steps:
-  #     - prepare_test_env
-  #     - integ_test_js:
-  #         test_name: 'DataStore - Custom Primary Key (Has One)'
-  #         framework: react
-  #         category: datastore
-  #         sample_name: v2/custom-pk-has-one
-  #         spec: custom-pk-has-one
-  #         browser: << parameters.browser >>
-
-  # TODO: re-enable or backfill test cases
-  # integ_react_datastore_custom_pk_has_many_many_to_many:
-  #   parameters:
-  #     browser:
-  #       type: string
-  #   executor: js-test-executor
-  #   <<: *test_env_vars
-  #   working_directory: ~/amplify-js-samples-staging/samples/react/datastore/v2/custom-pk-has-many-many-to-many
-  #   steps:
-  #     - prepare_test_env
-  #     - integ_test_js:
-  #         test_name: 'DataStore - Custom Primary Key (Has Many / Many to Many)'
-  #         framework: react
-  #         category: datastore
-  #         sample_name: v2/custom-pk-has-many-many-to-many
-  #         spec: custom-pk-has-many-many-to-many
-  #         browser: << parameters.browser >>
-
   integ_react_datastore_background_process_manager:
     parameters:
       browser:
@@ -2119,40 +2050,6 @@ workflows:
           matrix:
             parameters:
               <<: *minimal_browser_list
-      # TODO: re-enable or backfill test cases
-      # - integ_react_datastore_custom_pk_unconnected_models:
-      #     requires:
-      #       - integ_setup
-      #       - build
-      #     filters:
-      #       <<: *releasable_branches
-      #     matrix:
-      #       parameters:
-      #         <<: *extended_browser_list
-      # - integ_react_datastore_custom_pk_unconnected_models_webkit:
-      #     requires:
-      #       - integ_setup
-      #       - build
-      #     filters:
-      #       <<: *releasable_branches
-      # - integ_react_datastore_custom_pk_has_one:
-      #     requires:
-      #       - integ_setup
-      #       - build
-      #     filters:
-      #       <<: *releasable_branches
-      #     matrix:
-      #       parameters:
-      #         <<: *minimal_browser_list
-      # - integ_react_datastore_custom_pk_has_many_many_to_many:
-      #     requires:
-      #       - integ_setup
-      #       - build
-      #     filters:
-      #       <<: *releasable_branches
-      #     matrix:
-      #       parameters:
-      #         <<: *minimal_browser_list
       - integ_react_datastore_background_process_manager:
           requires:
             - integ_setup

diff --git a/.github/canary-config/canary-all.yml b/.github/canary-config/canary-all.yml
@@ -58,22 +58,6 @@ tests:
     sample_name: [schema-drift]
     spec: schema-drift
     browser: *minimal_browser_list
-  # TODO: re-enable or backfill test cases
-  # - test_name: integ_react_datastore_custom_pk_has_one
-  #   desc: 'DataStore - Custom Primary Key (Has One)'
-  #   framework: react
-  #   category: datastore
-  #   sample_name: [v2/custom-pk-has-one]
-  #   spec: custom-pk-has-one
-  #   browser: *minimal_browser_list
-  # TODO: re-enable or backfill test cases
-  # - test_name: integ_react_datastore_custom_pk_has_many_many_to_many
-  #   desc: 'DataStore - Custom Primary Key (Has Many / Many to Many)'
-  #   framework: react
-  #   category: datastore
-  #   sample_name: [v2/custom-pk-has-many-many-to-many]
-  #   spec: custom-pk-has-many-many-to-many
-  #   browser: *minimal_browser_list
   - test_name: integ_react_datastore_background_process_manager
     desc: 'DataStore - Background Process Manager'
     framework: react

diff --git a/.github/integ-config/integ-all.yml b/.github/integ-config/integ-all.yml
@@ -314,41 +314,6 @@ tests:
     sample_name: [schema-drift]
     spec: schema-drift
     browser: *minimal_browser_list
-  # TODO disable after updated tests and sample are merged
-  # - test_name: integ_react_datastore_custom_pk_unconnected_models
-  #   desc: 'DataStore - Custom Primary Key (Connected Models)'
-  #   framework: react
-  #   category: datastore
-  #   sample_name: [v2/custom-pk-unconnected-models]
-  #   spec: custom-pk-unconnected-models
-  #   browser: *extended_browser_list
-  #   timeout_minutes: 60
-  # TODO disable after updated tests and sample are merged
-  # - test_name: integ_react_datastore_custom_pk_unconnected_models_webkit
-  #   desc: 'DataStore - Custom Primary Key (Connected Models)'
-  #   framework: react
-  #   category: datastore
-  #   sample_name: [v2/custom-pk-unconnected-models]
-  #   spec: custom-pk-unconnected-models
-  #   browser: [webkit]
-  # TODO disable after updated tests and sample are merged
-  # - test_name: integ_react_datastore_custom_pk_has_one
-  #   desc: 'DataStore - Custom Primary Key (Has One)'
-  #   framework: react
-  #   category: datastore
-  #   sample_name: [v2/custom-pk-has-one]
-  #   spec: custom-pk-has-one
-  #   browser: *minimal_browser_list
-  #   timeout_minutes: 60
-  # TODO disable after updated tests and sample are merged
-  # - test_name: integ_react_datastore_custom_pk_has_many_many_to_many
-  #   desc: 'DataStore - Custom Primary Key (Has Many / Many to Many)'
-  #   framework: react
-  #   category: datastore
-  #   sample_name: [v2/custom-pk-has-many-many-to-many]
-  #   spec: custom-pk-has-many-many-to-many
-  #   browser: *minimal_browser_list
-  #   timeout_minutes: 60
   - test_name: integ_react_datastore_background_process_manager
     desc: 'DataStore - Background Process Manager'
     framework: react
@@ -363,26 +328,13 @@ tests:
   #   sample_name: [v2/background-process-manager]
   #   spec: background-process-manager
   #   browser: [webkit]
-  # TODO: remove when updated CPK + related models tests are added
-  - test_name: integ_react_datastore_related_models
-    desc: 'DataStore - Related Models'
-    framework: react
-    category: datastore
-    sample_name: [related-models]
-    spec: related-models
-    # TODO update to `extended_browser_list` when removing CPK samples.
-    # Using minimal list now to prevent unnecessary test runs before CPK
-    # samples are disabled.
-    browser: *minimal_browser_list
-    timeout_minutes: 45
-    retry_count: 10
   - test_name: integ_react_datastore_cpk_related_models
     desc: 'DataStore - Custom Primary Key + Related Models'
     framework: react
     category: datastore
     sample_name: [v2/related-models]
     spec: cpk-related-models
-    browser: *minimal_browser_list
+    browser: *extended_browser_list
     timeout_minutes: 45
     retry_count: 10
   - test_name: integ_react_datastore_selective_sync