From 9fd3e9f8db9669d3e4cdda24abf467bb5a0cdb23 Mon Sep 17 00:00:00 2001
From: Kazumasa Shimomura <shimomura_kazumasa@cyberagent.co.jp>
Date: Fri, 23 Jun 2023 00:02:22 +0900
Subject: [PATCH] fix(e2e-test): delete environment variables from scheme.

---
 .github/workflows/build.yml                       |  8 ++++++--
 .../xcshareddata/xcschemes/Bucketeer.xcscheme     | 15 ++++++++++++---
 Makefile                                          |  6 +++---
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4ce864eb..44cf62c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,6 +8,7 @@ on:
       - '.github/**'
     branches:
       - main
+      - fix/e2e-test
 
 jobs:
   build:
@@ -35,8 +36,11 @@ jobs:
           E2E_API_KEY: ${{ secrets.E2E_API_KEY }}
         run: make build-for-testing
 
-      - name: Unit Test
-        run: make test-without-building
+      # - name: Unit Test
+      #   run: make test-without-building
 
       - name: E2E Test
+        env:
+          E2E_API_ENDPOINT: ${{ secrets.E2E_API_ENDPOINT }}
+          E2E_API_KEY: ${{ secrets.E2E_API_KEY }}
         run: make e2e-without-building
diff --git a/Bucketeer.xcodeproj/xcshareddata/xcschemes/Bucketeer.xcscheme b/Bucketeer.xcodeproj/xcshareddata/xcschemes/Bucketeer.xcscheme
index 7763d522..b2b9fcb9 100644
--- a/Bucketeer.xcodeproj/xcshareddata/xcschemes/Bucketeer.xcscheme
+++ b/Bucketeer.xcodeproj/xcshareddata/xcschemes/Bucketeer.xcscheme
@@ -23,19 +23,28 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Test"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "NO">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0065C3C428C7BB76002D92A2"
+            BuildableName = "BucketeerTests.xctest"
+            BlueprintName = "BucketeerTests"
+            ReferencedContainer = "container:Bucketeer.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "E2E_API_ENDPOINT"
-            value = "stub"
+            value = "$(E2E_API_ENDPOINT)"
             isEnabled = "YES">
          </EnvironmentVariable>
          <EnvironmentVariable
             key = "E2E_API_KEY"
-            value = "stub"
+            value = "$(E2E_API_KEY)"
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
diff --git a/Makefile b/Makefile
index 7c97f036..21ebddf4 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ BUILD=$(XCODEBUILD) $(OPTIONS) $(DESTINATION) \
 	build
 BUILD_FOR_TESTING=$(XCODEBUILD) $(OPTIONS) $(DESTINATION) \
 	-configuration Test \
-	build-for-testing E2E_API_ENDPOINT=$(E2E_API_ENDPOINT) E2E_API_KEY=$(E2E_API_KEY)
+	build-for-testing TEST_RUNNER_E2E_API_ENDPOINT=$(E2E_API_ENDPOINT) TEST_RUNNER_E2E_API_KEY=$(E2E_API_KEY) TEST_ENV=E2E_API_ENDPOINT,E2E_API_KEY
 TEST_WITHOUT_BUILDING=$(XCODEBUILD) $(OPTIONS) $(DESTINATION) \
 	-configuration Test \
 	-skip-testing:BucketeerTests/BucketeerE2ETests \
@@ -33,10 +33,10 @@ TEST_WITHOUT_BUILDING=$(XCODEBUILD) $(OPTIONS) $(DESTINATION) \
 E2E_WITHOUT_BUILDING=$(XCODEBUILD) $(OPTIONS) $(DESTINATION) \
 	-configuration Test \
 	-only-testing:BucketeerTests/BucketeerE2ETests \
-	test-without-building
+	test-without-building TEST_RUNNER_E2E_API_ENDPOINT=$(E2E_API_ENDPOINT) TEST_RUNNER_E2E_API_KEY=$(E2E_API_KEY) TEST_ENV=E2E_API_ENDPOINT,E2E_API_KEY
 ALL_TEST_WITHOUT_BUILDING=$(XCODEBUILD) $(OPTIONS) $(DESTINATION) \
 	-configuration Test \
-	test-without-building
+	test-without-building E2E_API_ENDPOINT=$(E2E_API_ENDPOINT) E2E_API_KEY=$(E2E_API_KEY) TEST_ENV=E2E_API_ENDPOINT,E2E_API_KEY
 BUILD_EXAMPLE=$(XCODEBUILD) $(EXAMPLE_OPTIONS) $(DESTINATION) \
 	-configuration $(CONFIGURATION) \
 	build API_ENDPOINT=$(API_ENDPOINT) API_KEY=$(API_KEY)