test: fix missing api endpoint and key in the e2e test (#10)

bucketeer-io · Jun 23, 2023 · 4d93a55 · 4d93a55
1 parent 4dc6d5b
commit 4d93a55
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,13 +30,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Build for testing
-        env:
-          E2E_API_ENDPOINT: ${{ secrets.E2E_API_ENDPOINT }}
-          E2E_API_KEY: ${{ secrets.E2E_API_KEY }}
         run: make build-for-testing
 
       - 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
@@ -27,15 +27,24 @@
       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
@@ -25,15 +25,15 @@ 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_WITHOUT_BUILDING=$(XCODEBUILD) $(OPTIONS) $(DESTINATION) \
 	-configuration Test \
 	-skip-testing:BucketeerTests/BucketeerE2ETests \
 	test-without-building
 E2E_WITHOUT_BUILDING=$(XCODEBUILD) $(OPTIONS) $(DESTINATION) \
 	-configuration Test \
 	-only-testing:BucketeerTests/BucketeerE2ETests \
-	test-without-building
+	test-without-building E2E_API_ENDPOINT=$(E2E_API_ENDPOINT) E2E_API_KEY=$(E2E_API_KEY)
 ALL_TEST_WITHOUT_BUILDING=$(XCODEBUILD) $(OPTIONS) $(DESTINATION) \
 	-configuration Test \
 	test-without-building