[firebase_admob] Provide a default MobileAdTargetingInfo for Rewarded…

…VideoAd.load() (firebase#2245)
DEVSOG12 · Apr 24, 2020 · 3d620ec · 3d620ec
1 parent 0578f90
commit 3d620ec
Show file tree

Hide file tree

Showing 6 changed files with 129 additions and 3 deletions.
diff --git a/packages/firebase_admob/CHANGELOG.md b/packages/firebase_admob/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.9.3+3
+
+* Provide a default `MobileAdTargetingInfo` for `RewardedVideoAd.load()`. `RewardedVideoAd.load()`
+would inadvertently cause a crash if `MobileAdTargetingInfo` was excluded.
+
 ## 0.9.3+2
 
 * Fixed bug related to simultaneous ad loading behavior on iOS.

diff --git a/packages/firebase_admob/example/ios/Runner.xcodeproj/project.pbxproj b/packages/firebase_admob/example/ios/Runner.xcodeproj/project.pbxproj
@@ -248,7 +248,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed\n/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin\n";
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -270,9 +270,12 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${PODS_ROOT}/../Flutter/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

diff --git a/packages/firebase_admob/example/test_driver/firebase_admob.dart b/packages/firebase_admob/example/test_driver/firebase_admob.dart
@@ -0,0 +1,106 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:firebase_admob/firebase_admob.dart';
+
+void main() {
+  final Completer<String> completer = Completer<String>();
+  enableFlutterDriverExtension(handler: (_) => completer.future);
+  tearDownAll(() => completer.complete(null));
+
+  group('$FirebaseAdMob', () {
+    test('Initialize Firebase Admob', () async {
+      expect(
+        FirebaseAdMob.instance.initialize(appId: FirebaseAdMob.testAppId),
+        completes,
+      );
+    });
+
+    test('$BannerAd', () async {
+      final Completer<void> adCompleter = Completer<void>();
+
+      final BannerAd bannerAd = BannerAd(
+        adUnitId: BannerAd.testAdUnitId,
+        size: AdSize.banner,
+        targetingInfo: MobileAdTargetingInfo(
+          keywords: <String>['foo', 'bar'],
+          contentUrl: 'http://foo.com/bar.html',
+          childDirected: true,
+          nonPersonalizedAds: true,
+        ),
+        listener: (MobileAdEvent event) {
+          if (event == MobileAdEvent.loaded) adCompleter.complete();
+        },
+      );
+
+      await bannerAd.load();
+      expect(adCompleter.future, completes);
+    });
+
+    test('$InterstitialAd', () async {
+      final Completer<void> adCompleter = Completer<void>();
+
+      final InterstitialAd interstitialAd = InterstitialAd(
+        adUnitId: InterstitialAd.testAdUnitId,
+        targetingInfo: MobileAdTargetingInfo(
+          keywords: <String>['foo', 'bar'],
+          contentUrl: 'http://foo.com/bar.html',
+          childDirected: true,
+          nonPersonalizedAds: true,
+        ),
+        listener: (MobileAdEvent event) {
+          if (event == MobileAdEvent.loaded) adCompleter.complete();
+        },
+      );
+
+      await interstitialAd.load();
+      expect(adCompleter.future, completes);
+    });
+
+    test('$RewardedVideoAd', () async {
+      // Request without a targeting info
+      bool hasStartedLoading = await RewardedVideoAd.instance.load(
+        adUnitId: RewardedVideoAd.testAdUnitId,
+      );
+      expect(hasStartedLoading, isTrue);
+
+      // Request with a targeting info
+      hasStartedLoading = await RewardedVideoAd.instance.load(
+        adUnitId: RewardedVideoAd.testAdUnitId,
+        targetingInfo: MobileAdTargetingInfo(
+          keywords: <String>['foo', 'bar'],
+          contentUrl: 'http://foo.com/bar.html',
+          childDirected: true,
+          nonPersonalizedAds: true,
+        ),
+      );
+      expect(hasStartedLoading, isTrue);
+    });
+
+    test('$NativeAd', () async {
+      final Completer<void> adCompleter = Completer<void>();
+
+      final NativeAd nativeAd = NativeAd(
+        adUnitId: NativeAd.testAdUnitId,
+        factoryId: 'adFactoryExample',
+        targetingInfo: MobileAdTargetingInfo(
+          keywords: <String>['foo', 'bar'],
+          contentUrl: 'http://foo.com/bar.html',
+          childDirected: true,
+          nonPersonalizedAds: true,
+        ),
+        listener: (MobileAdEvent event) {
+          if (event == MobileAdEvent.loaded) adCompleter.complete();
+        },
+      );
+
+      await nativeAd.load();
+      expect(adCompleter.future, completes);
+    });
+  });
+}
diff --git a/packages/firebase_admob/example/test_driver/firebase_admob_test.dart b/packages/firebase_admob/example/test_driver/firebase_admob_test.dart
@@ -0,0 +1,11 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter_driver/flutter_driver.dart';
+
+void main() async {
+  final FlutterDriver driver = await FlutterDriver.connect();
+  await driver.requestData(null, timeout: const Duration(minutes: 1));
+  await driver.close();
+}
diff --git a/packages/firebase_admob/lib/firebase_admob.dart b/packages/firebase_admob/lib/firebase_admob.dart
@@ -489,7 +489,8 @@ class RewardedVideoAd {
 
   /// Loads a rewarded video ad using the provided ad unit ID.
   Future<bool> load(
-      {@required String adUnitId, MobileAdTargetingInfo targetingInfo}) {
+      {@required String adUnitId,
+      MobileAdTargetingInfo targetingInfo = const MobileAdTargetingInfo()}) {
     assert(adUnitId.isNotEmpty);
     return _invokeBooleanMethod("loadRewardedVideoAd", <String, dynamic>{
       'adUnitId': adUnitId,

diff --git a/packages/firebase_admob/pubspec.yaml b/packages/firebase_admob/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_admob
 description: Flutter plugin for Firebase AdMob, supporting
   banner, interstitial (full-screen), and rewarded video ads
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_admob
-version: 0.9.3+2
+version: 0.9.3+3
 
 flutter:
   plugin: