fix FirebaseUI unit tests

Author: yramanchuk

FirebaseAuthUI/FIRAuthUIUtils.m

@@ -22,13 +22,7 @@ + (NSBundle *)frameworkBundle {
   static NSBundle *frameworkBundle = nil;
   static dispatch_once_t predicate;
   dispatch_once(&predicate, ^{
-    NSString *mainBundlePath = [[NSBundle mainBundle] resourcePath];
-    NSString *frameworkBundlePath =
-        [mainBundlePath stringByAppendingPathComponent:@"FirebaseAuthUIBundle.bundle"];
-    frameworkBundle = [NSBundle bundleWithPath:frameworkBundlePath];
-    if (!frameworkBundle) {
-      frameworkBundle = [NSBundle mainBundle];
-    }
+    frameworkBundle = [NSBundle bundleForClass:[self class]];
   });
   return frameworkBundle;
 }

FirebaseAuthUITests/FIRAuthUITest.m

@@ -33,6 +33,8 @@ @implementation FUILoginProvider
 - (NSString *)providerID  { return @"provider id"; }
 - (NSString *)shortName   { return @"login provider"; }
 - (NSString *)signInLabel { return @"sign in label"; }
+- (NSString *)accessToken { return @"accessToken"; }
+- (NSString *)idToken     { return @"idToken"; }
 
 - (UIImage *)icon {
   return [[UIImage alloc] init];

FirebaseAuthUITests/GoogleService-Info.plist

@@ -33,7 +33,7 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true/>
 	<key>GOOGLE_APP_ID</key>
-	<string>google-app-id</string>
+	<string>0:000000000000:ios:0000000000000000</string>
 	<key>DATABASE_URL</key>
 	<string>database-url</string>
 </dict>

FirebaseFacebookAuthUI/FIRFacebookAuthUI.m

@@ -22,11 +22,6 @@
 #import <FBSDKLoginKit/FBSDKLoginKit.h>
 #import <FirebaseAuthUI/FIRAuthUIErrorUtils.h>
 
-/** @var kBundleFileName
-    @brief The name of the bundle containing Facebook auth provider assets/resources.
- */
-static NSString *const kBundleFileName = @"FirebaseFacebookAuthUIBundle.bundle";
-
 /** @var kTableName
     @brief The name of the strings table to search for localized strings.
 */
@@ -80,13 +75,7 @@ + (NSBundle *)frameworkBundle {
   static NSBundle *frameworkBundle = nil;
   static dispatch_once_t predicate;
   dispatch_once(&predicate, ^{
-    NSString *mainBundlePath = [[NSBundle mainBundle] resourcePath];
-    NSString *frameworkBundlePath =
-        [mainBundlePath stringByAppendingPathComponent:kBundleFileName];
-    frameworkBundle = [NSBundle bundleWithPath:frameworkBundlePath];
-    if (!frameworkBundle) {
-      frameworkBundle = [NSBundle mainBundle];
-    }
+    frameworkBundle = [NSBundle bundleForClass:[self class]];
   });
   return frameworkBundle;
 }
@@ -221,9 +210,9 @@ - (void)callbackWithCredential:(nullable FIRAuthCredential *)credential
  @brief Validates that Facebook SDK data was filled in Info.plist and creates Facebook login manager 
  */
 - (void)configureProvider {
-  NSString *facebookAppId = [[NSBundle mainBundle] objectForInfoDictionaryKey:kFacebookAppId];
-  NSString *facebookDisplayName =
-  [[NSBundle mainBundle] objectForInfoDictionaryKey:kFacebookDisplayName];
+  NSBundle *bundle = [[self class] frameworkBundle];
+  NSString *facebookAppId = [bundle objectForInfoDictionaryKey:kFacebookAppId];
+  NSString *facebookDisplayName = [bundle objectForInfoDictionaryKey:kFacebookDisplayName];
 
   if (!(facebookAppId && facebookDisplayName)) {
     [NSException raise:NSInternalInconsistencyException

FirebaseFacebookAuthUITests/FIRFacebookAuthUITest.h

@@ -0,0 +1,21 @@
+//
+//  Copyright (c) 2016 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import <FirebaseFacebookAuthUI/FirebaseFacebookAuthUI.h>
+
+@interface FIRFacebookAuthUITest : FIRFacebookAuthUI
+
+@end

FirebaseFacebookAuthUITests/FIRFacebookAuthUITest.m

@@ -0,0 +1,28 @@
+//
+//  Copyright (c) 2016 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+#import "FIRFacebookAuthUITest.h"
+
+@implementation FIRFacebookAuthUITest
+
++ (NSBundle *)frameworkBundle {
+  static NSBundle *frameworkBundle = nil;
+  static dispatch_once_t predicate;
+  dispatch_once(&predicate, ^{
+    frameworkBundle = [NSBundle bundleForClass:[self class]];
+  });
+  return frameworkBundle;
+}
+@end

FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m

@@ -15,7 +15,7 @@
 //
 
 @import XCTest;
-#import <FirebaseFacebookAuthUI/FIRFacebookAuthUI.h>
+#import "FIRFacebookAuthUITest.h"
 
 @interface FirebaseFacebookAuthUITests : XCTestCase
 @property (nonatomic, strong) FIRFacebookAuthUI *provider;
@@ -25,7 +25,7 @@ @implementation FirebaseFacebookAuthUITests
 
 - (void)setUp {
   [super setUp];
-  self.provider = [[FIRFacebookAuthUI alloc] initWithAppID:@"an id"];
+  self.provider = [[FIRFacebookAuthUITest alloc] init];
 }
 
 - (void)testItExists {

FirebaseFacebookAuthUITests/Info.plist

@@ -18,5 +18,9 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
+	<key>FacebookAppID</key>
+	<string>{your-app-id}</string>
+	<key>FacebookDisplayName</key>
+	<string>{your-app-name}</string>
 </dict>
 </plist>

FirebaseGoogleAuthUI/FIRGoogleAuthUI.m

@@ -87,13 +87,7 @@ + (NSBundle *)frameworkBundle {
   static NSBundle *frameworkBundle = nil;
   static dispatch_once_t predicate;
   dispatch_once(&predicate, ^{
-    NSString *mainBundlePath = [[NSBundle mainBundle] resourcePath];
-    NSString *frameworkBundlePath =
-        [mainBundlePath stringByAppendingPathComponent:@"FirebaseGoogleAuthUIBundle.bundle"];
-    frameworkBundle = [NSBundle bundleWithPath:frameworkBundlePath];
-    if (!frameworkBundle) {
-      frameworkBundle = [NSBundle mainBundle];
-    }
+    frameworkBundle = [NSBundle bundleForClass:[self class]];
   });
   return frameworkBundle;
 }

FirebaseTwitterAuthUI/FIRTwitterAuthUI.m

@@ -19,11 +19,6 @@
 #import <TwitterKit/TwitterKit.h>
 #import "FIRTwitterAuthUI.h"
 
-/** @var kBundleFileName
- @brief The name of the bundle containing Twitter auth provider assets/resources.
- */
-static NSString *const kBundleFileName = @"FirebaseTwitterAuthUIBundle.bundle";
-
 /** @var kTableName
  @brief The name of the strings table to search for localized strings.
  */
@@ -44,13 +39,7 @@ + (NSBundle *)frameworkBundle {
   static NSBundle *frameworkBundle = nil;
   static dispatch_once_t predicate;
   dispatch_once(&predicate, ^{
-    NSString *mainBundlePath = [[NSBundle mainBundle] resourcePath];
-    NSString *frameworkBundlePath =
-    [mainBundlePath stringByAppendingPathComponent:kBundleFileName];
-    frameworkBundle = [NSBundle bundleWithPath:frameworkBundlePath];
-    if (!frameworkBundle) {
-      frameworkBundle = [NSBundle mainBundle];
-    }
+    frameworkBundle = [NSBundle bundleForClass:[self class]];
   });
   return frameworkBundle;
 }