Merge branch 'update-ios-10.17.0' of https://github.com/firebase/fire…

…base-cpp-sdk into update-ios-10.17.0
firebase · Nov 2, 2023 · 85448a1 · 85448a1
2 parents d05f357 + dbc0419
commit 85448a1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -772,7 +772,12 @@ jobs:
           shell: bash
           timeout_minutes: 5
           max_attempts: 3
-          command: npm install -g firebase-tools     
+          command: npm install firebase-tools     
+      - name: Add firebase-tools to PATH
+        shell: bash
+        run: |
+          echo "$(npm root)" >> $GITHUB_PATH
+          echo "$(npm root)/.bin" >> $GITHUB_PATH
       - name: Setup java
         uses: actions/setup-java@v3
         with:
@@ -1166,7 +1171,13 @@ jobs:
           shell: bash
           timeout_minutes: 5
           max_attempts: 3
-          command: npm install -g firebase-tools     
+          command: npm install firebase-tools     
+      - name: Add firebase-tools to PATH
+        if: contains(needs.check_and_prepare.outputs.apis, 'firestore')
+        shell: bash
+        run: |
+          echo "$(npm root)" >> $GITHUB_PATH
+          echo "$(npm root)/.bin" >> $GITHUB_PATH
       - name: Start Firestore Emulator
         if: steps.device-info.outputs.device_type == 'virtual' && contains(needs.check_and_prepare.outputs.apis, 'firestore')
         run: |
@@ -1287,7 +1298,13 @@ jobs:
           shell: bash
           timeout_minutes: 5
           max_attempts: 3
-          command: npm install -g firebase-tools     
+          command: npm install firebase-tools     
+      - name: Add firebase-tools to PATH
+        if: contains(needs.check_and_prepare.outputs.apis, 'firestore')
+        shell: bash
+        run: |
+          echo "$(npm root)" >> $GITHUB_PATH
+          echo "$(npm root)/.bin" >> $GITHUB_PATH
       - name: Start Firestore Emulator
         if: contains(needs.check_and_prepare.outputs.apis, 'firestore')
         run: |

diff --git a/gma/integration_test/src/integration_test.cc b/gma/integration_test/src/integration_test.cc
@@ -3057,18 +3057,6 @@ TEST_F(FirebaseGmaUmpTest, TestUmpMethodsReturnOperationInProgress) {
       future_request_2, "RequestConsentInfoUpdate second",
       firebase::gma::ump::kConsentRequestErrorOperationInProgress);
   WaitForCompletion(future_request_1, "RequestConsentInfoUpdate first");
-
-  firebase::Future<void> future_load_and_show_1 =
-      consent_info_->LoadAndShowConsentFormIfRequired(
-          app_framework::GetWindowController());
-  firebase::Future<void> future_load_and_show_2 =
-      consent_info_->LoadAndShowConsentFormIfRequired(
-          app_framework::GetWindowController());
-  WaitForCompletion(future_load_and_show_2,
-                    "LoadAndShowConsentFormIfRequired second",
-                    firebase::gma::ump::kConsentFormErrorOperationInProgress);
-  WaitForCompletion(future_load_and_show_1,
-                    "LoadAndShowConsentFormIfRequired first");
 }
 
 TEST_F(FirebaseGmaUmpTest, TestUmpMethodsReturnOperationInProgressWithUI) {

diff --git a/gma/src/include/firebase/gma/ump/consent_info.h b/gma/src/include/firebase/gma/ump/consent_info.h
@@ -76,7 +76,10 @@ class ConsentInfo {
   /// @code
   /// #if defined(__ANDROID__)
   /// consent_info = firebase::gma::ump::ConsentInfo::GetInstance(jni_env,
-  /// activity); #else consent_info = firebase::gma::ump::GetInstance(); #endif
+  /// activity);
+  /// #else
+  /// consent_info = firebase::gma::ump::GetInstance();
+  /// #endif
   /// @endcode
   ///
   /// @param[in] jni_env JNIEnv pointer.