test: Move the test logic to use common configuration (#1480)

Co-authored-by: Michael Law <[email protected]>

Author: royjit

AmplifyPlugins/API/APICategoryPlugin.xcodeproj/project.pbxproj

@@ -14,7 +14,7 @@ import XCTest
 // swiftlint:disable type_body_length
 class GraphQLModelBasedTests: XCTestCase {
 
-    static let amplifyConfiguration = "GraphQLModelBasedTests-amplifyconfiguration"
+    static let amplifyConfiguration = "testconfiguration/GraphQLModelBasedTests-amplifyconfiguration"
 
     override func setUp() {
         Amplify.reset()

AmplifyPlugins/API/AWSAPICategoryPluginFunctionalTests/GraphQLModelBased/GraphQLModelBasedTests.swift

@@ -5,11 +5,10 @@ The following steps demonstrate how to set up a GraphQL endpoint with AppSync. T
 
 ### Set-up
 
-1. `amplify-init`
+1. `amplify init`
 
 2. `amplify add api`
 
-
 ```perl
 ? Please select from one of the below mentioned services: `GraphQL`
 ? Provide API name: `<APIName>`
@@ -226,7 +225,8 @@ type Nested {
   valueTwo: String
 }
 
-
 ```
 
 3.  `amplify push`
+
+4. Copy `amplifyconfiguration.json` over as `GraphQLModelBasedTests-amplifyconfiguration.json` to `~/.aws-amplify/amplify-ios/testconfiguration/`

AmplifyPlugins/API/AWSAPICategoryPluginFunctionalTests/GraphQLModelBased/README.md

@@ -15,7 +15,7 @@ import AWSPluginsCore
 // swiftlint:disable type_body_length
 class GraphQLSyncBasedTests: XCTestCase {
 
-    static let amplifyConfiguration = "GraphQLSyncBasedTests-amplifyconfiguration"
+    static let amplifyConfiguration = "testconfiguration/GraphQLSyncBasedTests-amplifyconfiguration"
 
     override func setUp() {
         Amplify.reset()

AmplifyPlugins/API/AWSAPICategoryPluginFunctionalTests/GraphQLSyncBased/GraphQLSyncBasedTests.swift

@@ -14,7 +14,7 @@ import AWSPluginsCore
 
 class GraphQLSyncCustomPrimaryKeyTests: XCTestCase {
 
-    static let amplifyConfiguration = "GraphQLSyncBasedTests-amplifyconfiguration"
+    static let amplifyConfiguration = "testconfiguration/GraphQLSyncBasedTests-amplifyconfiguration"
 
     override func setUp() {
         Amplify.reset()

AmplifyPlugins/API/AWSAPICategoryPluginFunctionalTests/GraphQLSyncBased/GraphQLSyncCustomPrimaryKeyTests.swift

@@ -58,3 +58,5 @@ type CustomerOrder @model
 ```
 
 3. `amplify push`
+
+4. Copy `amplifyconfiguration.json` over as `GraphQLSyncBasedTests-amplifyconfiguration.json` to `~/.aws-amplify/amplify-ios/testconfiguration/`

AmplifyPlugins/API/AWSAPICategoryPluginFunctionalTests/GraphQLSyncBased/README.md

@@ -20,8 +20,8 @@ class GraphQLWithIAMIntegrationTests: XCTestCase {
         let password: String
     }
 
-    let amplifyConfigurationFile = "GraphQLWithIAMIntegrationTests-amplifyconfiguration"
-    let credentialsFile = "GraphQLWithIAMIntegrationTests-credentials"
+    let amplifyConfigurationFile = "testconfiguration/GraphQLWithIAMIntegrationTests-amplifyconfiguration"
+    let credentialsFile = "testconfiguration/GraphQLWithIAMIntegrationTests-credentials"
     var user: User!
 
     override func setUp() {

AmplifyPlugins/API/AWSAPICategoryPluginIntegrationTests/GraphQL/GraphQLWithIAMIntegrationTests/GraphQLWithIAMIntegrationTests.swift

@@ -26,7 +26,7 @@ The following steps demonstrate how to set up an GraphQL endpoint with AppSync.
 
 4. `amplify push`
 
-5. Copy `amplifyconfiguration.json` over as `GraphQLWithIAMIntegrationTests-amplifyconfiguration.json`
+5. Copy `amplifyconfiguration.json` over as `GraphQLWithIAMIntegrationTests-amplifyconfiguration.json` to `~/.aws-amplify/amplify-ios/testconfiguration/`
 
 6. `amplify console auth` and choose `Identity Pool`. Click on **Edit Identity pool** and make note of IAM Role that is assigned for the Authenticated role.
 
@@ -36,7 +36,7 @@ The following steps demonstrate how to set up an GraphQL endpoint with AppSync.
 
 9. Click on Attach Policies, choose **AWSAppSyncInvokeFullAccess**, and attach the policy. This will allow users that are signed into the app to have access to invoke AppSync APIs.
 
-10. Create `GraphQLWithIAMIntegrationTests-credentials.json` with a json object containing `username`, and `password`, used to create the cognito user in the userpool. 
+10. Create `GraphQLWithIAMIntegrationTests-credentials.json` inside `~/.aws-amplify/amplify-ios/testconfiguration/` with a json object containing `username`, and `password`, used to create the cognito user in the userpool. 
 
 ```json
 {

AmplifyPlugins/API/AWSAPICategoryPluginIntegrationTests/GraphQL/GraphQLWithIAMIntegrationTests/README.md

@@ -14,7 +14,7 @@ import AmplifyPlugins
 @testable import AWSAPICategoryPluginTestCommon
 
 class GraphQLWithLambdaAuthIntegrationTests: XCTestCase {
-    let amplifyConfigurationFile = "GraphQLWithLambdaAuthIntegrationTests-amplifyconfiguration"
+    let amplifyConfigurationFile = "testconfiguration/GraphQLWithLambdaAuthIntegrationTests-amplifyconfiguration"
     override func setUp() {
         do {
             try Amplify.add(plugin: AWSAPIPlugin(apiAuthProviderFactory: TestAPIAuthProviderFactory()))

AmplifyPlugins/API/AWSAPICategoryPluginIntegrationTests/GraphQL/GraphQLWithLambdaAuthIntegrationTests/GraphQLWithLambdaAuthIntegrationTests.swift

@@ -19,7 +19,7 @@ The following steps demonstrate how to set up an GraphQL endpoint with AppSync.
 
 3. `amplify push`
 
-4. Copy `amplifyconfiguration.json` over as `GraphQLWithLambdaAuthIntegrationTests-amplifyconfiguration.json`
+4. Copy `amplifyconfiguration.json` over as `GraphQLWithLambdaAuthIntegrationTests-amplifyconfiguration.json` inside `~/.aws-amplify/amplify-ios/testconfiguration/` 
 5. Replace the authorization type `API_KEY` with  `AWS_LAMBDA` in `GraphQLWithLambdaAuthIntegrationTests-amplifyconfiguration.json` 
 
 6. Run `amplify console` to open the AWS Console