Skip to content

Fix tests and disable UI tests #688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
osx_image: xcode10.1
osx_image: xcode10.2
language: objective-c
xcode_workspace: FirebaseUI.xcworkspace
xcode_scheme: FirebaseUI
Expand Down
140 changes: 14 additions & 126 deletions AnonymousAuth/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
1EF5CA884792B6ABAF0C7EC8 /* Pods_FirebaseAnonymousAuthUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B521F1010988D23DF3A39CD /* Pods_FirebaseAnonymousAuthUITests.framework */; };
8D69E22721DD476D00CFA49B /* FirebaseAnonymousAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D69E21D21DD476C00CFA49B /* FirebaseAnonymousAuthUI.framework */; };
8D69E22C21DD476D00CFA49B /* FirebaseAnonymousAuthUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E22B21DD476D00CFA49B /* FirebaseAnonymousAuthUITests.m */; };
8D69E22E21DD476D00CFA49B /* FirebaseAnonymousAuthUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E22021DD476D00CFA49B /* FirebaseAnonymousAuthUI.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand All @@ -17,7 +16,6 @@
8D69E35421DD5C4700CFA49B /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E34E21DD5C4700CFA49B /* [email protected] */; };
8D69E35521DD5C4700CFA49B /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E34F21DD5C4700CFA49B /* [email protected] */; };
8D69E35621DD5C4700CFA49B /* FirebaseAnonymousAuthUI.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E35121DD5C4700CFA49B /* FirebaseAnonymousAuthUI.strings */; };
FCB1B2C40B18B4A62D63C4E4 /* Pods_FirebaseAnonymousAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B589F207E4236363EEE626 /* Pods_FirebaseAnonymousAuthUI.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -31,8 +29,6 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
02807C8B4CFAB7FD9C32C1A3 /* Pods-FirebaseAnonymousAuthUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAnonymousAuthUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseAnonymousAuthUITests/Pods-FirebaseAnonymousAuthUITests.release.xcconfig"; sourceTree = "<group>"; };
73B589F207E4236363EEE626 /* Pods_FirebaseAnonymousAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseAnonymousAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8D69E21D21DD476C00CFA49B /* FirebaseAnonymousAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseAnonymousAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8D69E22021DD476D00CFA49B /* FirebaseAnonymousAuthUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebaseAnonymousAuthUI.h; sourceTree = "<group>"; };
8D69E22121DD476D00CFA49B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -45,18 +41,13 @@
8D69E34E21DD5C4700CFA49B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
8D69E34F21DD5C4700CFA49B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
8D69E35221DD5C4700CFA49B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/FirebaseAnonymousAuthUI.strings; sourceTree = "<group>"; };
9929AABD790C0DD60C537CB2 /* Pods-FirebaseAnonymousAuthUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAnonymousAuthUI.release.xcconfig"; path = "Target Support Files/Pods-FirebaseAnonymousAuthUI/Pods-FirebaseAnonymousAuthUI.release.xcconfig"; sourceTree = "<group>"; };
9B521F1010988D23DF3A39CD /* Pods_FirebaseAnonymousAuthUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseAnonymousAuthUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
AD655D2BC8125FCBFB69632A /* Pods-FirebaseAnonymousAuthUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAnonymousAuthUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseAnonymousAuthUI/Pods-FirebaseAnonymousAuthUI.debug.xcconfig"; sourceTree = "<group>"; };
C7E917677D16B9024969C4FE /* Pods-FirebaseAnonymousAuthUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAnonymousAuthUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseAnonymousAuthUITests/Pods-FirebaseAnonymousAuthUITests.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
8D69E21A21DD476C00CFA49B /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
FCB1B2C40B18B4A62D63C4E4 /* Pods_FirebaseAnonymousAuthUI.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -65,7 +56,6 @@
buildActionMask = 2147483647;
files = (
8D69E22721DD476D00CFA49B /* FirebaseAnonymousAuthUI.framework in Frameworks */,
1EF5CA884792B6ABAF0C7EC8 /* Pods_FirebaseAnonymousAuthUITests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -78,8 +68,7 @@
8D69E21F21DD476C00CFA49B /* FirebaseAnonymousAuthUI */,
8D69E22A21DD476D00CFA49B /* FirebaseAnonymousAuthUITests */,
8D69E21E21DD476C00CFA49B /* Products */,
B55605365FE042830EBBD157 /* Pods */,
B3C0D2E787876EE649C89CBF /* Frameworks */,
BEF4805F13BABCBDD925C264 /* Pods */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -132,24 +121,10 @@
path = Strings;
sourceTree = "<group>";
};
B3C0D2E787876EE649C89CBF /* Frameworks */ = {
BEF4805F13BABCBDD925C264 /* Pods */ = {
isa = PBXGroup;
children = (
73B589F207E4236363EEE626 /* Pods_FirebaseAnonymousAuthUI.framework */,
9B521F1010988D23DF3A39CD /* Pods_FirebaseAnonymousAuthUITests.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
B55605365FE042830EBBD157 /* Pods */ = {
isa = PBXGroup;
children = (
AD655D2BC8125FCBFB69632A /* Pods-FirebaseAnonymousAuthUI.debug.xcconfig */,
9929AABD790C0DD60C537CB2 /* Pods-FirebaseAnonymousAuthUI.release.xcconfig */,
C7E917677D16B9024969C4FE /* Pods-FirebaseAnonymousAuthUITests.debug.xcconfig */,
02807C8B4CFAB7FD9C32C1A3 /* Pods-FirebaseAnonymousAuthUITests.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
Expand All @@ -172,12 +147,10 @@
isa = PBXNativeTarget;
buildConfigurationList = 8D69E23121DD476D00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseAnonymousAuthUI" */;
buildPhases = (
F0D2BEDEEF9C146EA083E17F /* [CP] Check Pods Manifest.lock */,
8D69E21821DD476C00CFA49B /* Headers */,
8D69E21921DD476C00CFA49B /* Sources */,
8D69E21A21DD476C00CFA49B /* Frameworks */,
8D69E21B21DD476C00CFA49B /* Resources */,
65BB97B1C2E0ACB0370C903B /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -192,11 +165,9 @@
isa = PBXNativeTarget;
buildConfigurationList = 8D69E23421DD476D00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseAnonymousAuthUITests" */;
buildPhases = (
714F08D4612B91126DDD4559 /* [CP] Check Pods Manifest.lock */,
8D69E22221DD476D00CFA49B /* Sources */,
8D69E22321DD476D00CFA49B /* Frameworks */,
8D69E22421DD476D00CFA49B /* Resources */,
870284F7293CA07BAECE0B41 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -264,97 +235,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
65BB97B1C2E0ACB0370C903B /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FirebaseAnonymousAuthUI/Pods-FirebaseAnonymousAuthUI-resources.sh",
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAuthUI.bundle",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAuthUI.bundle",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseAnonymousAuthUI/Pods-FirebaseAnonymousAuthUI-resources.sh\"\n";
showEnvVarsInLog = 0;
};
714F08D4612B91126DDD4559 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-FirebaseAnonymousAuthUITests-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
870284F7293CA07BAECE0B41 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FirebaseAnonymousAuthUITests/Pods-FirebaseAnonymousAuthUITests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseAnonymousAuthUITests/Pods-FirebaseAnonymousAuthUITests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
F0D2BEDEEF9C146EA083E17F /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-FirebaseAnonymousAuthUI-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
8D69E21921DD476C00CFA49B /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -514,7 +394,6 @@
};
8D69E23221DD476D00CFA49B /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = AD655D2BC8125FCBFB69632A /* Pods-FirebaseAnonymousAuthUI.debug.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
Expand All @@ -538,7 +417,6 @@
};
8D69E23321DD476D00CFA49B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9929AABD790C0DD60C537CB2 /* Pods-FirebaseAnonymousAuthUI.release.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
Expand All @@ -562,14 +440,19 @@
};
8D69E23521DD476D00CFA49B /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C7E917677D16B9024969C4FE /* Pods-FirebaseAnonymousAuthUITests.debug.xcconfig */;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = FirebaseAnonymousAuthUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/OCMock\"",
);
OTHER_LDFLAGS = (
"-ObjC",
Expand All @@ -588,14 +471,19 @@
};
8D69E23621DD476D00CFA49B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 02807C8B4CFAB7FD9C32C1A3 /* Pods-FirebaseAnonymousAuthUITests.release.xcconfig */;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = FirebaseAnonymousAuthUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/OCMock\"",
);
OTHER_LDFLAGS = (
"-ObjC",
Expand Down
1 change: 1 addition & 0 deletions AnonymousAuth/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ platform :ios, '8.0'
target 'FirebaseAnonymousAuthUI' do
use_frameworks!

pod 'FirebaseAuth', '~> 6.0'
pod 'FirebaseUI/Auth', :path => '../'

target 'FirebaseAnonymousAuthUITests' do
Expand Down
60 changes: 37 additions & 23 deletions AnonymousAuth/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,29 +1,43 @@
PODS:
- Firebase/Auth (5.18.0):
- Firebase/Auth (6.1.0):
- Firebase/CoreOnly
- FirebaseAuth (= 5.4.0)
- Firebase/CoreOnly (5.18.0):
- FirebaseCore (= 5.3.1)
- FirebaseAuth (5.4.0):
- FirebaseAuth (~> 6.1.0)
- Firebase/CoreOnly (6.1.0):
- FirebaseCore (= 6.0.1)
- FirebaseAuth (6.1.0):
- FirebaseAuthInterop (~> 1.0)
- FirebaseCore (~> 5.2)
- GoogleUtilities/Environment (~> 5.2)
- FirebaseCore (~> 6.0)
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
- GoogleUtilities/Environment (~> 6.0)
- GTMSessionFetcher/Core (~> 1.1)
- FirebaseAuthInterop (1.0.0)
- FirebaseCore (5.3.1):
- GoogleUtilities/Logger (~> 5.2)
- FirebaseUI/Auth (6.2.1):
- Firebase/Auth (~> 5.4)
- FirebaseCore (6.0.1):
- GoogleUtilities/Environment (~> 6.0)
- GoogleUtilities/Logger (~> 6.0)
- FirebaseUI/Auth (7.0.0):
- Firebase/Auth (~> 6.0)
- GoogleUtilities/UserDefaults
- GoogleUtilities/Environment (5.4.0)
- GoogleUtilities/Logger (5.4.0):
- GoogleUtilities/AppDelegateSwizzler (6.2.0):
- GoogleUtilities/Environment
- GoogleUtilities/UserDefaults (5.4.0):
- GoogleUtilities/Logger
- GTMSessionFetcher/Core (1.2.1)
- GoogleUtilities/Network
- GoogleUtilities/Environment (6.2.0)
- GoogleUtilities/Logger (6.2.0):
- GoogleUtilities/Environment
- GoogleUtilities/Network (6.2.0):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (6.2.0)"
- GoogleUtilities/Reachability (6.2.0):
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (6.2.0):
- GoogleUtilities/Logger
- GTMSessionFetcher/Core (1.2.2)
- OCMock (3.4.3)

DEPENDENCIES:
- FirebaseAuth (~> 6.0)
- FirebaseUI/Auth (from `../`)
- OCMock

Expand All @@ -42,15 +56,15 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
Firebase: 02f3281965c075426141a0ce1277e9de6649cab9
FirebaseAuth: d85d052354447f30b4b2a805ab91b511458b56a6
Firebase: 8d77bb33624ae9b62d745d82ec023de5f70f7e4f
FirebaseAuth: 4281d6d98a90881e00710fa8d9e37c2ccdfc7d80
FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3
FirebaseUI: a2edbe63a90dff4a9ac715f4dd2869411528eedc
GoogleUtilities: fa768ad04b264be250ee9edf9f378ad006f7a560
GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
FirebaseCore: 66bdef3b310a026880e2a5bc8aa586ab62ce4543
FirebaseUI: f9367cd5cacde991d9bcce9278d3fcb858f84f6a
GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba
GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab

PODFILE CHECKSUM: ccc9aef49354c1762d5e773c9a26513b2b724d60
PODFILE CHECKSUM: dd5f618b7b3efad7d3eb9d842878ab03d443c8d4

COCOAPODS: 1.6.1
COCOAPODS: 1.7.0
Loading