merge master + namespace fixup

.travis.yml

@@ -161,6 +161,37 @@ jobs:
       script:
         - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM $METHOD
 
+    # Xcode 9 may find lint errors that don't show up in Xcode 10 (#2081)
+    - stage: test
+      osx_image: xcode9.4
+      env:
+        - PROJECT=Firebase PLATFORM=iOS METHOD=pod-lib-lint
+      before_install:
+        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+      script:
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh GoogleUtilities.podspec
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseCore.podspec
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseAnalyticsInterop.podspec
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseAuth.podspec
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseAuthInterop.podspec
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseDatabase.podspec
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseDynamicLinks.podspec
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseMessaging.podspec
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseStorage.podspec
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseFunctions.podspec
+        - ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseInAppMessagingDisplay.podspec
+
+    - stage: test
+      osx_image: xcode9.4
+      env:
+        - PROJECT=Firestore PLATFORM=iOS METHOD=pod-lib-lint
+      before_install:
+        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+      script:
+        # Eliminate the one warning from BoringSSL when CocoaPods 1.6.0 is available.
+        # The travis_wait is necessary because the command takes more than 10 minutes.
+        - travis_wait ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseFirestore.podspec --allow-warnings --no-subspecs
+
     # Community-supported platforms
 
     - stage: test

CMakeLists.txt

@@ -59,6 +59,12 @@ set(
   CACHE PATH "Where to store downloaded files"
 )
 
+set(
+  FIREBASE_EXTERNAL_SOURCE_DIR
+  ${FIREBASE_BINARY_DIR}/external/src
+  CACHE PATH "Root directory of source code of the external dependencies"
+)
+
 download_external_sources()
 
 
@@ -81,20 +87,20 @@ add_external_subdirectory(benchmark)
 # Abseil-cpp
 # Force disable Abseil's tests, which don't compile under VS2017.
 set(old_build_testing ${BUILD_TESTING})
-set(BUILD_TESTING OFF CACHE BOOL "Disable Abseil tests" FORCE)
+set(ABSL_RUN_TESTS OFF CACHE BOOL "Disable Abseil tests" FORCE)
 add_subdirectory(
   Firestore/third_party/abseil-cpp
+  EXCLUDE_FROM_ALL
 )
-set(BUILD_TESTING ${old_build_testing} CACHE BOOL "Restore BUILD_TESTING" FORCE)
 
 
 # gRPC
-find_package(OpenSSL)
+find_package(OpenSSL QUIET)
 if(OPENSSL_FOUND)
   set(gRPC_SSL_PROVIDER package CACHE STRING "Use external OpenSSL")
 endif()
 
-find_package(ZLIB)
+find_package(ZLIB QUIET)
 if(ZLIB_FOUND)
   set(gRPC_ZLIB_PROVIDER package CACHE STRING "Use external ZLIB")
 endif()
@@ -103,8 +109,6 @@ set(gRPC_BUILD_TESTS OFF CACHE BOOL "Disable gRPC tests")
 add_external_subdirectory(grpc)
 
 # Fix up targets included by gRPC's build
-set(external_src_dir ${FIREBASE_BINARY_DIR}/external/src)
-
 if(OPENSSL_FOUND)
   # gRPC's CMakeLists.txt does not account for finding OpenSSL in a directory
   # that's not in the default search path.
@@ -127,14 +131,14 @@ else()
   target_include_directories(
     crypto
     INTERFACE
-      $<BUILD_INTERFACE:${external_src_dir}/grpc/third_party/boringssl/include>
+      $<BUILD_INTERFACE:${FIREBASE_EXTERNAL_SOURCE_DIR}/grpc/third_party/boringssl/include>
   )
 
   add_alias(OpenSSL::SSL ssl)
   target_include_directories(
     ssl
     INTERFACE
-      $<BUILD_INTERFACE:${external_src_dir}/grpc/third_party/boringssl/include>
+      $<BUILD_INTERFACE:${FIREBASE_EXTERNAL_SOURCE_DIR}/grpc/third_party/boringssl/include>
   )
 endif()
 
@@ -156,7 +160,7 @@ endif()
 if(NOT ZLIB_FOUND)
   target_include_directories(
     zlibstatic
-    INTERFACE $<BUILD_INTERFACE:${external_src_dir}/grpc/third_party/zlib>
+    INTERFACE $<BUILD_INTERFACE:${FIREBASE_EXTERNAL_SOURCE_DIR}/grpc/third_party/zlib>
   )
 endif()
 
@@ -186,7 +190,7 @@ target_compile_definitions(
 
 target_include_directories(
   protobuf-nanopb
-  INTERFACE $<BUILD_INTERFACE:${external_src_dir}/nanopb>
+  INTERFACE $<BUILD_INTERFACE:${FIREBASE_EXTERNAL_SOURCE_DIR}/nanopb>
 )
 
 

Example/Auth/ApiTests/FirebaseAuthApiTests.m

@@ -23,8 +23,6 @@
 
 #ifdef NO_NETWORK
 #import "ITUIOSTestUtil.h"
-#import "ioReplayer/IORManager.h"
-#import "ioReplayer/IORTestCase.h"
 #endif
 
 #import <GTMSessionFetcher/GTMSessionFetcher.h>
@@ -93,11 +91,8 @@
 #define SKIP_IF_ON_MOBILE_HARNESS
 #endif
 
-#ifdef NO_NETWORK
-@interface ApiTests : IORTestCase
-#else
 @interface ApiTests : XCTestCase
-#endif
+
 @end
 
 @implementation ApiTests

Example/Auth/EarlGreyTests/FIRVerifyIOSClientTests.m

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2018 Google
+ *
+ * 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 <XCTest/XCTest.h>
+#import <EarlGrey/EarlGrey.h>
+#import <FirebaseCore/FIRApp.h>
+#import "FirebaseAuth.h"
+
+static CGFloat const kShortScrollDistance = 100;
+
+static NSTimeInterval const kWaitForElementTimeOut = 15;
+
+@interface FIRVerifyIOSClientTests : XCTestCase
+@end
+
+/** Convenience function for EarlGrey tests. */
+static id<GREYMatcher> grey_scrollView(void) {
+  return [GREYMatchers matcherForKindOfClass:[UIScrollView class]];
+}
+
+@implementation FIRVerifyIOSClientTests
+
+/** To reset the app so that each test sees the app in a clean state. */
+- (void)setUp {
+  [super setUp];
+
+  [self signOut];
+
+  [[EarlGrey selectElementWithMatcher:grey_allOf(grey_scrollView(),
+                                                 grey_kindOfClass([UITableView class]), nil)]
+                        performAction:grey_scrollToContentEdge(kGREYContentEdgeTop)];
+}
+
+#pragma mark - Tests
+
+/** Test verify ios client*/
+- (void)testVerifyIOSClient {
+  [[[EarlGrey selectElementWithMatcher:grey_allOf(grey_text(@"Verify iOS client"),
+                                                  grey_sufficientlyVisible(), nil)]
+    usingSearchAction:grey_scrollInDirection(kGREYDirectionDown, kShortScrollDistance)
+    onElementWithMatcher:grey_allOf(grey_scrollView(), grey_kindOfClass([UITableView class]),
+                                    nil)] performAction:grey_tap()];
+
+  [self waitForElementWithText:@"OK" withDelay:kWaitForElementTimeOut];
+
+  [[EarlGrey selectElementWithMatcher:grey_text(@"OK")] performAction:grey_tap()];
+}
+
+#pragma mark - Helpers
+
+/** Sign out current account. */
+- (void)signOut {
+  NSError *signOutError;
+  BOOL status = [[FIRAuth auth] signOut:&signOutError];
+
+  // Just log the error because we don't want to fail the test if signing out fails.
+  if (!status) {
+    NSLog(@"Error signing out: %@", signOutError);
+  }
+}
+
+/** Wait for an element with text to appear. */
+- (void)waitForElementWithText:(NSString *)text withDelay:(NSTimeInterval)maxDelay {
+  GREYCondition *displayed =
+  [GREYCondition conditionWithName:@"Wait for element"
+                             block:^BOOL {
+                               NSError *error = nil;
+                               [[EarlGrey selectElementWithMatcher:grey_text(text)]
+                                assertWithMatcher:grey_sufficientlyVisible()
+                                            error:&error];
+                               return !error;
+                             }];
+  GREYAssertTrue([displayed waitWithTimeout:maxDelay], @"Failed to wait for element '%@'.", text);
+}
+
+@end

Example/Auth/EarlGreyTests/FirebaseAuthEarlGreyTests.m

@@ -21,10 +21,6 @@
 #import <FirebaseCore/FIRApp.h>
 #import "FirebaseAuth.h"
 
-#ifdef NO_NETWORK
-#import "ioReplayer/IORTestCase.h"
-#endif
-
 /** The url for obtaining a valid custom token string used to test BYOAuth. */
 static NSString *const kCustomTokenUrl = @"https://fb-sa-1211.appspot.com/token";
 
@@ -38,15 +34,11 @@
 
 static NSTimeInterval const kWaitForElementTimeOut = 5;
 
-#ifdef NO_NETWORK
-@interface BasicUITest : IORTestCase
-#else
 @interface BasicUITest :XCTestCase
-#endif
 @end
 
 /** Convenience function for EarlGrey tests. */
-id<GREYMatcher> grey_scrollView(void) {
+static id<GREYMatcher> grey_scrollView(void) {
   return [GREYMatchers matcherForKindOfClass:[UIScrollView class]];
 }
 
@@ -60,7 +52,7 @@ - (void)setUp {
 
   [[EarlGrey selectElementWithMatcher:grey_allOf(grey_scrollView(),
                                                  grey_kindOfClass([UITableView class]), nil)]
-      performAction:grey_scrollToContentEdge(kGREYContentEdgeTop)];
+                        performAction:grey_scrollToContentEdge(kGREYContentEdgeTop)];
 }
 
 #pragma mark - Tests
@@ -156,8 +148,7 @@ - (void)testSignInWithInvalidBYOAuthToken {
 
   [[EarlGrey selectElementWithMatcher:grey_text(@"Done")] performAction:grey_tap()];
 
-  NSString *invalidTokenErrorMessage =
-      @"The custom token format is incorrect. Please check the documentation.";
+  NSString *invalidTokenErrorMessage = @"Sign-In Error";
 
   [self waitForElementWithText:invalidTokenErrorMessage withDelay:kWaitForElementTimeOut];
 
@@ -190,4 +181,5 @@ - (void)waitForElementWithText:(NSString *)text withDelay:(NSTimeInterval)maxDel
                                  }];
   GREYAssertTrue([displayed waitWithTimeout:maxDelay], @"Failed to wait for element '%@'.", text);
 }
+
 @end

Example/Auth/Sample/AppManager.m

@@ -22,11 +22,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-// Declares a private method of FIRInstanceID to work around a bug.
-@interface FIRInstanceID : NSObject
-+ (void)notifyTokenRefresh;
-@end
-
 @implementation AppManager {
   /** @var _createdAppNames
       @brief The set of names of live (created but not deleted) app, to avoid iCore warnings.
@@ -59,7 +54,6 @@ - (void)recreateAppAtIndex:(int)index
                 completion:(void (^)())completion {
   [self deleteAppAtIndex:index completion:^() {
     if (index == 0) {
-      [FIRInstanceID notifyTokenRefresh];  // b/28967043
       if (options) {
         [FIRApp configureWithOptions:options];
       }