chore(api): clean up and enable user pool integ test (#1986)

* chore(api): clean up and enable user pool integ test

* Update integ_test.yml

Author: lawmicha

.github/workflows/integ_test.yml

@@ -112,7 +112,6 @@ jobs:
           scheme: GraphQLWithIAMIntegrationTests
 
   api-graphqluserpool-integration-test:
-    if: ${{ false }}
     needs: [api-integration-test]
     runs-on: macos-latest
     environment: IntegrationTest

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

@@ -24,7 +24,7 @@
             </BuildableReference>
             <SkippedTests>
                <Test
-                  Identifier = "GraphQLWithUserPoolIntegrationTests/testSetUpOnce()">
+                  Identifier = "GraphQLAuthDirectiveIntegrationTests">
                </Test>
             </SkippedTests>
          </TestableReference>

AmplifyPlugins/API/AWSAPICategoryPluginIntegrationTests/GraphQL/GraphQLWithUserPoolIntegrationTests/GraphQLWithUserPoolIntegrationTests.swift

@@ -169,10 +169,10 @@ class GraphQLWithUserPoolIntegrationTests: XCTestCase {
         let completeInvoked = expectation(description: "request completed")
         let uuid = UUID().uuidString
 
-        // create a Todo mutation with a missing/invalid "description" variable value
+        // create a Todo mutation with a missing/invalid "name" variable value
         let request = GraphQLRequest(document: CreateTodoMutation.document,
                                      variables: CreateTodoMutation.variables(id: uuid,
-                                                                             name: "",
+                                                                             name: nil,
                                                                              description: nil),
                                      responseType: AWSAPICategoryPluginTestCommon.Todo?.self,
                                      decodePath: CreateTodoMutation.decodePath)
@@ -184,17 +184,13 @@ class GraphQLWithUserPoolIntegrationTests: XCTestCase {
                     return
                 }
 
-                guard case let .transformationError(rawResponse, error) = graphQLResponseError else {
-                    XCTFail("Missing transformation error")
+                guard case let .error(errors) = graphQLResponseError, let firstError = errors.first else {
+                    XCTFail("Missing errors")
                     return
                 }
-                guard case let .operationError(operationErrorDescription, _, operationError) = error else {
-                    XCTFail("Unexpected error type \(error)")
-                    return
-                }
-                XCTAssertNotNil(rawResponse)
-                XCTAssertNotNil(operationError)
-                XCTAssertEqual(operationErrorDescription, "valueNotFound")
+
+                XCTAssertEqual("Variable 'input' has coerced Null value for NonNull type 'String!'",
+                               firstError.message)
 
                 completeInvoked.fulfill()
             case .failure(let error):
@@ -447,17 +443,18 @@ class GraphQLWithUserPoolIntegrationTests: XCTestCase {
         let operation = Amplify.API.query(request: request) { event in
             switch event {
             case .success(let graphQLResponse):
-                guard case let .success(data) = graphQLResponse else {
-                    XCTFail("Missing successful response")
-                    return
-                }
-                guard let listTodos = data.listTodos else {
-                    XCTFail("Missing listTodos")
-                    return
+                switch graphQLResponse {
+                case .success(let data):
+                    guard let listTodos = data.listTodos else {
+                        XCTFail("Missing listTodos")
+                        return
+                    }
+                    XCTAssertTrue(!listTodos.items.isEmpty)
+                    listCompleteInvoked.fulfill()
+                case .failure(let error):
+                    print("\(error.underlyingError)")
+                    XCTFail("Unexpected .failed event: \(error)")
                 }
-
-                XCTAssertTrue(!listTodos.items.isEmpty)
-                listCompleteInvoked.fulfill()
             case .failure(let error):
                 XCTFail("Unexpected .failed event: \(error)")
             }

AmplifyPlugins/API/AWSAPICategoryPluginTestCommon/Model/Todo.swift

@@ -8,14 +8,11 @@
 import Foundation
 import Amplify
 
-/// TODO: Replace with AmplifyTestCommon's DataStore's geneated model
-/// This model corresponds to the resources created for the Todo graphQL endpoint. As a developer, this is
-/// hand-written from the codegen that created the API.swift that depends on AppSync sdk.
 struct Todo: Decodable {
    let typename: String
    let id: String
    let name: String
-   let description: String
+   let description: String?
 
    enum CodingKeys: String, CodingKey {
        case typename = "__typename"
@@ -48,14 +45,16 @@ class CreateTodoMutation {
             }\n}
         """
 
-    static func variables(id: String? = nil, name: String, description: String? = nil) -> [String: Any] {
+    static func variables(id: String? = nil, name: String?, description: String? = nil) -> [String: Any] {
         var input: [String: Any] = [:]
 
         if let id = id {
             input.updateValue(id, forKey: "id")
         }
 
-        input.updateValue(name, forKey: "name")
+        if let name = name {
+            input.updateValue(name, forKey: "name")
+        }
 
         if let description = description {
             input.updateValue(description, forKey: "description")