Skip to content

Commit

Permalink
added back the Tests folder in EarlGrey or else we have build problems
Browse files Browse the repository at this point in the history
added clean-build script to delete EarlGrey dependencies to help troubleshoot build issues (resolves #16)
added support for multiple schemes (debug/release) (resolves #13)
  • Loading branch information
talkol committed Aug 7, 2016
1 parent 867bdfd commit 65f9eac
Show file tree
Hide file tree
Showing 176 changed files with 23,434 additions and 19 deletions.
1 change: 1 addition & 0 deletions INSTALLING.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,3 +215,4 @@ Coming soon...
* `node_modules/detox/ios/EarlGrey/OCHamcrest.framework`
* `node_modules/detox/ios/EarlGrey/fishhook`
* `node_modules/detox/ios/EarlGrey/Tests/UnitTests/ocmock`
* you can do this automatically by running `node ./node_modules/detox/scripts/clean-build.js` from your project root (where package.json is)
6 changes: 5 additions & 1 deletion detox/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
ios/EarlGrey/Demo
ios/EarlGrey/docs
ios/EarlGrey/Tests
ios/EarlGrey/OCHamcrest.framework
ios/EarlGrey/fishhook
ios/EarlGrey/Tests/UnitTests/ocmock
ios/EarlGrey/Tests/UnitTests/TestRig/Resources
ios/EarlGrey/Tests/FunctionalTests/TestRig/Resources

lib

Expand Down
8 changes: 6 additions & 2 deletions detox/.npmignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
test
ios/EarlGrey/Demo
ios/EarlGrey/docs
ios/EarlGrey/Tests
ios/EarlGrey/OCHamcrest.framework
ios/EarlGrey/fishhook
ios/EarlGrey/Tests/UnitTests/ocmock
ios/EarlGrey/Tests/UnitTests/TestRig/Resources
ios/EarlGrey/Tests/FunctionalTests/TestRig/Resources

build/
DerivedData/

Expand Down Expand Up @@ -221,4 +226,3 @@ buck-out/
\.buckd/
android/app/libs
android/keystores/debug.keystore

21 changes: 21 additions & 0 deletions detox/ios/EarlGrey/Tests/FunctionalTests/FunctionalTests.pch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//
// Copyright 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.
//

#ifdef __OBJC__
@import EarlGrey;
@import Foundation;
@import UIKit;
#endif

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FD387B401CA9C63900958AEE"
BuildableName = "EarlGreyFunctionalSwiftTests.xctest"
BlueprintName = "EarlGreyFunctionalSwiftTests"
ReferencedContainer = "container:FunctionalTests.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "NO">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FD5470F01BBDECBB000661FD"
BuildableName = "EarlGreyFunctionalTests.xctest"
BlueprintName = "EarlGreyFunctionalTests"
ReferencedContainer = "container:FunctionalTests.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<EnvironmentVariables>
<EnvironmentVariable
key = "DYLD_INSERT_LIBRARIES"
value = "@executable_path/EarlGrey.framework/EarlGrey"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading

0 comments on commit 65f9eac

Please sign in to comment.