From c3e159e9fc134bc0dd85bf437916fbef969bdd80 Mon Sep 17 00:00:00 2001 From: Dan Kiuna Date: Sat, 27 Jan 2024 15:20:44 -0600 Subject: [PATCH 01/13] fix: Kebab case to Camel case config props --- .../location-service/AmazonLocationServiceProvider.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/geo/src/providers/location-service/AmazonLocationServiceProvider.ts b/packages/geo/src/providers/location-service/AmazonLocationServiceProvider.ts index 79488643d50..c3589d69d95 100644 --- a/packages/geo/src/providers/location-service/AmazonLocationServiceProvider.ts +++ b/packages/geo/src/providers/location-service/AmazonLocationServiceProvider.ts @@ -153,7 +153,7 @@ export class AmazonLocationServiceProvider implements GeoProvider { */ let locationServiceInput: SearchPlaceIndexForTextCommandInput = { Text: text, - IndexName: this._config.search_indices.default, + IndexName: this._config.searchIndices.default, }; /** @@ -219,7 +219,7 @@ export class AmazonLocationServiceProvider implements GeoProvider { */ let locationServiceInput: SearchPlaceIndexForSuggestionsCommandInput = { Text: text, - IndexName: this._config.search_indices.default, + IndexName: this._config.searchIndices.default, }; /** @@ -288,8 +288,7 @@ export class AmazonLocationServiceProvider implements GeoProvider { const searchByPlaceIdInput: GetPlaceCommandInput = { PlaceId: placeId, - IndexName: - options?.searchIndexName || this._config.search_indices.default, + IndexName: options?.searchIndexName || this._config.searchIndices.default, }; const command = new GetPlaceCommand(searchByPlaceIdInput); @@ -328,7 +327,7 @@ export class AmazonLocationServiceProvider implements GeoProvider { const locationServiceInput: SearchPlaceIndexForPositionCommandInput = { Position: coordinates, - IndexName: this._config.search_indices.default, + IndexName: this._config.searchIndices.default, }; if (options) { From 38164f83f534b0dcce4bf9674eb7fb961d072fa5 Mon Sep 17 00:00:00 2001 From: Dan Kiuna Date: Mon, 29 Jan 2024 19:19:25 -0600 Subject: [PATCH 02/13] fix: Typo on I18n comment --- packages/core/src/I18n/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/I18n/index.ts b/packages/core/src/I18n/index.ts index 97740114877..b2ccde160ba 100644 --- a/packages/core/src/I18n/index.ts +++ b/packages/core/src/I18n/index.ts @@ -83,7 +83,7 @@ export class I18n { * @static * @method * Add vocabularies for one language - * @param {String} langurage - Language of the dictionary + * @param {String} language - Language of the dictionary * @param {Object} vocabularies - Object that has key-value as dictionary entry */ static putVocabulariesForLanguage( From 2e8f146abb7bd498149f5ca7cc0b3b6cb79a9406 Mon Sep 17 00:00:00 2001 From: Dan Kiuna Date: Thu, 1 Feb 2024 13:13:23 -0600 Subject: [PATCH 03/13] address fix in tests --- .../Providers/AmazonLocationServiceProvider.test.ts | 8 ++++---- packages/geo/__tests__/testData.ts | 2 +- packages/react-native/example/package.json | 2 +- scripts/tsc-compliance-test/package.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/geo/__tests__/Providers/AmazonLocationServiceProvider.test.ts b/packages/geo/__tests__/Providers/AmazonLocationServiceProvider.test.ts index c44e391b21a..0709e9ab8ac 100644 --- a/packages/geo/__tests__/Providers/AmazonLocationServiceProvider.test.ts +++ b/packages/geo/__tests__/Providers/AmazonLocationServiceProvider.test.ts @@ -199,7 +199,7 @@ describe('AmazonLocationServiceProvider', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ Text: testString, - IndexName: awsConfig.geo.amazon_location_service.search_indices.default, + IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, }); }); @@ -367,7 +367,7 @@ describe('AmazonLocationServiceProvider', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ Text: testString, - IndexName: awsConfig.geo.amazon_location_service.search_indices.default, + IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, }); }); @@ -527,7 +527,7 @@ describe('AmazonLocationServiceProvider', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ PlaceId: testPlaceId, - IndexName: awsConfig.geo.amazon_location_service.search_indices.default, + IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, }); }); @@ -609,7 +609,7 @@ describe('AmazonLocationServiceProvider', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ Position: testCoordinates, - IndexName: awsConfig.geo.amazon_location_service.search_indices.default, + IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, }); }); diff --git a/packages/geo/__tests__/testData.ts b/packages/geo/__tests__/testData.ts index e2d243d6cca..3e3ff507baf 100644 --- a/packages/geo/__tests__/testData.ts +++ b/packages/geo/__tests__/testData.ts @@ -36,7 +36,7 @@ export const awsConfig = { }, default: 'geoJsExampleMap1', }, - search_indices: { + searchIndices: { items: ['geoJSSearchExample'], default: 'geoJSSearchExample', }, diff --git a/packages/react-native/example/package.json b/packages/react-native/example/package.json index 631ece5d033..b3b18041f2e 100644 --- a/packages/react-native/example/package.json +++ b/packages/react-native/example/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/react-native-example", - "version": "0.0.14", + "version": "0.0.15-alpha.0", "private": true, "scripts": { "android": "react-native run-android", diff --git a/scripts/tsc-compliance-test/package.json b/scripts/tsc-compliance-test/package.json index 364517c20bb..c153d354a8e 100644 --- a/scripts/tsc-compliance-test/package.json +++ b/scripts/tsc-compliance-test/package.json @@ -1,11 +1,11 @@ { "name": "tsc-compliance-test", - "version": "0.1.13", + "version": "0.1.14-alpha.0", "license": "MIT", "private": true, "devDependencies": { "@types/node": "^16.11.7", - "aws-amplify": "6.0.13", + "aws-amplify": "6.0.14-alpha.0", "typescript": "4.2.x" }, "scripts": { From edd34bcc8edd8437fe2fde9dddafbf679bd3b678 Mon Sep 17 00:00:00 2001 From: Dan Kiuna Date: Thu, 1 Feb 2024 15:16:53 -0600 Subject: [PATCH 04/13] Resolve build error --- packages/react-native/example/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native/example/package.json b/packages/react-native/example/package.json index b3b18041f2e..631ece5d033 100644 --- a/packages/react-native/example/package.json +++ b/packages/react-native/example/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/react-native-example", - "version": "0.0.15-alpha.0", + "version": "0.0.14", "private": true, "scripts": { "android": "react-native run-android", From 099e9a3528df4ade22aa755e04e33c91418ba998 Mon Sep 17 00:00:00 2001 From: Dan Kiuna Date: Thu, 1 Feb 2024 15:18:25 -0600 Subject: [PATCH 05/13] Resolve build error --- scripts/tsc-compliance-test/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/tsc-compliance-test/package.json b/scripts/tsc-compliance-test/package.json index c153d354a8e..364517c20bb 100644 --- a/scripts/tsc-compliance-test/package.json +++ b/scripts/tsc-compliance-test/package.json @@ -1,11 +1,11 @@ { "name": "tsc-compliance-test", - "version": "0.1.14-alpha.0", + "version": "0.1.13", "license": "MIT", "private": true, "devDependencies": { "@types/node": "^16.11.7", - "aws-amplify": "6.0.14-alpha.0", + "aws-amplify": "6.0.13", "typescript": "4.2.x" }, "scripts": { From 13e9cee831352ab5a6ba4ef5c18f9b5e92968fc2 Mon Sep 17 00:00:00 2001 From: Dan Kiuna Date: Thu, 1 Feb 2024 16:46:26 -0600 Subject: [PATCH 06/13] resolve PR failures --- packages/geo/__tests__/Geo.test.ts | 8 ++++---- packages/react-native/example/package.json | 2 +- scripts/tsc-compliance-test/package.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/geo/__tests__/Geo.test.ts b/packages/geo/__tests__/Geo.test.ts index 6a65c407eb7..2df4b76210f 100644 --- a/packages/geo/__tests__/Geo.test.ts +++ b/packages/geo/__tests__/Geo.test.ts @@ -251,7 +251,7 @@ describe('Geo', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ Text: testString, - IndexName: awsConfig.geo.amazon_location_service.search_indices.default, + IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, }); }); @@ -368,7 +368,7 @@ describe('Geo', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ PlaceId: testPlaceId, - IndexName: awsConfig.geo.amazon_location_service.search_indices.default, + IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, }); }); @@ -414,7 +414,7 @@ describe('Geo', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ Text: testString, - IndexName: awsConfig.geo.amazon_location_service.search_indices.default, + IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, }); }); @@ -530,7 +530,7 @@ describe('Geo', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ Position: testCoordinates, - IndexName: awsConfig.geo.amazon_location_service.search_indices.default, + IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, }); }); diff --git a/packages/react-native/example/package.json b/packages/react-native/example/package.json index b3b18041f2e..631ece5d033 100644 --- a/packages/react-native/example/package.json +++ b/packages/react-native/example/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/react-native-example", - "version": "0.0.15-alpha.0", + "version": "0.0.14", "private": true, "scripts": { "android": "react-native run-android", diff --git a/scripts/tsc-compliance-test/package.json b/scripts/tsc-compliance-test/package.json index c153d354a8e..364517c20bb 100644 --- a/scripts/tsc-compliance-test/package.json +++ b/scripts/tsc-compliance-test/package.json @@ -1,11 +1,11 @@ { "name": "tsc-compliance-test", - "version": "0.1.14-alpha.0", + "version": "0.1.13", "license": "MIT", "private": true, "devDependencies": { "@types/node": "^16.11.7", - "aws-amplify": "6.0.14-alpha.0", + "aws-amplify": "6.0.13", "typescript": "4.2.x" }, "scripts": { From 8e8f46e3be736f72e60c5444949ef5e54bed87d4 Mon Sep 17 00:00:00 2001 From: Dan Kiuna Date: Fri, 16 Feb 2024 13:55:28 -0600 Subject: [PATCH 07/13] update Geo tests --- packages/geo/__tests__/Geo.test.ts | 50 +++--- .../AmazonLocationServiceProvider.test.ts | 152 +++++++++--------- packages/geo/__tests__/testData.ts | 3 +- 3 files changed, 103 insertions(+), 102 deletions(-) diff --git a/packages/geo/__tests__/Geo.test.ts b/packages/geo/__tests__/Geo.test.ts index 2df4b76210f..1f331aff552 100644 --- a/packages/geo/__tests__/Geo.test.ts +++ b/packages/geo/__tests__/Geo.test.ts @@ -111,7 +111,7 @@ describe('Geo', () => { geo.addPluggable(provider); expect(geo.getPluggable(provider.getProviderName())).toBeInstanceOf( - AmazonLocationServiceProvider + AmazonLocationServiceProvider, ); }); @@ -123,7 +123,7 @@ describe('Geo', () => { geo.removePluggable(provider.getProviderName()); expect(() => geo.getPluggable(provider.getProviderName())).toThrow( - 'No plugin found in Geo for the provider' + 'No plugin found in Geo for the provider', ); }); }); @@ -133,7 +133,7 @@ describe('Geo', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const geo = new GeoClass(); expect(geo.getPluggable('AmazonLocationService')).toBeInstanceOf( - AmazonLocationServiceProvider + AmazonLocationServiceProvider, ); }); }); @@ -149,10 +149,10 @@ describe('Geo', () => { geo.removePluggable('AmazonLocationService'); expect(() => geo.getAvailableMaps()).toThrow( - 'No plugin found in Geo for the provider' + 'No plugin found in Geo for the provider', ); expect(() => geo.getDefaultMap()).toThrow( - 'No plugin found in Geo for the provider' + 'No plugin found in Geo for the provider', ); }); @@ -163,7 +163,7 @@ describe('Geo', () => { const geo = new GeoClass(); expect(() => geo.getAvailableMaps()).toThrow( - "No map resources found in amplify config, run 'amplify add geo' to create one and run `amplify push` after" + "No map resources found in amplify config, run 'amplify add geo' to create one and run `amplify push` after", ); }); @@ -188,7 +188,7 @@ describe('Geo', () => { const geo = new GeoClass(); expect(() => geo.getDefaultMap()).toThrow( - "No Geo configuration found in amplify config, run 'amplify add geo' to create one and run `amplify push` after" + "No Geo configuration found in amplify config, run 'amplify add geo' to create one and run `amplify push` after", ); }); @@ -199,7 +199,7 @@ describe('Geo', () => { const geo = new GeoClass(); expect(() => geo.getDefaultMap()).toThrow( - "No map resources found in amplify config, run 'amplify add geo' to create one and run `amplify push` after" + "No map resources found in amplify config, run 'amplify add geo' to create one and run `amplify push` after", ); }); @@ -214,7 +214,7 @@ describe('Geo', () => { const geo = new GeoClass(); expect(() => geo.getDefaultMap()).toThrow( - "No default map resource found in amplify config, run 'amplify add geo' to create one and run `amplify push` after" + "No default map resource found in amplify config, run 'amplify add geo' to create one and run `amplify push` after", ); }); @@ -251,7 +251,7 @@ describe('Geo', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ Text: testString, - IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, + IndexName: awsConfig.geo.amazon_location_service.search_indices.default, }); }); @@ -330,7 +330,7 @@ describe('Geo', () => { }; await expect(geo.searchByText(testString, searchOptions)).rejects.toThrow( - 'BiasPosition and SearchAreaConstraints are mutually exclusive, please remove one or the other from the options object' + 'BiasPosition and SearchAreaConstraints are mutually exclusive, please remove one or the other from the options object', ); }); @@ -344,7 +344,7 @@ describe('Geo', () => { geo.removePluggable('AmazonLocationService'); await expect(geo.searchByText(testString)).rejects.toThrow( - 'No plugin found in Geo for the provider' + 'No plugin found in Geo for the provider', ); }); }); @@ -368,7 +368,7 @@ describe('Geo', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ PlaceId: testPlaceId, - IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, + IndexName: awsConfig.geo.amazon_location_service.search_indices.default, }); }); @@ -382,7 +382,7 @@ describe('Geo', () => { geo.removePluggable('AmazonLocationService'); await expect(geo.searchByPlaceId(testPlaceId)).rejects.toThrow( - 'No plugin found in Geo for the provider' + 'No plugin found in Geo for the provider', ); }); }); @@ -414,7 +414,7 @@ describe('Geo', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ Text: testString, - IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, + IndexName: awsConfig.geo.amazon_location_service.search_indices.default, }); }); @@ -491,9 +491,9 @@ describe('Geo', () => { }; await expect( - geo.searchForSuggestions(testString, searchOptions) + geo.searchForSuggestions(testString, searchOptions), ).rejects.toThrow( - 'BiasPosition and SearchAreaConstraints are mutually exclusive, please remove one or the other from the options object' + 'BiasPosition and SearchAreaConstraints are mutually exclusive, please remove one or the other from the options object', ); }); @@ -507,7 +507,7 @@ describe('Geo', () => { geo.removePluggable('AmazonLocationService'); await expect(geo.searchForSuggestions(testString)).rejects.toThrow( - 'No plugin found in Geo for the provider' + 'No plugin found in Geo for the provider', ); }); }); @@ -530,7 +530,7 @@ describe('Geo', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ Position: testCoordinates, - IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, + IndexName: awsConfig.geo.amazon_location_service.search_indices.default, }); }); @@ -548,7 +548,7 @@ describe('Geo', () => { }; const results = await geo.searchByCoordinates( testCoordinates, - searchOptions + searchOptions, ); expect(results).toEqual(testPlaceCamelCase); @@ -571,7 +571,7 @@ describe('Geo', () => { geo.removePluggable('AmazonLocationService'); await expect(geo.searchByCoordinates(testCoordinates)).rejects.toThrow( - 'No plugin found in Geo for the provider' + 'No plugin found in Geo for the provider', ); }); }); @@ -629,7 +629,7 @@ describe('Geo', () => { // Expect that the API was called the right amount of times const expectedNumberOfCalls = Math.floor(validGeofences.length / 10) + 1; expect(LocationClient.prototype.send).toHaveBeenCalledTimes( - expectedNumberOfCalls + expectedNumberOfCalls, ); }); @@ -643,7 +643,7 @@ describe('Geo', () => { geo.removePluggable('AmazonLocationService'); await expect(geo.saveGeofences(validGeofence1)).rejects.toThrow( - 'No plugin found in Geo for the provider' + 'No plugin found in Geo for the provider', ); }); }); @@ -723,10 +723,10 @@ describe('Geo', () => { expect(second100Geofences.entries.length).toEqual(100); expect(second100Geofences.entries[0].geofenceId).toEqual( - 'validGeofenceId100' + 'validGeofenceId100', ); expect(second100Geofences.entries[99].geofenceId).toEqual( - 'validGeofenceId199' + 'validGeofenceId199', ); }); }); diff --git a/packages/geo/__tests__/Providers/AmazonLocationServiceProvider.test.ts b/packages/geo/__tests__/Providers/AmazonLocationServiceProvider.test.ts index 0709e9ab8ac..e52aebf7ad3 100644 --- a/packages/geo/__tests__/Providers/AmazonLocationServiceProvider.test.ts +++ b/packages/geo/__tests__/Providers/AmazonLocationServiceProvider.test.ts @@ -117,7 +117,7 @@ describe('AmazonLocationServiceProvider', () => { }); const provider = new AmazonLocationServiceProvider(); expect(() => provider.getAvailableMaps()).toThrow( - "No map resources found in amplify config, run 'amplify add geo' to create one and run `amplify push` after" + "No map resources found in amplify config, run 'amplify add geo' to create one and run `amplify push` after", ); }); @@ -142,7 +142,7 @@ describe('AmazonLocationServiceProvider', () => { const provider = new AmazonLocationServiceProvider(); expect(() => provider.getDefaultMap()).toThrow( - "No map resources found in amplify config, run 'amplify add geo' to create one and run `amplify push` after" + "No map resources found in amplify config, run 'amplify add geo' to create one and run `amplify push` after", ); }); @@ -156,11 +156,11 @@ describe('AmazonLocationServiceProvider', () => { }; (Amplify.getConfig as jest.Mock).mockReturnValue(noDefaultMapConfig); const provider = new AmazonLocationServiceProvider( - noDefaultMapConfig as any + noDefaultMapConfig as any, ); expect(() => provider.getDefaultMap()).toThrow( - "No default map resource found in amplify config, run 'amplify add geo' to create one and run `amplify push` after" + "No default map resource found in amplify config, run 'amplify add geo' to create one and run `amplify push` after", ); }); @@ -189,7 +189,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const results = await locationProvider.searchByText(testString); @@ -199,7 +199,7 @@ describe('AmazonLocationServiceProvider', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ Text: testString, - IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, + IndexName: awsConfig.geo.amazon_location_service.search_indices.default, }); }); @@ -210,7 +210,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const searchOptions: SearchByTextOptions = { @@ -222,7 +222,7 @@ describe('AmazonLocationServiceProvider', () => { const results = await locationProvider.searchByText( testString, - searchOptions + searchOptions, ); expect(results).toEqual([testPlaceCamelCase]); @@ -245,7 +245,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const searchOptions: SearchByTextOptions = { @@ -257,7 +257,7 @@ describe('AmazonLocationServiceProvider', () => { const resultsWithConstraints = await locationProvider.searchByText( testString, - searchOptions + searchOptions, ); expect(resultsWithConstraints).toEqual([testPlaceCamelCase]); @@ -279,7 +279,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const searchOptions: SearchByTextOptions = { @@ -291,9 +291,9 @@ describe('AmazonLocationServiceProvider', () => { }; await expect( - locationProvider.searchByText(testString, searchOptions) + locationProvider.searchByText(testString, searchOptions), ).rejects.toThrow( - 'BiasPosition and SearchAreaConstraints are mutually exclusive, please remove one or the other from the options object' + 'BiasPosition and SearchAreaConstraints are mutually exclusive, please remove one or the other from the options object', ); }); @@ -305,7 +305,7 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect(locationProvider.searchByText(testString)).rejects.toThrow( - 'No credentials' + 'No credentials', ); }); @@ -317,7 +317,7 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect(locationProvider.searchByText(testString)).rejects.toThrow( - 'No credentials' + 'No credentials', ); }); @@ -332,7 +332,7 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); expect(locationProvider.searchByText(testString)).rejects.toThrow( - 'No Search Index found in amplify config, please run `amplify add geo` to create one and run `amplify push` after.' + 'No Search Index found in amplify config, please run `amplify add geo` to create one and run `amplify push` after.', ); }); }); @@ -356,7 +356,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const results = await locationProvider.searchForSuggestions(testString); @@ -367,7 +367,7 @@ describe('AmazonLocationServiceProvider', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ Text: testString, - IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, + IndexName: awsConfig.geo.amazon_location_service.search_indices.default, }); }); @@ -378,7 +378,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const searchOptions: SearchByTextOptions = { @@ -390,7 +390,7 @@ describe('AmazonLocationServiceProvider', () => { const results = await locationProvider.searchForSuggestions( testString, - searchOptions + searchOptions, ); expect(results).toEqual(testResults); @@ -413,7 +413,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const searchOptions: SearchByTextOptions = { @@ -445,7 +445,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const searchOptions: SearchByTextOptions = { @@ -457,9 +457,9 @@ describe('AmazonLocationServiceProvider', () => { }; await expect( - locationProvider.searchForSuggestions(testString, searchOptions) + locationProvider.searchForSuggestions(testString, searchOptions), ).rejects.toThrow( - 'BiasPosition and SearchAreaConstraints are mutually exclusive, please remove one or the other from the options object' + 'BiasPosition and SearchAreaConstraints are mutually exclusive, please remove one or the other from the options object', ); }); @@ -471,7 +471,7 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect( - locationProvider.searchForSuggestions(testString) + locationProvider.searchForSuggestions(testString), ).rejects.toThrow('No credentials'); }); @@ -483,7 +483,7 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect( - locationProvider.searchForSuggestions(testString) + locationProvider.searchForSuggestions(testString), ).rejects.toThrow('No credentials'); }); @@ -498,9 +498,9 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect( - locationProvider.searchForSuggestions(testString) + locationProvider.searchForSuggestions(testString), ).rejects.toThrow( - 'No Search Index found in amplify config, please run `amplify add geo` to create one and run `amplify push` after.' + 'No Search Index found in amplify config, please run `amplify add geo` to create one and run `amplify push` after.', ); }); }); @@ -516,7 +516,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const results = await locationProvider.searchByPlaceId(testPlaceId); @@ -527,7 +527,7 @@ describe('AmazonLocationServiceProvider', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ PlaceId: testPlaceId, - IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, + IndexName: awsConfig.geo.amazon_location_service.search_indices.default, }); }); @@ -538,11 +538,11 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); await expect(locationProvider.searchByPlaceId('')).rejects.toThrow( - 'PlaceId cannot be an empty string.' + 'PlaceId cannot be an empty string.', ); }); @@ -554,7 +554,7 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect( - locationProvider.searchByPlaceId(testPlaceId) + locationProvider.searchByPlaceId(testPlaceId), ).rejects.toThrow('No credentials'); }); @@ -566,7 +566,7 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect( - locationProvider.searchByPlaceId(testPlaceId) + locationProvider.searchByPlaceId(testPlaceId), ).rejects.toThrow('No credentials'); }); @@ -581,9 +581,9 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect( - locationProvider.searchByPlaceId(testPlaceId) + locationProvider.searchByPlaceId(testPlaceId), ).rejects.toThrow( - 'No Search Index found in amplify config, please run `amplify add geo` to create one and run `amplify push` after.' + 'No Search Index found in amplify config, please run `amplify add geo` to create one and run `amplify push` after.', ); }); }); @@ -598,7 +598,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const results = @@ -609,7 +609,7 @@ describe('AmazonLocationServiceProvider', () => { const input = spyon.mock.calls[0][0].input; expect(input).toEqual({ Position: testCoordinates, - IndexName: awsConfig.geo.amazon_location_service.searchIndices.default, + IndexName: awsConfig.geo.amazon_location_service.search_indices.default, }); }); @@ -620,7 +620,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const searchOptions: SearchByCoordinatesOptions = { @@ -629,7 +629,7 @@ describe('AmazonLocationServiceProvider', () => { }; const results = await locationProvider.searchByCoordinates( testCoordinates, - searchOptions + searchOptions, ); expect(results).toEqual(testPlaceCamelCase); @@ -650,7 +650,7 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect( - locationProvider.searchByCoordinates(testCoordinates) + locationProvider.searchByCoordinates(testCoordinates), ).rejects.toThrow('No credentials'); }); @@ -662,7 +662,7 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect( - locationProvider.searchByCoordinates(testCoordinates) + locationProvider.searchByCoordinates(testCoordinates), ).rejects.toThrow('No credentials'); }); @@ -677,9 +677,9 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect( - locationProvider.searchByCoordinates(testCoordinates) + locationProvider.searchByCoordinates(testCoordinates), ).rejects.toThrow( - 'No Search Index found in amplify config, please run `amplify add geo` to create one and run `amplify push` after.' + 'No Search Index found in amplify config, please run `amplify add geo` to create one and run `amplify push` after.', ); }); }); @@ -696,7 +696,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const results = await locationProvider.saveGeofences(validGeofences); @@ -711,7 +711,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const numberOfGeofences = 44; @@ -739,7 +739,7 @@ describe('AmazonLocationServiceProvider', () => { const spyClientInput = spyonClient.mock.calls; expect(spyClientInput.length).toEqual( - Math.ceil(spyProviderInput.length / 10) + Math.ceil(spyProviderInput.length / 10), ); }); @@ -750,7 +750,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const input = createGeofenceInputArray(44); @@ -812,13 +812,13 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); await expect( - locationProvider.saveGeofences([clockwiseGeofence]) + locationProvider.saveGeofences([clockwiseGeofence]), ).rejects.toThrow( - 'geofenceWithClockwiseGeofence: LinearRing coordinates must be wound counterclockwise' + 'geofenceWithClockwiseGeofence: LinearRing coordinates must be wound counterclockwise', ); }); @@ -833,11 +833,11 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); await expect(locationProvider.saveGeofences([])).rejects.toThrow( - 'Geofence input array is empty' + 'Geofence input array is empty', ); }); @@ -852,9 +852,9 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect( - locationProvider.saveGeofences(validGeofences) + locationProvider.saveGeofences(validGeofences), ).rejects.toThrow( - 'No Geofence Collections found, please run `amplify add geo` to create one and run `amplify push` after.' + 'No Geofence Collections found, please run `amplify add geo` to create one and run `amplify push` after.', ); }); }); @@ -871,7 +871,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const results: AmazonLocationServiceGeofence = @@ -899,12 +899,12 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const badGeofenceId = 't|-|!$ !$ N()T V@|_!D'; await expect(locationProvider.getGeofence(badGeofenceId)).rejects.toThrow( - `Invalid geofenceId: '${badGeofenceId}' - IDs can only contain alphanumeric characters, hyphens, underscores and periods.` + `Invalid geofenceId: '${badGeofenceId}' - IDs can only contain alphanumeric characters, hyphens, underscores and periods.`, ); }); @@ -919,7 +919,7 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect(locationProvider.getGeofence('geofenceId')).rejects.toThrow( - 'No Geofence Collections found, please run `amplify add geo` to create one and run `amplify push` after.' + 'No Geofence Collections found, please run `amplify add geo` to create one and run `amplify push` after.', ); }); }); @@ -936,7 +936,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const geofences = await locationProvider.listGeofences(); @@ -955,7 +955,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const first100Geofences = await locationProvider.listGeofences(); @@ -966,10 +966,10 @@ describe('AmazonLocationServiceProvider', () => { expect(second100Geofences.entries.length).toEqual(100); expect(second100Geofences.entries[0].geofenceId).toEqual( - 'validGeofenceId100' + 'validGeofenceId100', ); expect(second100Geofences.entries[99].geofenceId).toEqual( - 'validGeofenceId199' + 'validGeofenceId199', ); }); @@ -984,7 +984,7 @@ describe('AmazonLocationServiceProvider', () => { const locationProvider = new AmazonLocationServiceProvider(); await expect(locationProvider.listGeofences()).rejects.toThrow( - 'No Geofence Collections found, please run `amplify add geo` to create one and run `amplify push` after.' + 'No Geofence Collections found, please run `amplify add geo` to create one and run `amplify push` after.', ); }); }); @@ -1001,7 +1001,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const geofenceIds = validGeofences.map(({ geofenceId }) => geofenceId); @@ -1023,7 +1023,7 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const geofenceIds = validGeofences.map(({ geofenceId }) => geofenceId); @@ -1045,7 +1045,7 @@ describe('AmazonLocationServiceProvider', () => { const spyClientInput = spyonClient.mock.calls; expect(spyClientInput.length).toEqual( - Math.ceil(spyProviderInput.length / 10) + Math.ceil(spyProviderInput.length / 10), ); }); @@ -1056,11 +1056,11 @@ describe('AmazonLocationServiceProvider', () => { (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); const input = createGeofenceInputArray(44).map( - ({ geofenceId }) => geofenceId + ({ geofenceId }) => geofenceId, ); input[22] = 'badId'; const validEntries = [...input.slice(0, 20), ...input.slice(30, 44)]; @@ -1110,16 +1110,16 @@ describe('AmazonLocationServiceProvider', () => { }); (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); await expect( locationProvider.deleteGeofences([ 'thisIsAGoodId', 't|-|!$ !$ N()T V@|_!D', '#2 t|-|!$ !$ N()T V@|_!D', - ]) + ]), ).rejects.toThrow( - `Invalid geofence ids: t|-|!$ !$ N()T V@|_!D, #2 t|-|!$ !$ N()T V@|_!D` + `Invalid geofence ids: t|-|!$ !$ N()T V@|_!D, #2 t|-|!$ !$ N()T V@|_!D`, ); }); @@ -1129,10 +1129,10 @@ describe('AmazonLocationServiceProvider', () => { }); (Amplify.getConfig as jest.Mock).mockReturnValue(awsConfigGeoV4); const locationProvider = new AmazonLocationServiceProvider( - awsConfigGeoV4 + awsConfigGeoV4, ); await expect(locationProvider.deleteGeofences([])).rejects.toThrow( - `GeofenceId input array is empty` + `GeofenceId input array is empty`, ); }); @@ -1149,9 +1149,9 @@ describe('AmazonLocationServiceProvider', () => { const geofenceIds = validGeofences.map(({ geofenceId }) => geofenceId); await expect( - locationProvider.deleteGeofences(geofenceIds) + locationProvider.deleteGeofences(geofenceIds), ).rejects.toThrow( - 'No Geofence Collections found, please run `amplify add geo` to create one and run `amplify push` after.' + 'No Geofence Collections found, please run `amplify add geo` to create one and run `amplify push` after.', ); }); }); diff --git a/packages/geo/__tests__/testData.ts b/packages/geo/__tests__/testData.ts index 3e3ff507baf..00d83dd834e 100644 --- a/packages/geo/__tests__/testData.ts +++ b/packages/geo/__tests__/testData.ts @@ -36,7 +36,8 @@ export const awsConfig = { }, default: 'geoJsExampleMap1', }, - searchIndices: { + + search_indices: { items: ['geoJSSearchExample'], default: 'geoJSSearchExample', }, From f50912b08aca6e636707619c0452bef45d27f10c Mon Sep 17 00:00:00 2001 From: Dan Kiuna Date: Wed, 13 Mar 2024 16:42:49 -0500 Subject: [PATCH 08/13] Integ test check --- .github/integ-config/integ-all.yml | 1198 +++++++++++++------------ .github/workflows/push-integ-test.yml | 2 +- 2 files changed, 606 insertions(+), 594 deletions(-) diff --git a/.github/integ-config/integ-all.yml b/.github/integ-config/integ-all.yml index 82827def957..0c0918d4755 100644 --- a/.github/integ-config/integ-all.yml +++ b/.github/integ-config/integ-all.yml @@ -9,508 +9,520 @@ extended_browser_list: &extended_browser_list tests: # DATASTORE - - test_name: integ_datastore_auth-owner-based-default - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: owner-based-default - spec: owner-based-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth-static-user-pool-groups-default - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: static-user-pool-groups-default - spec: static-user-pool-groups-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth-static-user-pool-groups-operations - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: static-user-pool-groups-operations - spec: static-user-pool-groups-operations - browser: *minimal_browser_list - - test_name: integ_datastore_auth-owner-and-group-different-models-default - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: owner-and-group-different-models-default - spec: owner-and-group-different-models-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth-owner-and-group-same-model-default - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: owner-and-group-same-model-default - spec: owner-and-group-same-model-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth-owner-and-group-same-model-operations - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: owner-and-group-same-model-operations - spec: owner-and-group-same-model-operations - browser: *minimal_browser_list - - test_name: integ_datastore_auth-dynamic-user-pool-groups-default - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: dynamic-user-pool-groups-default - spec: dynamic-user-pool-groups-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth-dynamic-user-pool-groups-owner-based-default - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: dynamic-user-pool-groups-owner-based-default - spec: dynamic-user-pool-groups-owner-based-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth-private-auth-default - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: private-auth-default - spec: private-auth-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth-private-auth-iam - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: private-auth-iam - spec: private-auth-iam - browser: *minimal_browser_list - - test_name: integ_datastore_auth-public-auth-default - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: public-auth-default - spec: public-auth-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth-public-auth-iam - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: public-auth-iam - spec: public-auth-iam - browser: *minimal_browser_list - - test_name: integ_datastore_auth-owner-custom-claim-default - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: owner-custom-claim-default - spec: owner-custom-claim-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth-owner-custom-field-default - desc: 'DataStore Auth' - framework: react - category: datastore - sample_name: owner-custom-field-default - spec: owner-custom-field-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-owner-based-default - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/owner-based-default-v2 - spec: owner-based-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-static-user-pool-groups-default - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/static-user-pool-groups-default-v2 - spec: static-user-pool-groups-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-static-user-pool-groups-operations - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/static-user-pool-groups-operations-v2 - spec: static-user-pool-groups-operations - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-owner-and-group-different-models-default - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/owner-and-group-different-models-default-v2 - spec: owner-and-group-different-models-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-owner-and-group-same-model-default - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/owner-and-group-same-model-default-v2 - spec: owner-and-group-same-model-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-owner-and-group-same-model-operations - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/owner-and-group-same-model-operations-v2 - spec: owner-and-group-same-model-operations - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-dynamic-user-pool-groups-default - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/dynamic-user-pool-groups-default-v2 - spec: dynamic-user-pool-groups-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-dynamic-user-pool-groups-owner-based-default - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/dynamic-user-pool-groups-owner-based-default-v2 - spec: dynamic-user-pool-groups-owner-based-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-private-auth-default - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/private-auth-default-v2 - spec: private-auth-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-private-auth-iam - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/private-auth-iam-v2 - spec: private-auth-iam - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-public-auth-default - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/public-auth-default-v2 - spec: public-auth-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-public-auth-iam - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/public-auth-iam-v2 - spec: public-auth-iam - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-owner-custom-claim-default - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/owner-custom-claim-default-v2 - spec: owner-custom-claim-default - browser: *minimal_browser_list - - test_name: integ_datastore_auth_v2-owner-custom-field-default - desc: 'DataStore Auth CLI v2' - framework: react - category: datastore - sample_name: v2/owner-custom-field-default-v2 - spec: owner-custom-field-default - browser: *minimal_browser_list - - test_name: integ_react_datastore - desc: 'React DataStore' - framework: react - category: datastore - sample_name: [many-to-many] - spec: many-to-many - browser: *minimal_browser_list - - test_name: integ_react_datastore_v2 - desc: 'React DataStore CLI v2' - framework: react - category: datastore - sample_name: [v2/many-to-many-v2] - spec: many-to-many - browser: *minimal_browser_list - - test_name: integ_react_datastore_multi_auth_one_rule - desc: 'React DataStore Multi-Auth - One Rule' - framework: react - category: datastore - sample_name: [multi-auth] - spec: multi-auth-one-rule - browser: *minimal_browser_list - - test_name: integ_react_datastore_multi_auth_one_rule_v2 - desc: 'React DataStore Multi-Auth - One Rule CLI v2' - framework: react - category: datastore - 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 - category: datastore - sample_name: [multi-auth] - spec: multi-auth-two-rules - browser: *minimal_browser_list - - test_name: integ_react_datastore_multi_auth_two_rules_v2 - desc: 'React DataStore Multi-Auth - Two Rules CLI v2' - framework: react - category: datastore - 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 - category: datastore - sample_name: [multi-auth] - spec: multi-auth-three-plus-rules - browser: *minimal_browser_list - - test_name: integ_react_datastore_multi_auth_three_plus_rules_v2 - desc: 'React DataStore Multi-Auth - Three Plus Rules CLI v2' - framework: react - category: datastore - sample_name: [v2/multi-auth-v2] - spec: multi-auth-three-plus-rules - browser: *minimal_browser_list - - test_name: integ_react_datastore_subs_disabled - desc: 'DataStore - Subs Disabled' - framework: react - category: datastore - sample_name: [subs-disabled] - spec: subs-disabled - browser: *minimal_browser_list - - test_name: integ_react_datastore_subs_disabled_v2 - desc: 'DataStore - Subs Disabled CLI v2' - framework: react - category: datastore - sample_name: [v2/subs-disabled-v2] - spec: subs-disabled - browser: *minimal_browser_list - - test_name: integ_react_datastore_consecutive_saves - desc: 'DataStore - Subs Disabled' - framework: react - category: datastore - sample_name: [consecutive-saves] - spec: consecutive-saves - browser: *minimal_browser_list - - test_name: integ_react_datastore_consecutive_saves_v2 - desc: 'DataStore - Subs Disabled CLI v2' - framework: react - category: datastore - sample_name: [v2/consecutive-saves-v2] - spec: consecutive-saves - browser: *minimal_browser_list + # - test_name: integ_datastore_auth-owner-based-default + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: owner-based-default + # spec: owner-based-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth-static-user-pool-groups-default + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: static-user-pool-groups-default + # spec: static-user-pool-groups-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth-static-user-pool-groups-operations + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: static-user-pool-groups-operations + # spec: static-user-pool-groups-operations + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth-owner-and-group-different-models-default + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: owner-and-group-different-models-default + # spec: owner-and-group-different-models-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth-owner-and-group-same-model-default + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: owner-and-group-same-model-default + # spec: owner-and-group-same-model-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth-owner-and-group-same-model-operations + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: owner-and-group-same-model-operations + # spec: owner-and-group-same-model-operations + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth-dynamic-user-pool-groups-default + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: dynamic-user-pool-groups-default + # spec: dynamic-user-pool-groups-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth-dynamic-user-pool-groups-owner-based-default + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: dynamic-user-pool-groups-owner-based-default + # spec: dynamic-user-pool-groups-owner-based-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth-private-auth-default + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: private-auth-default + # spec: private-auth-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth-private-auth-iam + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: private-auth-iam + # spec: private-auth-iam + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth-public-auth-default + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: public-auth-default + # spec: public-auth-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth-public-auth-iam + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: public-auth-iam + # spec: public-auth-iam + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth-owner-custom-claim-default + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: owner-custom-claim-default + # spec: owner-custom-claim-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth-owner-custom-field-default + # desc: 'DataStore Auth' + # framework: react + # category: datastore + # sample_name: owner-custom-field-default + # spec: owner-custom-field-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth_v2-owner-based-default + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/owner-based-default-v2 + # spec: owner-based-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth_v2-static-user-pool-groups-default + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/static-user-pool-groups-default-v2 + # spec: static-user-pool-groups-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth_v2-static-user-pool-groups-operations + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/static-user-pool-groups-operations-v2 + # spec: static-user-pool-groups-operations + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth_v2-owner-and-group-different-models-default + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/owner-and-group-different-models-default-v2 + # spec: owner-and-group-different-models-default + # browser: *minimal_browser_list + # timeout_minutes: 45 + # retry_count: 10 + # - test_name: integ_datastore_auth_v2-owner-and-group-same-model-default + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/owner-and-group-same-model-default-v2 + # spec: owner-and-group-same-model-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth_v2-owner-and-group-same-model-operations + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/owner-and-group-same-model-operations-v2 + # spec: owner-and-group-same-model-operations + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth_v2-dynamic-user-pool-groups-default + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/dynamic-user-pool-groups-default-v2 + # spec: dynamic-user-pool-groups-default + # browser: *minimal_browser_list + # timeout_minutes: 45 + # retry_count: 10 + # - test_name: integ_datastore_auth_v2-dynamic-user-pool-groups-owner-based-default + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/dynamic-user-pool-groups-owner-based-default-v2 + # spec: dynamic-user-pool-groups-owner-based-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth_v2-private-auth-default + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/private-auth-default-v2 + # spec: private-auth-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth_v2-private-auth-iam + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/private-auth-iam-v2 + # spec: private-auth-iam + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth_v2-public-auth-default + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/public-auth-default-v2 + # spec: public-auth-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth_v2-public-auth-iam + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/public-auth-iam-v2 + # spec: public-auth-iam + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth_v2-owner-custom-claim-default + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/owner-custom-claim-default-v2 + # spec: owner-custom-claim-default + # browser: *minimal_browser_list + # - test_name: integ_datastore_auth_v2-owner-custom-field-default + # desc: 'DataStore Auth CLI v2' + # framework: react + # category: datastore + # sample_name: v2/owner-custom-field-default-v2 + # spec: owner-custom-field-default + # browser: *minimal_browser_list + # - test_name: integ_react_datastore + # desc: 'React DataStore' + # framework: react + # category: datastore + # sample_name: [many-to-many] + # spec: many-to-many + # browser: *minimal_browser_list + # - test_name: integ_react_datastore_v2 + # desc: 'React DataStore CLI v2' + # framework: react + # category: datastore + # sample_name: [v2/many-to-many-v2] + # spec: many-to-many + # browser: *minimal_browser_list + # - test_name: integ_react_datastore_multi_auth_one_rule + # desc: 'React DataStore Multi-Auth - One Rule' + # framework: react + # category: datastore + # sample_name: [multi-auth] + # spec: multi-auth-one-rule + # browser: *minimal_browser_list + # - test_name: integ_react_datastore_multi_auth_one_rule_v2 + # desc: 'React DataStore Multi-Auth - One Rule CLI v2' + # framework: react + # category: datastore + # 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 + # category: datastore + # sample_name: [multi-auth] + # spec: multi-auth-two-rules + # browser: *minimal_browser_list + # - test_name: integ_react_datastore_multi_auth_two_rules_v2 + # desc: 'React DataStore Multi-Auth - Two Rules CLI v2' + # framework: react + # category: datastore + # 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 + # category: datastore + # sample_name: [multi-auth] + # spec: multi-auth-three-plus-rules + # browser: *minimal_browser_list + # - test_name: integ_react_datastore_multi_auth_three_plus_rules_v2 + # desc: 'React DataStore Multi-Auth - Three Plus Rules CLI v2' + # framework: react + # category: datastore + # sample_name: [v2/multi-auth-v2] + # spec: multi-auth-three-plus-rules + # browser: *minimal_browser_list + # - test_name: integ_react_datastore_subs_disabled + # desc: 'DataStore - Subs Disabled' + # framework: react + # category: datastore + # sample_name: [subs-disabled] + # spec: subs-disabled + # browser: *minimal_browser_list + # - test_name: integ_react_datastore_subs_disabled_v2 + # desc: 'DataStore - Subs Disabled CLI v2' + # framework: react + # category: datastore + # sample_name: [v2/subs-disabled-v2] + # spec: subs-disabled + # browser: *minimal_browser_list + # - test_name: integ_react_datastore_consecutive_saves + # desc: 'DataStore - Subs Disabled' + # framework: react + # category: datastore + # sample_name: [consecutive-saves] + # spec: consecutive-saves + # browser: *minimal_browser_list + # - test_name: integ_react_datastore_consecutive_saves_v2 + # desc: 'DataStore - Subs Disabled CLI v2' + # framework: react + # category: datastore + # sample_name: [v2/consecutive-saves-v2] + # spec: consecutive-saves + # browser: *minimal_browser_list # - test_name: integ_react_datastore_observe_query # desc: 'DataStore - Observe Query' # framework: react # category: datastore - # sample_name: [observe-query] - # spec: observe-query + # sample_name: [v2/consecutive-saves-v2] + # spec: consecutive-saves # browser: *minimal_browser_list - # - test_name: integ_react_datastore_observe_query_v2 - # desc: 'DataStore - Observe Query CLI v2' + # # - test_name: integ_react_datastore_observe_query + # # desc: 'DataStore - Observe Query' + # # framework: react + # # category: datastore + # # sample_name: [observe-query] + # # spec: observe-query + # # browser: *minimal_browser_list + # # - test_name: integ_react_datastore_observe_query_v2 + # # desc: 'DataStore - Observe Query CLI v2' + # # framework: react + # # category: datastore + # # sample_name: [v2/observe-query-v2] + # # spec: observe-query + # # browser: *minimal_browser_list + # - test_name: integ_react_datastore_schema_drift + # desc: 'DataStore - Schema Drift' # framework: react # category: datastore - # sample_name: [v2/observe-query-v2] - # spec: observe-query + # sample_name: [schema-drift] + # spec: schema-drift # browser: *minimal_browser_list - - test_name: integ_react_datastore_schema_drift - desc: 'DataStore - Schema Drift' - framework: react - category: datastore - sample_name: [schema-drift] - spec: schema-drift - browser: *minimal_browser_list - - test_name: integ_react_datastore_background_process_manager - desc: 'DataStore - Background Process Manager' - framework: react - category: datastore - sample_name: [v2/background-process-manager] - spec: background-process-manager - browser: *extended_browser_list - # - test_name: integ_react_datastore_background_process_manager_webkit + # - test_name: integ_react_datastore_background_process_manager # desc: 'DataStore - Background Process Manager' # framework: react # category: datastore # sample_name: [v2/background-process-manager] # spec: background-process-manager # browser: [webkit] - - 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: *extended_browser_list - - test_name: integ_react_datastore_selective_sync - desc: 'DataStore - Selective Sync' - framework: react - category: datastore - sample_name: [selective-sync-v5] - spec: selective-sync-v5 - browser: *minimal_browser_list - - test_name: integ_react_datastore_nested_predicate - desc: 'DataStore - Nested Predicate' - framework: react - category: datastore - sample_name: [nested-predicate] - spec: nested-predicate - browser: *minimal_browser_list - - test_name: integ_react_datastore_docs_examples - desc: 'DataStore - Docs Examples' - framework: react - category: datastore - sample_name: [v2/amplify-docs-examples] - spec: amplify-docs-examples - browser: [chrome] - - test_name: integ_react_datastore_websocket_disruption - desc: 'DataStore - WebSocket Disruption' - framework: react - category: datastore - sample_name: [websocket-disruption] - spec: websocket-disruption - browser: *minimal_browser_list - - test_name: integ_vanilla_js_datastore_basic_crud - desc: 'Vanilla JS + Webpack 4 + DataStore - Basic CRUD' - framework: javascript - category: datastore - sample_name: [basic-crud] - browser: [chrome] - spec: vanilla-js-basic-crud - amplifyjs_dir: true - - test_name: integ_next_datastore_13_basic - desc: 'DataStore - Nextjs 13 build with SWC - basic JS app' - framework: next - category: datastore - sample_name: [next-13-basic] - spec: nextjs-13-basic - browser: *minimal_browser_list - - test_name: integ_next_datastore_13_js - desc: 'DataStore - Nextjs 13 build with SWC - JS app' - framework: next - category: datastore - sample_name: [next-13-js] - spec: nextjs-13 - browser: *minimal_browser_list - - test_name: integ_vite_datastore_basic_crud - desc: 'Vite + DataStore - Basic CRUD' - framework: vite - category: datastore - sample_name: [v2/basic-crud] - spec: vite-basic-crud - browser: [chrome] - - test_name: integ_rollup_datastore_basic_crud - desc: 'Rollup + DataStore - Basic CRUD' - framework: rollup - category: datastore - sample_name: [rollup-basic-crud] - spec: rollup-basic-crud - browser: [chrome] + # - 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: *extended_browser_list + # timeout_minutes: 45 + # retry_count: 10 + # - test_name: integ_react_datastore_selective_sync + # desc: 'DataStore - Selective Sync' + # framework: react + # category: datastore + # sample_name: [selective-sync-v5] + # spec: selective-sync-v5 + # browser: *minimal_browser_list + # - test_name: integ_react_datastore_nested_predicate + # desc: 'DataStore - Nested Predicate' + # framework: react + # category: datastore + # sample_name: [nested-predicate] + # spec: nested-predicate + # browser: *minimal_browser_list + # - test_name: integ_react_datastore_docs_examples + # desc: 'DataStore - Docs Examples' + # framework: react + # category: datastore + # sample_name: [v2/amplify-docs-examples] + # spec: amplify-docs-examples + # browser: *minimal_browser_list + # timeout_minutes: 45 + # retry_count: 10 + # - test_name: integ_react_datastore_websocket_disruption + # desc: 'DataStore - WebSocket Disruption' + # framework: react + # category: datastore + # sample_name: [websocket-disruption] + # spec: websocket-disruption + # browser: *minimal_browser_list + # - test_name: integ_vanilla_js_datastore_basic_crud + # desc: 'Vanilla JS + Webpack 4 + DataStore - Basic CRUD' + # framework: javascript + # category: datastore + # sample_name: [basic-crud] + # browser: [chrome] + # spec: vanilla-js-basic-crud + # amplifyjs_dir: true + # - test_name: integ_next_datastore_13_basic + # desc: 'DataStore - Nextjs 13 build with SWC - basic JS app' + # framework: next + # category: datastore + # sample_name: [next-13-basic] + # spec: nextjs-13-basic + # browser: *minimal_browser_list + # - test_name: integ_next_datastore_13_js + # desc: 'DataStore - Nextjs 13 build with SWC - JS app' + # framework: next + # category: datastore + # sample_name: [next-13-js] + # spec: nextjs-13 + # browser: *minimal_browser_list + # - test_name: integ_vite_datastore_basic_crud + # desc: 'Vite + DataStore - Basic CRUD' + # framework: vite + # category: datastore + # sample_name: [v2/basic-crud] + # spec: vite-basic-crud + # browser: [chrome] + # - test_name: integ_rollup_datastore_basic_crud + # desc: 'Rollup + DataStore - Basic CRUD' + # framework: rollup + # category: datastore + # sample_name: [rollup-basic-crud] + # spec: rollup-basic-crud + # browser: [chrome] - # API - - test_name: integ_react_graphql_api - desc: React GraphQL API - framework: react - category: api - 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 - - test_name: integ_next_api_data_client_gen2 - desc: Next.js Data Client Gen 2 - framework: next - category: api - sample_name: [data-client-gen2] - spec: data-client-gen2 - browser: [chrome] # Issues using Auth category / setting secure cookies in FF using Cypress with a Next.js app. Manual testing in FF works as expected - - test_name: integ_react_rest_api - desc: 'Vite + React REST API' - framework: vite - category: api - sample_name: [rest] - spec: restful - browser: *minimal_browser_list + # # API + # - test_name: integ_react_graphql_api + # desc: React GraphQL API + # framework: react + # category: api + # 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 + # - test_name: integ_next_api_data_client_gen2 + # desc: Next.js Data Client Gen 2 + # framework: next + # category: api + # sample_name: [data-client-gen2] + # spec: data-client-gen2 + # browser: [chrome] # Issues using Auth category / setting secure cookies in FF using Cypress with a Next.js app. Manual testing in FF works as expected + # - test_name: integ_react_rest_api + # desc: 'Vite + React REST API' + # framework: vite + # category: api + # sample_name: [rest] + # spec: restful + # browser: *minimal_browser_list # AUTH - - test_name: integ_react_javascript_authentication - desc: 'React Authentication' - framework: react - category: auth - sample_name: [javascript-auth] - spec: functional-auth - browser: *minimal_browser_list - - test_name: integ_react_auth_1_guest_to_authenticated_user - desc: 'Guest to Authenticated User' - framework: react - category: auth - sample_name: [guest-to-auth-user] - spec: guest-to-auth-user - browser: *minimal_browser_list - - test_name: integ_react_typescript_authentication - desc: 'React Typescript Authentication' - framework: react - category: auth - sample_name: [typescript-auth] - spec: functional-auth - browser: *minimal_browser_list - - test_name: integ_react_credentials_different_region - desc: 'React Credentials Different Region' - framework: react - category: auth - sample_name: [credentials-auth] - spec: credentials-auth - browser: *minimal_browser_list - - test_name: integ_react_auth_2_sign_in_after_sign_up - desc: 'Sign In after Sign Up' - framework: react - category: auth - sample_name: [auto-signin-after-signup] - spec: auto-signin-after-signup - browser: *minimal_browser_list - - test_name: integ_react_device_tracking - desc: 'cognito-device-tracking' - framework: react - category: auth - sample_name: [device-tracking] - spec: device-tracking - browser: *minimal_browser_list - - test_name: integ_react_delete_user - desc: 'delete-user' - framework: react - category: auth - 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: [chrome] - - 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] - - test_name: integ_next_sign_in_with_oauth - desc: 'Sign-in with the OAuth flow' - framework: next - category: auth - sample_name: [sign-in-with-oauth] - spec: sign-in-with-oauth - browser: [chrome] + # - test_name: integ_react_javascript_authentication + # desc: 'React Authentication' + # framework: react + # category: auth + # sample_name: [javascript-auth] + # spec: functional-auth + # browser: *minimal_browser_list + # - test_name: integ_react_auth_1_guest_to_authenticated_user + # desc: 'Guest to Authenticated User' + # framework: react + # category: auth + # sample_name: [guest-to-auth-user] + # spec: guest-to-auth-user + # browser: *minimal_browser_list + # - test_name: integ_react_typescript_authentication + # desc: 'React Typescript Authentication' + # framework: react + # category: auth + # sample_name: [typescript-auth] + # spec: functional-auth + # browser: *minimal_browser_list + # - test_name: integ_react_credentials_different_region + # desc: 'React Credentials Different Region' + # framework: react + # category: auth + # sample_name: [credentials-auth] + # spec: credentials-auth + # browser: *minimal_browser_list + # - test_name: integ_react_auth_2_sign_in_after_sign_up + # desc: 'Sign In after Sign Up' + # framework: react + # category: auth + # sample_name: [auto-signin-after-signup] + # spec: auto-signin-after-signup + # browser: *minimal_browser_list + # - test_name: integ_react_device_tracking + # desc: 'cognito-device-tracking' + # framework: react + # category: auth + # sample_name: [device-tracking] + # spec: device-tracking + # browser: *minimal_browser_list + # - test_name: integ_react_delete_user + # desc: 'delete-user' + # framework: react + # category: auth + # 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: [chrome] + # - 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_sign_in_with_oauth + # desc: 'Sign-in with the OAuth flow' + # framework: next + # category: auth + # sample_name: [sign-in-with-oauth] + # spec: sign-in-with-oauth + # browser: [chrome] + # timeout_minutes: 45 + # retry_count: 10 # DISABLED Angular/Vue tests: # TODO: delete tests or add custom ui logic to support them. @@ -557,50 +569,50 @@ tests: # amplifyjs_dir: true # ANALYTICS - - test_name: integ_react_analytics_pinpoint - desc: 'Test record and identifyUser calls for pinpoint' - framework: react - category: analytics - sample_name: [pinpoint-test] - spec: pinpoint - # Temp fix: - browser: *minimal_browser_list + # - test_name: integ_react_analytics_pinpoint + # desc: 'Test record and identifyUser calls for pinpoint' + # framework: react + # category: analytics + # sample_name: [pinpoint-test] + # spec: pinpoint + # # Temp fix: + # browser: *minimal_browser_list - - test_name: integ_react_analytics_personalize_auth - desc: 'Test record API for Personalize with authenticated user' - framework: react - category: analytics - sample_name: [personalize-test] - spec: personalize - # Temp fix: - browser: *minimal_browser_list + # - test_name: integ_react_analytics_personalize_auth + # desc: 'Test record API for Personalize with authenticated user' + # framework: react + # category: analytics + # sample_name: [personalize-test] + # spec: personalize + # # Temp fix: + # browser: *minimal_browser_list - - test_name: integ_react_analytics_personalize_unauth - desc: 'Test record API for Personalize with guest user' - framework: react - category: analytics - sample_name: [personalize-test] - spec: personalize-unauth - # Temp fix: - browser: *minimal_browser_list + # - test_name: integ_react_analytics_personalize_unauth + # desc: 'Test record API for Personalize with guest user' + # framework: react + # category: analytics + # sample_name: [personalize-test] + # spec: personalize-unauth + # # Temp fix: + # browser: *minimal_browser_list - - test_name: integ_react_analytics_kinesis_data_firehose_auth - desc: 'Test record API for KDF with authenticated user' - framework: react - category: analytics - sample_name: [kinesis-firehose-test] - spec: kinesis-firehose - # Temp fix: - browser: *minimal_browser_list + # - test_name: integ_react_analytics_kinesis_data_firehose_auth + # desc: 'Test record API for KDF with authenticated user' + # framework: react + # category: analytics + # sample_name: [kinesis-firehose-test] + # spec: kinesis-firehose + # # Temp fix: + # browser: *minimal_browser_list - - test_name: integ_react_analytics_kinesis_data_firehose_unauth - desc: 'Test record API for KDF with guest user' - framework: react - category: analytics - sample_name: [kinesis-firehose-test] - spec: kinesis-firehose-unauth - # Temp fix: - browser: *minimal_browser_list + # - test_name: integ_react_analytics_kinesis_data_firehose_unauth + # desc: 'Test record API for KDF with guest user' + # framework: react + # category: analytics + # sample_name: [kinesis-firehose-test] + # spec: kinesis-firehose-unauth + # # Temp fix: + # browser: *minimal_browser_list # GEO - test_name: integ_react_geo_display_map @@ -644,20 +656,20 @@ tests: # 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_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 @@ -680,64 +692,64 @@ tests: # spec: chatbot-component # browser: [chrome] - # PREDICTIONS - - test_name: integ_react_predictions - desc: 'React Predictions' - framework: react - category: predictions - sample_name: [multi-user-translation] - spec: multiuser-translation - browser: *minimal_browser_list + # # PREDICTIONS + # - test_name: integ_react_predictions + # desc: 'React Predictions' + # framework: react + # category: predictions + # sample_name: [multi-user-translation] + # spec: multiuser-translation + # 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_api_reconnect - desc: 'PubSub - Reconnection for API' - framework: react - category: pubsub - sample_name: [reconnection-api] - spec: reconnection - # Firefox doesn't support network state management in cypress - browser: [chrome] + # # 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_api_reconnect + # desc: 'PubSub - Reconnection for API' + # framework: react + # category: pubsub + # sample_name: [reconnection-api] + # spec: reconnection + # # Firefox doesn't support network state management in cypress + # browser: [chrome] # STORAGE - - test_name: integ_react_storage - desc: 'React Storage' - framework: react - category: storage - sample_name: [storageApp] - spec: storage - browser: *minimal_browser_list - - test_name: integ_react_storage_multipart_progress - desc: 'React Storage Multi-Part Upload with Progress' - framework: react - category: storage - sample_name: [multi-part-upload-with-progress] - spec: multi-part-upload-with-progress - browser: *minimal_browser_list - - test_name: integ_react_storage_copy - desc: 'React Storage Copy' - framework: react - category: storage - sample_name: [multi-part-copy] - spec: multi-part-copy - browser: *minimal_browser_list + # - test_name: integ_react_storage + # desc: 'React Storage' + # framework: react + # category: storage + # sample_name: [storageApp] + # spec: storage + # browser: *minimal_browser_list + # - test_name: integ_react_storage_multipart_progress + # desc: 'React Storage Multi-Part Upload with Progress' + # framework: react + # category: storage + # sample_name: [multi-part-upload-with-progress] + # spec: multi-part-upload-with-progress + # browser: *minimal_browser_list + # - test_name: integ_react_storage_copy + # desc: 'React Storage Copy' + # framework: react + # category: storage + # sample_name: [multi-part-copy] + # spec: multi-part-copy + # browser: *minimal_browser_list - # INAPPMESSAGING - - test_name: integ_in_app_messaging - desc: 'React InApp Messaging' - framework: react - category: in-app-messaging - sample_name: [in-app-messaging-app] - spec: in-app-messaging - browser: *minimal_browser_list + # # INAPPMESSAGING + # - test_name: integ_in_app_messaging + # desc: 'React InApp Messaging' + # framework: react + # category: in-app-messaging + # sample_name: [in-app-messaging-app] + # spec: in-app-messaging + # browser: *minimal_browser_list # - test_name: integ_duplicate_packages # desc: 'Duplicate Package Errors' diff --git a/.github/workflows/push-integ-test.yml b/.github/workflows/push-integ-test.yml index a56ca5db116..a59c7981266 100644 --- a/.github/workflows/push-integ-test.yml +++ b/.github/workflows/push-integ-test.yml @@ -8,7 +8,7 @@ concurrency: on: push: branches: - - next/main + - fix//geo-location-services-config jobs: e2e: From e3e8fcd7a0365356a2f4967b5bf31367dc30ce25 Mon Sep 17 00:00:00 2001 From: Dan Kiuna Date: Wed, 13 Mar 2024 16:51:09 -0500 Subject: [PATCH 09/13] integ test --- .github/workflows/push-integ-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-integ-test.yml b/.github/workflows/push-integ-test.yml index a59c7981266..16c423edcf2 100644 --- a/.github/workflows/push-integ-test.yml +++ b/.github/workflows/push-integ-test.yml @@ -8,7 +8,7 @@ concurrency: on: push: branches: - - fix//geo-location-services-config + - fix/geo-location-services-config jobs: e2e: From 971a6453af02c3b8300790f7bc18d62cdffd62e3 Mon Sep 17 00:00:00 2001 From: Dan Kiuna Date: Wed, 13 Mar 2024 17:06:35 -0500 Subject: [PATCH 10/13] integ test --- .github/integ-config/detox-integ-all.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/integ-config/detox-integ-all.yml b/.github/integ-config/detox-integ-all.yml index bc890a450f5..a9dd3cca31f 100644 --- a/.github/integ-config/detox-integ-all.yml +++ b/.github/integ-config/detox-integ-all.yml @@ -1,15 +1,15 @@ -- test_name: 'integ_rn_ios_storage' - working_directory: amplify-js-samples-staging/samples/react-native/storage/StorageApp - timeout_minutes: 120 -- test_name: 'integ_rn_ios_storage_multipart_progress' - working_directory: amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress - timeout_minutes: 120 -- 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 - timeout_minutes: 120 +# - test_name: 'integ_rn_ios_storage' +# working_directory: amplify-js-samples-staging/samples/react-native/storage/StorageApp +# timeout_minutes: 120 +# - test_name: 'integ_rn_ios_storage_multipart_progress' +# working_directory: amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress +# timeout_minutes: 120 +# - 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 +# timeout_minutes: 120 # - 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' From f1b31f75f628781f399fd996d259ed84e42a73d7 Mon Sep 17 00:00:00 2001 From: Dan Kiuna Date: Tue, 26 Mar 2024 17:39:24 -0500 Subject: [PATCH 11/13] fix parseAWSExports duplicating "search_indices" and "searchIndicies" --- packages/core/src/parseAWSExports.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/core/src/parseAWSExports.ts b/packages/core/src/parseAWSExports.ts index 5bb29e1be37..2db5f6fad6e 100644 --- a/packages/core/src/parseAWSExports.ts +++ b/packages/core/src/parseAWSExports.ts @@ -154,7 +154,7 @@ export const parseAWSExports = ( aws_cognito_mfa_configuration.toLowerCase(), totpEnabled: aws_cognito_mfa_types?.includes('TOTP') ?? false, smsEnabled: aws_cognito_mfa_types?.includes('SMS') ?? false, - } + } : undefined; const passwordFormatConfig = aws_cognito_password_protection_settings ? { @@ -176,7 +176,7 @@ export const parseAWSExports = ( aws_cognito_password_protection_settings.passwordPolicyCharacters?.includes( 'REQUIRES_SYMBOLS', ) ?? false, - } + } : undefined; const mergedUserAttributes: LegacyUserAttributeKey[] = Array.from( new Set([ @@ -252,11 +252,12 @@ export const parseAWSExports = ( (amplifyConfig as any).Geo = amazon_location_service ? { LocationService: { - ...amazon_location_service, + maps: amazon_location_service.maps, + geofenceCollections: amazon_location_service.geofenceCollections, searchIndices: amazon_location_service.search_indices, region: amazon_location_service.region, }, - } + } : { ...geo }; } @@ -297,7 +298,7 @@ export const parseAWSExports = ( defaults: { voiceId }, }, }, - } + } : predictions; } From eb12bd795c6381405dc9f8e8db8ff6d7617fb7bf Mon Sep 17 00:00:00 2001 From: ashika112 Date: Fri, 26 Apr 2024 21:53:50 -0700 Subject: [PATCH 12/13] fix prettier error --- packages/core/src/parseAWSExports.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/core/src/parseAWSExports.ts b/packages/core/src/parseAWSExports.ts index 2db5f6fad6e..e9959f577e3 100644 --- a/packages/core/src/parseAWSExports.ts +++ b/packages/core/src/parseAWSExports.ts @@ -154,7 +154,7 @@ export const parseAWSExports = ( aws_cognito_mfa_configuration.toLowerCase(), totpEnabled: aws_cognito_mfa_types?.includes('TOTP') ?? false, smsEnabled: aws_cognito_mfa_types?.includes('SMS') ?? false, - } + } : undefined; const passwordFormatConfig = aws_cognito_password_protection_settings ? { @@ -176,7 +176,7 @@ export const parseAWSExports = ( aws_cognito_password_protection_settings.passwordPolicyCharacters?.includes( 'REQUIRES_SYMBOLS', ) ?? false, - } + } : undefined; const mergedUserAttributes: LegacyUserAttributeKey[] = Array.from( new Set([ @@ -257,7 +257,7 @@ export const parseAWSExports = ( searchIndices: amazon_location_service.search_indices, region: amazon_location_service.region, }, - } + } : { ...geo }; } @@ -298,7 +298,7 @@ export const parseAWSExports = ( defaults: { voiceId }, }, }, - } + } : predictions; } From 003f84d183d02fcbfb4ca9fcc1fb7d5ff4bde79f Mon Sep 17 00:00:00 2001 From: ashika112 Date: Fri, 26 Apr 2024 21:57:42 -0700 Subject: [PATCH 13/13] fix bundle size test --- packages/aws-amplify/package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json index 38f9fe8679d..d006f61e39b 100644 --- a/packages/aws-amplify/package.json +++ b/packages/aws-amplify/package.json @@ -353,7 +353,7 @@ "name": "[Auth] resetPassword (Cognito)", "path": "./dist/esm/auth/index.mjs", "import": "{ resetPassword }", - "limit": "9.02 kB" + "limit": "9.03 kB" }, { "name": "[Auth] confirmResetPassword (Cognito)", @@ -401,13 +401,13 @@ "name": "[Auth] verifyTOTPSetup (Cognito)", "path": "./dist/esm/auth/index.mjs", "import": "{ verifyTOTPSetup }", - "limit": "9.18 kB" + "limit": "9.28 kB" }, { "name": "[Auth] updatePassword (Cognito)", "path": "./dist/esm/auth/index.mjs", "import": "{ updatePassword }", - "limit": "9.19 kB" + "limit": "9.22 kB" }, { "name": "[Auth] setUpTOTP (Cognito)", @@ -425,7 +425,7 @@ "name": "[Auth] getCurrentUser (Cognito)", "path": "./dist/esm/auth/index.mjs", "import": "{ getCurrentUser }", - "limit": "4.32 kB" + "limit": "4.34 kB" }, { "name": "[Auth] confirmUserAttribute (Cognito)", @@ -443,7 +443,7 @@ "name": "[Auth] fetchUserAttributes (Cognito)", "path": "./dist/esm/auth/index.mjs", "import": "{ fetchUserAttributes }", - "limit": "8.27 kB" + "limit": "8.29 kB" }, { "name": "[Auth] Basic Auth Flow (Cognito)",