Skip to content

Commit

Permalink
chore: Sync console-preview with next/main (#12362)
Browse files Browse the repository at this point in the history
  • Loading branch information
jimblanc authored Oct 19, 2023
2 parents 8d88eef + 7f2215a commit b278dcb
Show file tree
Hide file tree
Showing 176 changed files with 4,345 additions and 3,219 deletions.
4 changes: 2 additions & 2 deletions .github/integ-config/detox-integ-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
- test_name: 'integ_rn_ios_device_tracking'
working_directory: amplify-js-samples-staging/samples/react-native/auth/deviceTracking
timeout_minutes: 120
# - test_name: 'integ_rn_ios_datastore_sqlite_adapter'
# working_directory: ~/amplify-js-samples-staging/samples/react-native/datastore/SQLiteAdapter
- test_name: 'integ_rn_ios_datastore_sqlite_adapter'
working_directory: amplify-js-samples-staging/samples/react-native/datastore/SQLiteAdapter
# - test_name: 'integ_rn_android_storage'
# working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/StorageApp
# - test_name: 'integ_rn_android_storage_multipart_progress'
Expand Down
200 changes: 103 additions & 97 deletions .github/integ-config/integ-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,13 @@ tests:
sample_name: [v2/multi-auth-v2]
spec: multi-auth-one-rule
browser: *minimal_browser_list
- test_name: integ_react_datastore_multi_auth_one_rule_oidc_v2
desc: 'React DataStore Multi-Auth OIDC - One Rule CLI v2'
framework: react
category: datastore
sample_name: [v2/multi-auth-oidc-v2]
spec: multi-auth-one-rule-oidc
browser: *minimal_browser_list
- test_name: integ_react_datastore_multi_auth_two_rules
desc: 'React DataStore Multi-Auth - Two Rules'
framework: react
Expand All @@ -251,6 +258,13 @@ tests:
sample_name: [v2/multi-auth-v2]
spec: multi-auth-two-rules
browser: *minimal_browser_list
- test_name: integ_react_datastore_multi_auth_two_rules_oidc_v2
desc: 'React DataStore Multi-Auth OIDC - Two Rules CLI v2'
framework: react
category: datastore
sample_name: [v2/multi-auth-oidc-v2]
spec: multi-auth-two-rules-oidc
browser: *minimal_browser_list
- test_name: integ_react_datastore_multi_auth_three_plus_rules
desc: 'React DataStore Multi-Auth - Three Plus Rules'
framework: react
Expand Down Expand Up @@ -427,6 +441,13 @@ tests:
sample_name: [graphql]
spec: graphql
browser: *minimal_browser_list
- test_name: integ_react_api_optimistic_ui
desc: React GraphQL API Optimistic UI with Tan/ReactQuery
framework: react
category: api
sample_name: [optimistic-ui]
spec: optimistic-ui
browser: *minimal_browser_list

# AUTH
- test_name: integ_react_javascript_authentication
Expand Down Expand Up @@ -464,20 +485,6 @@ tests:
sample_name: [auto-signin-after-signup]
spec: auto-signin-after-signup
browser: *minimal_browser_list
- test_name: integ_react_amazon_cognito_identity_js_cookie_storage
desc: 'amazon-cognito-identity-js-cookie-storage'
framework: react
category: auth
sample_name: [amazon-cognito-identity-js-cookie-storage]
spec: amazon-cognito-identity-js-cookie-storage
browser: *minimal_browser_list
- test_name: integ_react_amazon_cognito_identity_js
desc: 'amazon-cognito-identity-js'
framework: react
category: auth
sample_name: [amazon-cognito-identity-js]
spec: amazon-cognito-identity-js
browser: *minimal_browser_list
- test_name: integ_react_device_tracking
desc: 'cognito-device-tracking'
framework: react
Expand All @@ -492,6 +499,26 @@ tests:
sample_name: [delete-user]
spec: delete-user
browser: *minimal_browser_list
- test_name: integ_next_auth_authenticator_and_ssr_page
desc: 'Authenticator and SSR page'
framework: next
category: auth
sample_name: [auth-ssr]
spec: auth-ssr
browser: *minimal_browser_list
- test_name: integ_next_auth_authenticator_and_rsc_page
desc: 'Authenticator and RSC page'
framework: next
category: auth
sample_name: [auth-rsc]
spec: auth-rsc
browser: [chrome]
timeout_minutes: 45
retry_count: 10

# DISABLED Angular/Vue tests:
# TODO: delete tests or add custom ui logic to support them.

# - test_name: integ_angular_auth_angular_authenticator
# desc: 'Angular Authenticator'
# framework: angular
Expand All @@ -506,14 +533,6 @@ tests:
# sample_name: [amplify-authenticator]
# spec: custom-authenticator
# browser: *minimal_browser_list
- test_name: integ_javascript_auth
desc: 'JavaScript Auth CDN'
framework: javascript
category: auth
sample_name: [auth-cdn]
spec: auth-cdn
browser: *minimal_browser_list
amplifyjs_dir: true
# - test_name: integ_vue_auth_legacy_vue_authenticator
# desc: 'Legacy Vue Authenticator'
# framework: vue
Expand All @@ -528,31 +547,18 @@ tests:
# sample_name: [authenticator-vue3]
# spec: new-ui-authenticator
# browser: *minimal_browser_list
# TODO(v6) Migrate once SSR updates available
- test_name: integ_next_auth_authenticator_and_ssr_page
desc: 'Authenticator and SSR page'
framework: next
category: auth
sample_name: [auth-ssr]
spec: auth-ssr
browser: *minimal_browser_list
# TODO(v6) Migrate once SSR updates available
- test_name: integ_next_auth_authenticator_and_rsc_page
desc: 'Authenticator and RSC page'
framework: next
category: auth
sample_name: [auth-rsc]
spec: auth-rsc
browser: [chrome]
timeout_minutes: 45
retry_count: 10
- test_name: integ_next_auth_nextjs_auth_custom_implementation_with_ssr
desc: 'NextJS Auth Custom Implementation with SSR'
framework: next
category: auth
sample_name: [custom-auth-ssr]
spec: authenticator
browser: *minimal_browser_list

# DISABLED CDN test:
# TODO: delete this test after making sure CDN won't be supported

# - test_name: integ_javascript_auth
# desc: 'JavaScript Auth CDN'
# framework: javascript
# category: auth
# sample_name: [auth-cdn]
# spec: auth-cdn
# browser: *minimal_browser_list
# amplifyjs_dir: true

# ANALYTICS
- test_name: integ_react_analytics_pinpoint
Expand Down Expand Up @@ -635,48 +641,48 @@ tests:
# amplifyjs_dir: true

# INTERACTIONS
- test_name: integ_react_interactions_react_interactions
desc: 'React Interactions'
framework: react
category: interactions
sample_name: [chatbot-component]
spec: chatbot-component
browser: *minimal_browser_list
- test_name: integ_react_interactions_chatbot_v1
desc: 'Chatbot V1'
framework: react
category: interactions
sample_name: [lex-test-component]
spec: chatbot-v1
browser: *minimal_browser_list
- test_name: integ_react_interactions_chatbot_v2
desc: 'Chatbot V2'
framework: react
category: interactions
sample_name: [lex-test-component]
spec: chatbot-v2
browser: *minimal_browser_list
- test_name: integ_angular_interactions
desc: 'Angular Interactions'
framework: angular
category: interactions
sample_name: [chatbot-component]
spec: chatbot-component
browser: *minimal_browser_list
- test_name: integ_vue_interactions_vue_2_interactions
desc: 'Vue 2 Interactions'
framework: vue
category: interactions
sample_name: [chatbot-component]
spec: chatbot-component
browser: [chrome]
- test_name: integ_vue_interactionsvue_3_interactions
desc: 'Vue 3 Interactions'
framework: vue
category: interactions
sample_name: [chatbot-component-vue3]
spec: chatbot-component
browser: [chrome]
# - test_name: integ_react_interactions_react_interactions
# desc: 'React Interactions'
# framework: react
# category: interactions
# sample_name: [chatbot-component]
# spec: chatbot-component
# browser: *minimal_browser_list
# - test_name: integ_react_interactions_chatbot_v1
# desc: 'Chatbot V1'
# framework: react
# category: interactions
# sample_name: [lex-test-component]
# spec: chatbot-v1
# browser: *minimal_browser_list
# - test_name: integ_react_interactions_chatbot_v2
# desc: 'Chatbot V2'
# framework: react
# category: interactions
# sample_name: [lex-test-component]
# spec: chatbot-v2
# browser: *minimal_browser_list
# - test_name: integ_angular_interactions
# desc: 'Angular Interactions'
# framework: angular
# category: interactions
# sample_name: [chatbot-component]
# spec: chatbot-component
# browser: *minimal_browser_list
# - test_name: integ_vue_interactions_vue_2_interactions
# desc: 'Vue 2 Interactions'
# framework: vue
# category: interactions
# sample_name: [chatbot-component]
# spec: chatbot-component
# browser: [chrome]
# - test_name: integ_vue_interactionsvue_3_interactions
# desc: 'Vue 3 Interactions'
# framework: vue
# category: interactions
# sample_name: [chatbot-component-vue3]
# spec: chatbot-component
# browser: [chrome]

# PREDICTIONS
# - test_name: integ_react_predictions
Expand All @@ -688,14 +694,14 @@ tests:
# browser: *minimal_browser_list

# PUBSUB
# - test_name: integ_react_iot_reconnect
# desc: 'PubSub - Reconnection for IoT'
# framework: react
# category: pubsub
# sample_name: [reconnection-iot]
# spec: reconnection
# # Firefox doesn't support network state management in cypress
# browser: [chrome]
- test_name: integ_react_iot_reconnect
desc: 'PubSub - Reconnection for IoT'
framework: react
category: pubsub
sample_name: [reconnection-iot]
spec: reconnection
# Firefox doesn't support network state management in cypress
browser: [chrome]
- test_name: integ_react_api_reconnect
desc: 'PubSub - Reconnection for API'
framework: react
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"--inspect-brk",
"${workspaceRoot}/node_modules/.bin/jest",
// Optionally specify a single test file to run/debug:
"sync.test.ts",
"subscription.test.ts",
"--runInBand",
"--testTimeout",
"600000", // 10 min timeout so jest doesn't error while we're stepping through code
Expand Down
3 changes: 3 additions & 0 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"packages/api-rest",
"packages/api-graphql",
"packages/datastore",
"packages/datastore-storage-adapter",
"packages/interactions",
"packages/pubsub",
"packages/rtn-web-browser",
"packages/notifications",
"packages/rtn-push-notification",
Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
"packages/api-graphql",
"packages/api",
"packages/datastore",
"packages/datastore-storage-adapter",
"packages/interactions",
"packages/pubsub",
"packages/notifications",
"packages/rtn-push-notification",
"packages/aws-amplify",
Expand Down
Loading

0 comments on commit b278dcb

Please sign in to comment.