make bundle load more flexible

Author: morganchen12

FirebaseAnonymousAuthUI/FirebaseAnonymousAuthUITests/FirebaseAnonymousAuthUITests.m

@@ -30,12 +30,6 @@ @implementation FirebaseAnonymousAuthUITests
 
 - (void)setUp {
   [super setUp];
-
-  // xcodebuild doesn't use a bundle within the framework bundle.
-  id mockUtilsClass = OCMClassMock([FUIAuthUtils class]);
-  OCMStub(ClassMethod([mockUtilsClass bundleNamed:OCMOCK_ANY
-                                inFrameworkBundle:OCMOCK_ANY])).
-      andReturn([NSBundle bundleForClass:[FUIAnonymousAuth class]]);
 
   id authUIClass = OCMClassMock([FUIAuth class]);
   OCMStub(ClassMethod([authUIClass authUIWithAuth:OCMOCK_ANY])).

FirebaseAuthUI/Sources/FUIAuthUtils.m

@@ -35,21 +35,24 @@ + (nullable NSBundle *)bundleNamed:(nullable NSString *)bundleName
   if (!bundleName) {
     bundleName = FUIAuthBundleName;
   }
+  // Use the main bundle as a default if the framework wasn't provided.
+  NSBundle *frameworkBundle = framework;
+  if (frameworkBundle == nil) {
+    // If frameworkBundle is unspecified, assume main bundle/static linking.
+    frameworkBundle = [NSBundle mainBundle];
+  }
   // If using static frameworks, the bundle will be included directly in the main
   // bundle.
   NSString *path = [[NSBundle mainBundle] pathForResource:bundleName ofType:@"bundle"];
 
   // Otherwise, check the appropriate framework bundle.
   if (!path) {
-    NSBundle *frameworkBundle = framework;
-    if (frameworkBundle == nil) {
-      // If frameworkBundle is unspecified, assume main bundle/static linking.
-      frameworkBundle = [NSBundle mainBundle];
-    }
     path = [frameworkBundle pathForResource:bundleName ofType:@"bundle"];
   }
   if (!path) {
     NSLog(@"Warning: Unable to find bundle %@ in framework %@.", bundleName, framework);
+    // Fall back on the root module.
+    return frameworkBundle;
   }
   returnBundle = [NSBundle bundleWithPath:path];
   return returnBundle;

FirebaseEmailAuthUI/FirebaseEmailAuthUITests/FirebaseEmailAuthUITests.m

@@ -31,12 +31,6 @@ @implementation FirebaseEmailAuthUITests
 
 - (void)setUp {
   [super setUp];
-
-  // xcodebuild doesn't use a bundle within the framework bundle.
-  id mockUtilsClass = OCMClassMock([FUIAuthUtils class]);
-  OCMStub(ClassMethod([mockUtilsClass bundleNamed:OCMOCK_ANY
-                                inFrameworkBundle:OCMOCK_ANY])).
-      andReturn([NSBundle bundleForClass:[FUIEmailAuth class]]);
 
   id authUIClass = OCMClassMock([FUIAuth class]);
   OCMStub([authUIClass setEmailAuthProvider:[OCMArg any]]).andDo(^(NSInvocation *invocation){

FirebaseFacebookAuthUI/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m

@@ -38,12 +38,6 @@ @implementation FirebaseFacebookAuthUITests
 - (void)setUp {
   [super setUp];
 
-  // xcodebuild doesn't use a bundle within the framework bundle.
-  id mockUtilsClass = OCMClassMock([FUIAuthUtils class]);
-  OCMStub(ClassMethod([mockUtilsClass bundleNamed:OCMOCK_ANY
-                                inFrameworkBundle:OCMOCK_ANY])).
-      andReturn([NSBundle bundleForClass:[FUIFacebookAuthTest class]]);
-
   id authClass = OCMClassMock([FIRAuth class]);
   OCMStub(ClassMethod([authClass auth])).
       andReturn(authClass);

FirebaseGoogleAuthUI/FirebaseGoogleAuthUITests/FirebaseGoogleAuthUITests.m

@@ -36,11 +36,6 @@ @implementation FirebaseGoogleAuthUITests
 
 - (void)setUp {
   [super setUp];
-  // xcodebuild doesn't use a bundle within the framework bundle.
-  id mockUtilsClass = OCMClassMock([FUIAuthUtils class]);
-  OCMStub(ClassMethod([mockUtilsClass bundleNamed:OCMOCK_ANY
-                                inFrameworkBundle:OCMOCK_ANY])).
-      andReturn([NSBundle bundleForClass:[FUIGoogleAuth class]]);
 
   id authClass = OCMClassMock([FIRAuth class]);
   OCMStub(ClassMethod([authClass auth])).

FirebaseOAuthUI/FirebaseOAuthUITests/FirebaseOAuthUITests.m

@@ -34,12 +34,6 @@ @implementation FirebaseOAuthUITests
 - (void)setUp {
   [super setUp];
 
-  // xcodebuild doesn't use a bundle within the framework bundle.
-  id mockUtilsClass = OCMClassMock([FUIAuthUtils class]);
-  OCMStub(ClassMethod([mockUtilsClass bundleNamed:OCMOCK_ANY
-                                inFrameworkBundle:OCMOCK_ANY])).
-      andReturn([NSBundle bundleForClass:[FUIOAuth class]]);
-
   id authClass = OCMClassMock([FIRAuth class]);
   OCMStub(ClassMethod([authClass auth])).
       andReturn(authClass);

FirebasePhoneAuthUI/FirebasePhoneAuthUITests/FirebasePhoneAuthUITests.m

@@ -32,12 +32,6 @@ @implementation FirebasePhoneAuthUITests
 
 - (void)setUp {
   [super setUp];
-
-  // xcodebuild doesn't use a bundle within the framework bundle.
-  id mockUtilsClass = OCMClassMock([FUIAuthUtils class]);
-  OCMStub(ClassMethod([mockUtilsClass bundleNamed:OCMOCK_ANY
-                                inFrameworkBundle:OCMOCK_ANY])).
-      andReturn([NSBundle bundleForClass:[FUIPhoneAuth class]]);
 
   id authUIClass = OCMClassMock([FUIAuth class]);
   OCMStub(ClassMethod([authUIClass authUIWithAuth:OCMOCK_ANY])).