Move schema downloader tests to integration test target (#1761)

* Move schema downloader tests to integration test target

* Only run codegen integration tests on macOS

* Only run integration tests on macOS

* Move codegen test support into its own target

* Fix target config errors

* Clean Derived data before building on CI

* Build-for-testing while specifying correct test plan

Author: AnthonyMDev

.circleci/config.yml

@@ -27,21 +27,11 @@ parameters:
     default: "appletvsimulator14.3"
 
 commands:
-  common_test_steps:
-    description: Commands to run for every set of tests
+  integration_test_setup:
     steps:
       - restore_cache:
           key: starwars-server
-      - checkout
-      - run:
-          command: rm ~/.ssh/id_rsa
-          name: Remove old SSH key
-      - run:
-          command: for ip in $(dig @8.8.8.8 bitbucket.org +short); do ssh-keyscan bitbucket.org,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true
-          name: Bitbucket Key Workaround
-      - run:
-          command: for ip in $(dig @8.8.8.8 github.com +short); do ssh-keyscan github.com,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true
-          name: Github Key Workaround
+      - common_test_setup
       - run:
           command: ./scripts/install-node.sh
           name: Install Node
@@ -59,17 +49,34 @@ commands:
       - run:
           command: sudo chmod -R +rwx SimpleUploadServer
           name: Adjust permissions for simple upload server folder
+  integration_test_cleanup:
+    steps:
+      - save_cache:
+          key: starwars-server
+          paths:
+            - ../starwars-server
+  common_test_setup:
+    description: Commands to run for setup of every set of tests
+    steps:
+      - checkout
+      - run:
+          command: rm ~/.ssh/id_rsa
+          name: Remove old SSH key
       - run:
-          command: xcodebuild clean build build-for-testing -project "Apollo.xcodeproj" -scheme "${CIRCLE_XCODE_SCHEME}" -sdk "${CIRCLE_XCODE_SDK}" -destination "${DESTINATION}" | xcpretty
+          command: for ip in $(dig @8.8.8.8 bitbucket.org +short); do ssh-keyscan bitbucket.org,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true
+          name: Bitbucket Key Workaround
+      - run:
+          command: for ip in $(dig @8.8.8.8 github.com +short); do ssh-keyscan github.com,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true
+          name: Github Key Workaround
+  build_and_run_tests:
+    steps:
+      - run:
+          command: xcodebuild clean build build-for-testing -project "Apollo.xcodeproj" -scheme "${CIRCLE_XCODE_SCHEME}" -sdk "${CIRCLE_XCODE_SDK}" -destination "${DESTINATION}" -testPlan "${CIRCLE_XCODE_TEST_PLAN}" | xcpretty
           name: Clean and build for testing
       - run:
           command: xcodebuild test-without-building -resultBundlePath ~/TestResults/ResultBundle.xcresult -project "Apollo.xcodeproj" -scheme "${CIRCLE_XCODE_SCHEME}" -sdk "${CIRCLE_XCODE_SDK}" -destination "${DESTINATION}" -testPlan "${CIRCLE_XCODE_TEST_PLAN}" | xcpretty
           name: Run tests
       - save-xcodebuild-artifacts
-      - save_cache:
-          key: starwars-server
-          paths:
-            - ../starwars-server
   save-xcodebuild-artifacts:
     description: Save artifacts logs, crash reports and test results generated by xcodebuild
     steps:
@@ -94,6 +101,19 @@ commands:
 # Important! When adding a new job to `jobs`, make sure to define when it
 # executes by also adding it to the `workflows` section below!
 jobs:
+  IntegrationTests_macOS_current:
+    macos:
+      xcode: << pipeline.parameters.xcode_version >>
+    environment:
+      DESTINATION: platform=macOS,arch=x86_64
+      CIRCLE_XCODE_SCHEME: Apollo
+      CIRCLE_XCODE_TEST_PLAN: Apollo-IntegrationTestPlan
+      CIRCLE_XCODE_SDK: << pipeline.parameters.macos_sdk >>
+    steps:
+      - integration_test_setup
+      - build_and_run_tests
+      - integration_test_cleanup
+
   macOS_current:
     macos:
       xcode: << pipeline.parameters.xcode_version >>
@@ -103,7 +123,8 @@ jobs:
       CIRCLE_XCODE_TEST_PLAN: Apollo-CITestPlan
       CIRCLE_XCODE_SDK: << pipeline.parameters.macos_sdk >>
     steps:
-      - common_test_steps
+      - common_test_setup
+      - build_and_run_tests
 
   iOS_current:
     macos:
@@ -114,7 +135,8 @@ jobs:
       CIRCLE_XCODE_TEST_PLAN: Apollo-CITestPlan
       CIRCLE_XCODE_SDK: << pipeline.parameters.ios_sdk >>
     steps:
-      - common_test_steps
+      - common_test_setup
+      - build_and_run_tests
 
   iOS_previous:
     macos:
@@ -125,7 +147,8 @@ jobs:
       CIRCLE_XCODE_TEST_PLAN: Apollo-CITestPlan
       CIRCLE_XCODE_SDK: << pipeline.parameters.ios_sdk >>
     steps:
-      - common_test_steps
+      - common_test_setup
+      - build_and_run_tests
 
   tvOS_current:
     macos:
@@ -136,9 +159,10 @@ jobs:
       CIRCLE_XCODE_TEST_PLAN: Apollo-CITestPlan
       CIRCLE_XCODE_SDK: << pipeline.parameters.tvos_sdk >>
     steps:
-      - common_test_steps
+      - common_test_setup
+      - build_and_run_tests
 
-  CodegenLibmacOS_current:
+  CodegenLib_macOS_current:
     macos:
       xcode: << pipeline.parameters.xcode_version >>
     environment:
@@ -147,7 +171,8 @@ jobs:
       CIRCLE_XCODE_TEST_PLAN: Apollo-CodegenTestPlan
       CIRCLE_XCODE_SDK: << pipeline.parameters.macos_sdk >>
     steps:
-      - common_test_steps
+      - common_test_setup
+      - build_and_run_tests
 
   CocoaPodsTrunk:
     macos:
@@ -165,6 +190,8 @@ workflows:
   # This workflow builds and tests the library across various operating systems and versions
   build-and-test:
     jobs:
+      - IntegrationTests_macOS_current:
+          name: Apollo Integration Tests macOS << pipeline.parameters.macos_version >>
       - macOS_current:
           name: Apollo macOS << pipeline.parameters.macos_version >>
       - iOS_current:
@@ -173,7 +200,7 @@ workflows:
           name: Apollo iOS << pipeline.parameters.ios_previous_version >>
       - tvOS_current:
           name: Apollo tvOS << pipeline.parameters.tvos_version >>
-      - CodegenLibmacOS_current:
+      - CodegenLib_macOS_current:
           name: Swift Code Generation
       - CocoaPodsTrunk:
           name: Push Podspec to CocoaPods Trunk