Reprovision API Integration test backends (#250)

* Set up backend for RESTWithIAMIntegrationTests

* Set up backend for GraphQLWithUserPoolIntegrationTests

* Add TODO for GraphQLWithIAMIntegrationTests set-up

* Moved TodoGraphQLWithAPIKeyTests over to GraphQLWithUserPoolIntegrationTests since they use the same schema

* Fixed Functional tests which used PostNoSync/CommentNoSync models

* Stopping point before enabling Model based and Sync based tests

* Set up backend for GraphQLSyncBasedTests

* Set up backend for GraphQLModelBasedTests

* minor update to readme

* removing config files and adding top level gitignore

* updated GraphQL with IAM Readme

* update spacing in readme

Author: lawmicha

.gitignore

@@ -40,6 +40,6 @@ Scripts/gcovr
 Scripts/jenkins.py
 Scripts/ocunit2junit
 __pycache__/
-awsconfiguration.json
-amplifyconfiguration.json
+*awsconfiguration.json
+*amplifyconfiguration.json
 credentials-mc.json

AmplifyPlugins/API/APICategoryPlugin.xcodeproj/project.pbxproj

@@ -25,9 +25,15 @@
                <Test
                   Identifier = "APICategoryPluginConcurrencyTests">
                </Test>
+               <Test
+                  Identifier = "AnyModelIntegrationTests">
+               </Test>
                <Test
                   Identifier = "AnyModelIntegrationTests/testDeleteAsAnyModel()">
                </Test>
+               <Test
+                  Identifier = "BlogPostCommentGraphQLWithAPIKeyTests">
+               </Test>
             </SkippedTests>
          </TestableReference>
       </Testables>

AmplifyPlugins/API/APICategoryPlugin.xcodeproj/xcshareddata/xcschemes/AWSAPICategoryPluginFunctionalTests.xcscheme

@@ -11,32 +11,27 @@ import AWSAPICategoryPlugin
 
 @testable import Amplify
 @testable import AmplifyTestCommon
+@testable import AWSAPICategoryPluginTestCommon
 
 class AnyModelIntegrationTests: XCTestCase {
     let networkTimeout: TimeInterval = 180.0
 
     override func setUp() {
         Amplify.reset()
         Amplify.Logging.logLevel = .verbose
-        ModelRegistry.register(modelType: AmplifyTestCommon.PostNoSync.self)
-        ModelRegistry.register(modelType: AmplifyTestCommon.CommentNoSync.self)
-
-        let apiConfig = APICategoryConfiguration(plugins: [
-            "awsAPIPlugin": [
-                GraphQLModelBasedTests.modelBasedGraphQLWithAPIKey: [
-                    "endpoint": "https://xxx.appsync-api.us-west-2.amazonaws.com/graphql",
-                    "region": "us-west-2",
-                    "authorizationType": "API_KEY",
-                    "apiKey": "xxxx",
-                    "endpointType": "GraphQL"
-                ]
-            ]
-        ])
-
-        let amplifyConfig = AmplifyConfiguration(api: apiConfig)
+
+        let plugin = AWSAPIPlugin(modelRegistration: PostCommentModelRegistration())
+
         do {
-            try Amplify.add(plugin: AWSAPIPlugin())
+            try Amplify.add(plugin: plugin)
+
+            let amplifyConfig = try TestConfigHelper.retrieveAmplifyConfiguration(
+                forResource: GraphQLModelBasedTests.amplifyConfiguration)
             try Amplify.configure(amplifyConfig)
+
+            ModelRegistry.register(modelType: Comment.self)
+            ModelRegistry.register(modelType: Post.self)
+
         } catch {
             XCTFail("Error during setup: \(error)")
         }
@@ -47,8 +42,10 @@ class AnyModelIntegrationTests: XCTestCase {
     }
 
     func testCreateAsAnyModel() throws {
-        let originalPost = PostNoSync(title: "Post title",
-                                      content: "Original post content as of \(Date())")
+
+        let originalPost = Post(title: "Post title",
+                                content: "Original post content as of \(Date())",
+                                createdAt: Date())
         let anyPost = try originalPost.eraseToAnyModel()
 
         let callbackInvoked = expectation(description: "Callback invoked")
@@ -98,8 +95,9 @@ class AnyModelIntegrationTests: XCTestCase {
     }
 
     func testUpdateAsAnyModel() throws {
-        let originalPost = PostNoSync(title: "Post title",
-                                      content: "Original post content as of \(Date())")
+        let originalPost = Post(title: "Post title",
+                                content: "Original post content as of \(Date())",
+                                createdAt: Date())
         let originalAnyPost = try originalPost.eraseToAnyModel()
 
         let createCallbackInvoked = expectation(description: "Create callback invoked")
@@ -160,8 +158,9 @@ class AnyModelIntegrationTests: XCTestCase {
     }
 
     func testDeleteAsAnyModel() throws {
-        let originalPost = PostNoSync(title: "Post title",
-                                      content: "Original post content as of \(Date())")
+        let originalPost = Post(title: "Post title",
+                                content: "Original post content as of \(Date())",
+                                createdAt: Date())
         let originalAnyPost = try originalPost.eraseToAnyModel()
 
         let createCallbackInvoked = expectation(description: "Create callback invoked")

AmplifyPlugins/API/AWSAPICategoryPluginFunctionalTests/AWSAPICategoryPluginGetTests.swift

@@ -52,7 +52,7 @@ class BlogPostCommentGraphQLWithAPIKeyTests: XCTestCase {
                     "authorizationType": "API_KEY",
                     "apiKey": "da2-invalidAPIKey",
                     "endpointType": "GraphQL"
-                ],
+                ]
             ]
         ])