From a47700eec2b8e6d9c046ece824398d68ad061b12 Mon Sep 17 00:00:00 2001 From: Justin Martin Date: Thu, 19 Sep 2024 15:22:32 -0700 Subject: [PATCH 1/6] Update CI config to run on Xcode 14.3.1 and 15.4 Configuring CI to run in 4 configurations: - xcode 14.3.1, iPad Air (5th generation), iOS 16.4 - xcode 14.3.1, iPhone 14, iOS 16.4 - xcode 15.4, iPad Air (5th generation), iOS 17.5 - xcode 15.4, iPhone 15, iOS 17.5 As part of this change, the CI script was updated to only run the extra validation of the examples folder one one of the 4 shards. This removes Carthage from the README as being officially supported. I'd guess that is generally not being used. The CI script hasn't worked since Xcode 12. --- .github/workflows/build.yml | 50 +++---------------- .travis.yml | 15 ------ .../Calculator.xcodeproj/project.pbxproj | 4 +- .../Testable Swift.xcodeproj/project.pbxproj | 4 +- .../Testable.xcodeproj/project.pbxproj | 4 +- Package.swift | 2 +- README.md | 2 +- Scripts/ci.sh | 41 +++++++++++++++ scripts/ci.sh | 49 ------------------ 9 files changed, 56 insertions(+), 115 deletions(-) delete mode 100644 .travis.yml create mode 100755 Scripts/ci.sh delete mode 100755 scripts/ci.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5153941ec..0086c1bb2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,13 +15,15 @@ jobs: - name: Validate podspec run: pod lib lint - build_xcode14: - runs-on: macos-12 + build_macos14: + runs-on: macos-14 strategy: matrix: run-config: - - { xcode_version: '14.1', simulator: 'name=iPad Pro (12.9-inch) (5th generation),OS=16.1' } - - { xcode_version: '14.1', simulator: 'name=iPhone SE (2nd generation),OS=16.1' } + - { xcode_version: '14.3.1', simulator: 'name=iPad Air (5th generation),OS=16.4', run_extra_validations: 'false' } + - { xcode_version: '14.3.1', simulator: 'name=iPhone 14,OS=16.4', run_extra_validations: 'false' } + - { xcode_version: '15.4', simulator: 'name=iPad Air (5th generation),OS=17.5', run_extra_validations: 'false' } + - { xcode_version: '15.4', simulator: 'name=iPhone 15,OS=17.5', run_extra_validations: 'true' } steps: - name: Checkout Project uses: actions/checkout@v1 @@ -51,42 +53,4 @@ jobs: run: xcrun simctl list - name: Build & Test - run: ./scripts/ci.sh "${{ matrix.run-config['simulator'] }}" - - build: - runs-on: macos-11 - strategy: - matrix: - run-config: - - { xcode_version: '13.0', simulator: 'name=iPhone SE (2nd generation),OS=15.0' } - - { xcode_version: '13.0', simulator: 'name=iPad Pro (12.9-inch) (5th generation),OS=15.0' } - steps: - - name: Checkout Project - uses: actions/checkout@v1 - - - name: Brew Update - run: brew update - - - name: Install Bundler - run: gem install bundler - - - name: Install Core Utils - run: if [ -z "$(brew ls --versions coreutils)" ] ; then brew install coreutils ; fi - - - name: Install XCPretty - run: gem install xcpretty --no-document --quiet - - - name: Show Xcode versions - run: ls -al /Applications/Xcode* - - - name: Select Xcode - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.run-config['xcode_version'] }}.app - - - name: Current Xcode Selected - run: xcode-select -p - - - name: List Simulators - run: xcrun simctl list - - - name: Build & Test - run: ./scripts/ci.sh "${{ matrix.run-config['simulator'] }}" + run: ./scripts/ci.sh "${{ matrix.run-config['simulator'] }}" "${{ matrix.run-config['run_extra_validations'] }}" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 423a97921..000000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -language: objective-c -matrix: - include: - - osx_image: xcode11.6 - env: 'SIMULATOR="name=iPad Pro (12.9-inch) (2nd generation),OS=11.4"' - -before_install: - - xcrun simctl list - - brew update || brew update - - gem install bundler -install: - - if [ -z "$(brew ls --versions coreutils)" ] ; then brew install coreutils ; fi - - gem install xcpretty --no-document --quiet -script: - - ./scripts/ci.sh "${SIMULATOR}" diff --git a/Documentation/Examples/Calculator/Calculator.xcodeproj/project.pbxproj b/Documentation/Examples/Calculator/Calculator.xcodeproj/project.pbxproj index ba0e116b4..9a76c982b 100644 --- a/Documentation/Examples/Calculator/Calculator.xcodeproj/project.pbxproj +++ b/Documentation/Examples/Calculator/Calculator.xcodeproj/project.pbxproj @@ -579,7 +579,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -621,7 +621,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/project.pbxproj b/Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/project.pbxproj index 25aad4963..7cef8ab3e 100644 --- a/Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/project.pbxproj +++ b/Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/project.pbxproj @@ -442,7 +442,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -489,7 +489,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; diff --git a/Documentation/Examples/Testable/Testable.xcodeproj/project.pbxproj b/Documentation/Examples/Testable/Testable.xcodeproj/project.pbxproj index 9b9c53d3c..0a77225f1 100644 --- a/Documentation/Examples/Testable/Testable.xcodeproj/project.pbxproj +++ b/Documentation/Examples/Testable/Testable.xcodeproj/project.pbxproj @@ -570,7 +570,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -607,7 +607,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; }; diff --git a/Package.swift b/Package.swift index 7fc84d6d9..5f379b6b5 100644 --- a/Package.swift +++ b/Package.swift @@ -26,7 +26,7 @@ let package = Package( .headerSearchPath("Visualizer/"), .headerSearchPath("IdentifierTests/"), ], - linkerSettings: [.linkedFramework("IOKit")] + linkerSettings: [.linkedFramework("IOKit"), .linkedFramework("XCTest")] ), .testTarget( name: "KIFTests", diff --git a/README.md b/README.md index 197ff00c2..e7888f77c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/kif-framework/KIF.svg?branch=master)](https://travis-ci.org/kif-framework/KIF) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![CocoaPod Version](https://img.shields.io/cocoapods/v/KIF.svg?style=flat)](https://cocoapods.org) +[![Build Status](https://travis-ci.org/kif-framework/KIF.svg?branch=master)](https://travis-ci.org/kif-framework/KIF) [![CocoaPod Version](https://img.shields.io/cocoapods/v/KIF.svg?style=flat)](https://cocoapods.org) **IMPORTANT! Even though KIF is used to test your UI, you need to add it to your Unit Test target, _not_ your UI Test target. The magic of KIF is that it allows you to drive your UI from your unit tests and reap all the advantages of testing in-process.** diff --git a/Scripts/ci.sh b/Scripts/ci.sh new file mode 100755 index 000000000..60ba18675 --- /dev/null +++ b/Scripts/ci.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +set -o xtrace +set -o errexit +set -o pipefail + +SIMULATOR=$1 +RUN_EXTRA_VALIDATIONS=$2 + +if [ -z "${SIMULATOR}" ]; then + echo 'Must supply a simulator description in the form of "name=iPad Air,OS=9.2"' + exit 1 +fi + +rm -rf ${PWD}/build + +# Run KIF tests (linking KIF as a Static Library) +env NSUnbufferedIO=YES xcodebuild test -project KIF.xcodeproj -scheme KIF -derivedDataPath=${PWD}/build/KIF -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c + +if [ $RUN_EXTRA_VALIDATIONS != "true" ]; then + exit 0 +fi + +# Consume KIF as a Dynamic Framework +env NSUnbufferedIO=YES xcodebuild test -project KIF.xcodeproj -derivedDataPath=${PWD}/build/KIFFramework -scheme KIFFrameworkConsumerTests -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c + +# Compile the KIF SPM package directly +swift build -Xcc "-isysroot" -Xcc "$(xcrun --sdk iphonesimulator --show-sdk-path)" -Xcc "-target" -Xcc "x86_64-apple-ios$(xcrun --sdk iphonesimulator --show-sdk-version)-simulator" + +# Consume KIF via Swift Package Manager in an Xcode project +env NSUnbufferedIO=YES xcodebuild test -project "SPMIntegration/SPMIntegration.xcodeproj" -scheme "SPMIntegration" -derivedDataPath=${PWD}/build/SPMIntegration -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c + +# Test the "Testable" example project +env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/Testable/Testable.xcodeproj" -scheme Testable -derivedDataPath=${PWD}/build/Testable -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c + +# Test the "Testable Swift" example project +env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/Testable Swift/Testable Swift.xcodeproj" -scheme "Testable Swift" -derivedDataPath=${PWD}/build/TestableSwift -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c + +# Test the "Calculator" example project +env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/Calculator/Calculator.xcodeproj" -scheme "Calculator" -derivedDataPath=${PWD}/build/Calculator -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c + diff --git a/scripts/ci.sh b/scripts/ci.sh deleted file mode 100755 index ea6b64e23..000000000 --- a/scripts/ci.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash - -set -o xtrace -set -o errexit -set -o pipefail - -SIMULATOR=$1 - -function xcode_major() { - if [ -z $XCODE_MAJOR ]; then - XCODE_MAJOR=`xcodebuild -version | head -n1 | sed -e "s/Xcode //" | cut -d '.' -f1` - fi - echo "$XCODE_MAJOR" -} - -function is_xcode_version_above() { - if [[ `xcode_major` -ge $1 ]]; then - return 0 - else - return 1 - fi -} - -if [ -z "${SIMULATOR}" ]; then - echo 'Must supply a simulator description in the form of "name=iPad Air,OS=9.2"' - exit 1 -fi - -rm -rf ${PWD}/build - -env NSUnbufferedIO=YES xcodebuild test -project KIF.xcodeproj -derivedDataPath=${PWD}/build/KIFFramework -scheme KIFFrameworkConsumerTests -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c -env NSUnbufferedIO=YES xcodebuild test -project KIF.xcodeproj -scheme KIF -derivedDataPath=${PWD}/build/KIF -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c - -# Due to unstable Swift language syntax, this only compiles on Xcode 8+ -if is_xcode_version_above 11; then - env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/Testable Swift/Testable Swift.xcodeproj" -scheme "Testable Swift" -derivedDataPath=${PWD}/build/TestableSwift -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c - env NSUnbufferedIO=YES xcodebuild test -project "SPMIntegration/SPMIntegration.xcodeproj" -scheme "SPMIntegration" -derivedDataPath=${PWD}/build/SPMIntegration -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c -fi - -env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/Testable/Testable.xcodeproj" -scheme Testable -derivedDataPath=${PWD}/build/Testable -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c -# For some reason, attempting to run the Calculator tests on Xcode 7 causes a frequent crash in CI -env NSUnbufferedIO=YES xcodebuild build -project "Documentation/Examples/Calculator/Calculator.xcodeproj" -scheme "Calculator" -derivedDataPath=${PWD}/build/Calculator -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c - -if ! is_xcode_version_above 12 ; then # see https://github.com/Carthage/Carthage/issues/3019 for Xcode 12 support - carthage build --no-skip-current - carthage archive KIF -fi - -swift build -Xcc "-isysroot" -Xcc "$(xcrun --sdk iphonesimulator --show-sdk-path)" -Xcc "-target" -Xcc "x86_64-apple-ios$(xcrun --sdk iphonesimulator --show-sdk-version)-simulator" From 1550322808d6e86056ccdabc1957de82f85f674c Mon Sep 17 00:00:00 2001 From: Justin Martin Date: Wed, 7 Aug 2024 23:21:13 -0700 Subject: [PATCH 2/6] Address flaky tests in new CI configuration * AccessibilityIdentifierTests tests Fix `testEnteringTextIntoViewWithAccessibilityIdentifier` flaking We're trying to tap on `Select All` while it is still being animated into view. The problem is two-fold: 1. The `longPress` action doesn't wait for animations to complete, it just uses a hardcoded .5s before starting the next action. 2. Even after switching to use `waitForAnimationsToFinish`, the timeout defaults to .5s as the max to wait for animations to complete. To fix this, I switched `longPress` action to use `waitForAnimationsToFinish` and I upped the default timeout to wait up to 2s for animations to complete. This seems to work much more reliably now. * SystemTests.testMockingOpenURL NSURL no longer parses '423543523454://', use a different protocol that starts with characters * ExistTests Wait a bit longer for the view controller presentation to complete * TypingTests In TapViewController, avoid race condition in resigning first responder and becoming first responder. CI was flaking with a failure where "Deleted something., world" was found in the greeting text field. * PullToRefreshTests Leverage 'usingCurrentFrame' so we're not scrolling the table view around while the UIRefreshControl is spinning, which immediately halts the refresh spinner. Also, make sure that we're scrolled to the top of the test suite VC, as otherwise the pull to refresh action might fail. --- ...ccessibilityIdentifierPullToRefreshTests.m | 41 +++++++++++-------- KIF Tests/AccessibilityIdentifierTests.m | 1 + KIF Tests/ExistTests.m | 12 ++---- KIF Tests/ExistTests_ViewTestActor.m | 16 +++----- KIF Tests/PullToRefreshTests.m | 38 ++++++++++------- KIF Tests/PullToRefreshTests_ViewTestActor.m | 30 +++++++++----- KIF Tests/SystemTests.m | 2 +- Test Host/CustomPickerController.m | 6 +++ Test Host/TapViewController.m | 4 +- Test Host/TestSuiteViewController.m | 15 ++++--- 10 files changed, 96 insertions(+), 69 deletions(-) diff --git a/KIF Tests/AccessibilityIdentifierPullToRefreshTests.m b/KIF Tests/AccessibilityIdentifierPullToRefreshTests.m index fac2ab30a..b578f4046 100644 --- a/KIF Tests/AccessibilityIdentifierPullToRefreshTests.m +++ b/KIF Tests/AccessibilityIdentifierPullToRefreshTests.m @@ -8,6 +8,8 @@ #import #import +#import + #import @interface AccessibilityIdentifierPullToRefreshTests : KIFTestCase @@ -15,31 +17,34 @@ @interface AccessibilityIdentifierPullToRefreshTests : KIFTestCase @implementation AccessibilityIdentifierPullToRefreshTests --(void) testPullToRefreshByAccessibilityIdentifier +- (void)beforeAll { - UITableView *tableView; - [tester waitForAccessibilityElement:NULL view:&tableView withIdentifier:@"Test Suite TableView" tappable:NO]; - - [tester tapViewWithAccessibilityLabel:@"Reset Refresh Control"]; - [tester pullToRefreshViewWithAccessibilityIdentifier:@"Test Suite TableView"]; - [tester waitForViewWithAccessibilityLabel:@"Bingo!"]; - [tester waitForAbsenceOfViewWithAccessibilityLabel:@"Bingo!"]; + // Ensure that we've scrolled the TestSuite VC back to the top + [tester waitForViewWithAccessibilityLabel:@"Tapping"]; } --(void) testPullToRefreshByAccessibilityIdentifierWithDuration +- (void)testPullToRefreshByAccessibilityIdentifier { - UITableView *tableView; - [tester waitForAccessibilityElement:NULL view:&tableView withIdentifier:@"Test Suite TableView" tappable:NO]; - - [tester tapViewWithAccessibilityLabel:@"Reset Refresh Control"]; - [tester pullToRefreshViewWithAccessibilityIdentifier:@"Test Suite TableView" pullDownDuration:KIFPullToRefreshInAboutThreeSeconds]; - [tester waitForViewWithAccessibilityLabel:@"Bingo!"]; - [tester waitForAbsenceOfViewWithAccessibilityLabel:@"Bingo!"]; + [tester waitForViewWithAccessibilityIdentifier:@"Test Suite TableView"]; + [tester pullToRefreshViewWithAccessibilityIdentifier:@"Test Suite TableView"]; + + // Implicit scrolling of the table view when searching the view hierarchy is causing "Bingo!" to disappear. + // Hacky to use viewTester here, but the alternative would be to expose + // `usingCurrentFrame` functionality on the legacy `tester` API. + [[[viewTester usingCurrentFrame] usingLabel:@"Bingo!"] waitForView]; + [[[viewTester usingCurrentFrame] usingLabel:@"Bingo!"] waitForAbsenceOfView]; } -- (void)afterEach +- (void)testPullToRefreshByAccessibilityIdentifierWithDuration { - [tester waitForAnimationsToFinish]; + [tester waitForViewWithAccessibilityIdentifier:@"Test Suite TableView"]; + [tester pullToRefreshViewWithAccessibilityIdentifier:@"Test Suite TableView" pullDownDuration:KIFPullToRefreshInAboutAHalfSecond]; + + // Implicit scrolling of the table view when searching the view hierarchy is causing "Bingo!" to disappear. + // Hacky to use viewTester here, but the alternative would be to expose + // `usingCurrentFrame` functionality on the legacy `tester` API. + [[[viewTester usingCurrentFrame] usingLabel:@"Bingo!"] waitForView]; + [[[viewTester usingCurrentFrame] usingLabel:@"Bingo!"] waitForAbsenceOfView]; } @end diff --git a/KIF Tests/AccessibilityIdentifierTests.m b/KIF Tests/AccessibilityIdentifierTests.m index 7201e20b6..b3ff04329 100644 --- a/KIF Tests/AccessibilityIdentifierTests.m +++ b/KIF Tests/AccessibilityIdentifierTests.m @@ -57,6 +57,7 @@ - (void)testEnteringTextIntoViewWithAccessibilityIdentifier { [tester tapViewWithAccessibilityIdentifier:@"idGreeting"]; [tester longPressViewWithAccessibilityIdentifier:@"idGreeting" duration:2]; + [tester waitForAnimationsToFinish]; [tester tapViewWithAccessibilityLabel:@"Select All"]; [tester tapViewWithAccessibilityLabel:@"Cut"]; [tester enterText:@"Yo" intoViewWithAccessibilityIdentifier:@"idGreeting"]; diff --git a/KIF Tests/ExistTests.m b/KIF Tests/ExistTests.m index 9e911bd9f..3924a2d99 100644 --- a/KIF Tests/ExistTests.m +++ b/KIF Tests/ExistTests.m @@ -13,16 +13,10 @@ @interface ExistTests : KIFTestCase @implementation ExistTests -- (void)beforeAll; -{ - [super beforeAll]; - - // If a previous test was still in the process of navigating back to the main view, let that complete before starting this test - [tester waitForAnimationsToFinish]; -} - - (void)testExistsViewWithAccessibilityLabel { + // If a previous test was still in the process of navigating back to the main view, let that complete before starting this test. + [tester waitForAnimationsToFinishWithTimeout:5.0 stabilizationTime:0.0]; BOOL tappingFound = [tester tryFindingTappableViewWithAccessibilityLabel:@"Tapping" error:NULL]; BOOL testSuiteFound = [tester tryFindingTappableViewWithAccessibilityLabel:@"Test Suite" traits:UIAccessibilityTraitButton error:NULL]; if (tappingFound && !testSuiteFound) { @@ -31,6 +25,8 @@ - (void)testExistsViewWithAccessibilityLabel [tester fail]; } + // This test will fail if the view controller hasn't fully finished animating in, so wait for that first. + [tester waitForAnimationsToFinishWithTimeout:5.0 stabilizationTime:0.0]; tappingFound = [tester tryFindingTappableViewWithAccessibilityLabel:@"Tapping" error:NULL]; testSuiteFound = [tester tryFindingTappableViewWithAccessibilityLabel:@"Test Suite" traits:UIAccessibilityTraitButton error:NULL]; if (testSuiteFound && !tappingFound) { diff --git a/KIF Tests/ExistTests_ViewTestActor.m b/KIF Tests/ExistTests_ViewTestActor.m index e9f83c0b7..d4748031b 100644 --- a/KIF Tests/ExistTests_ViewTestActor.m +++ b/KIF Tests/ExistTests_ViewTestActor.m @@ -14,24 +14,20 @@ @interface ExistTests_ViewTestActor : KIFTestCase @implementation ExistTests_ViewTestActor -- (void)beforeAll; -{ - [super beforeAll]; - - // If a previous test was still in the process of navigating back to the main view, let that complete before starting this test - [tester waitForAnimationsToFinish]; -} - - (void)testExistsViewWithAccessibilityLabel { + // If a previous test was still in the process of navigating back to the main view, let that complete before starting this test. + [[[viewTester usingAnimationWaitingTimeout:5.0] usingAnimationStabilizationTimeout:0.0] waitForAnimationsToFinish]; + if ([[viewTester usingLabel:@"Tapping"] tryFindingTappableView] && ![[[viewTester usingLabel:@"Test Suite"] usingTraits:UIAccessibilityTraitButton] tryFindingTappableView]) { - [[viewTester usingLabel:@"Tapping"] tap]; + // This test will fail if the view controller hasn't fully finished animating in, so give it a lot of time to complete the animation. + [[[viewTester usingLabel:@"Tapping"] usingAnimationWaitingTimeout:5.0] tap]; } else { [viewTester fail]; } if ([[viewTester usingLabel:@"Test Suite"] tryFindingTappableView] && ![[viewTester usingLabel:@"Tapping"] tryFindingTappableView]) { - [[[viewTester usingLabel:@"Test Suite"] usingTraits:UIAccessibilityTraitButton] tap]; + [[[[viewTester usingLabel:@"Test Suite"] usingAnimationWaitingTimeout:5.0] usingTraits:UIAccessibilityTraitButton] tap]; } else { [viewTester fail]; } diff --git a/KIF Tests/PullToRefreshTests.m b/KIF Tests/PullToRefreshTests.m index 67f350d6b..1f763843b 100644 --- a/KIF Tests/PullToRefreshTests.m +++ b/KIF Tests/PullToRefreshTests.m @@ -8,6 +8,7 @@ #import #import +#import #import @interface PullToRefreshTests : KIFTestCase @@ -15,30 +16,39 @@ @interface PullToRefreshTests : KIFTestCase @implementation PullToRefreshTests --(void) testPullToRefreshByAccessibilityLabelWithDuration +- (void)beforeAll { - UITableView *tableView; - [tester waitForAccessibilityElement:NULL view:&tableView withIdentifier:@"Test Suite TableView" tappable:NO]; - - [tester pullToRefreshViewWithAccessibilityLabel:@"Table View" pullDownDuration:KIFPullToRefreshInAboutThreeSeconds]; - [tester waitForViewWithAccessibilityLabel:@"Bingo!"]; - [tester waitForAbsenceOfViewWithAccessibilityLabel:@"Bingo!"]; + // Ensure that we've scrolled the TestSuite VC back to the top + [tester waitForViewWithAccessibilityLabel:@"Tapping"]; +} - [tester waitForTimeInterval:5.0f]; //make sure the PTR is finished. +- (void)testPullToRefreshByAccessibilityLabelWithDuration +{ + [tester waitForViewWithAccessibilityIdentifier:@"Test Suite TableView"]; + [tester pullToRefreshViewWithAccessibilityLabel:@"Table View" pullDownDuration:KIFPullToRefreshInAboutAHalfSecond]; + + // Implicit scrolling of the table view when searching the view hierarchy is causing "Bingo!" to disappear. + // Hacky to use viewTester here, but the alternative would be to expose + // `usingCurrentFrame` functionality on the legacy `tester` API. + [[[viewTester usingCurrentFrame] usingLabel:@"Bingo!"] waitForView]; + [[[viewTester usingCurrentFrame] usingLabel:@"Bingo!"] waitForAbsenceOfView]; } --(void) testPullToRefreshWithBigContentSize +- (void)testPullToRefreshWithBigContentSize { UITableView *tableView; [tester waitForAccessibilityElement:NULL view:&tableView withIdentifier:@"Test Suite TableView" tappable:NO]; CGSize originalSize = tableView.contentSize; tableView.contentSize = CGSizeMake(1000, 10000); - [tester pullToRefreshViewWithAccessibilityLabel:@"Table View" pullDownDuration:KIFPullToRefreshInAboutThreeSeconds]; - [tester waitForViewWithAccessibilityLabel:@"Bingo!"]; - [tester waitForAbsenceOfViewWithAccessibilityLabel:@"Bingo!"]; - - [tester waitForTimeInterval:5.0f]; //make sure the PTR is finished. + [tester pullToRefreshViewWithAccessibilityLabel:@"Table View" pullDownDuration:KIFPullToRefreshInAboutAHalfSecond]; + + // Implicit scrolling of the table view when searching the view hierarchy is causing "Bingo!" to disappear. + // Hacky to use viewTester here, but the alternative would be to expose + // `usingCurrentFrame` functionality on the legacy `tester` API. + [[[viewTester usingCurrentFrame] usingLabel:@"Bingo!"] waitForView]; + [[[viewTester usingCurrentFrame] usingLabel:@"Bingo!"] waitForAbsenceOfView]; + tableView.contentSize = originalSize; } diff --git a/KIF Tests/PullToRefreshTests_ViewTestActor.m b/KIF Tests/PullToRefreshTests_ViewTestActor.m index 6882d1075..e8ad4808b 100644 --- a/KIF Tests/PullToRefreshTests_ViewTestActor.m +++ b/KIF Tests/PullToRefreshTests_ViewTestActor.m @@ -15,27 +15,35 @@ @interface PullToRefreshTests_ViewTestActor : KIFTestCase @implementation PullToRefreshTests_ViewTestActor --(void) testPullToRefreshByAccessibilityLabelWithDuration +- (void)beforeAll +{ + // Ensure that we've scrolled the TestSuite VC back to the top + [tester waitForViewWithAccessibilityLabel:@"Tapping"]; +} + +- (void)testPullToRefreshByAccessibilityLabelWithDuration { [[viewTester usingIdentifier:@"Test Suite TableView"] waitForView]; - [[viewTester usingLabel:@"Table View"] pullToRefreshWithDuration:KIFPullToRefreshInAboutOneSecond]; - [[viewTester usingLabel:@"Bingo!"] waitForView]; - [[viewTester usingLabel:@"Bingo!"] waitForAbsenceOfView]; - [viewTester waitForTimeInterval:1.0f]; + [[viewTester usingLabel:@"Table View"] pullToRefreshWithDuration:KIFPullToRefreshInAboutAHalfSecond]; + + // Implicit scrolling of the table view when searching the view hierarchy is causing "Bingo!" to disappear. + [[[viewTester usingCurrentFrame] usingLabel:@"Bingo!"] waitForView]; + [[[viewTester usingCurrentFrame] usingLabel:@"Bingo!"] waitForAbsenceOfView]; } --(void) testPullToRefreshWithBigContentSize +- (void)testPullToRefreshWithBigContentSize { UITableView *tableView = (id)[[viewTester usingIdentifier:@"Test Suite TableView"] waitForView]; CGSize originalSize = tableView.contentSize; tableView.contentSize = CGSizeMake(1000, 10000); - [[viewTester usingLabel:@"Table View"] pullToRefreshWithDuration:KIFPullToRefreshInAboutOneSecond]; - [[viewTester usingLabel:@"Bingo!"] waitForView]; - [[viewTester usingLabel:@"Bingo!"] waitForAbsenceOfView]; - [viewTester waitForTimeInterval:1.0f]; - + [[viewTester usingLabel:@"Table View"] pullToRefreshWithDuration:KIFPullToRefreshInAboutAHalfSecond]; + + // Implicit scrolling of the table view when searching the view hierarchy is causing "Bingo!" to disappear. + [[[viewTester usingCurrentFrame] usingLabel:@"Bingo!"] waitForView]; + [[[viewTester usingCurrentFrame] usingLabel:@"Bingo!"] waitForAbsenceOfView]; + tableView.contentSize = originalSize; } diff --git a/KIF Tests/SystemTests.m b/KIF Tests/SystemTests.m index 9973261c5..46439dbc2 100644 --- a/KIF Tests/SystemTests.m +++ b/KIF Tests/SystemTests.m @@ -87,7 +87,7 @@ - (void)testMockingOpenURL KIFAssertEqual(YES, canOpenURLReturnValue, @"canOpenURL: should have returned YES"); [system waitForApplicationToOpenAnyURLWhileExecutingBlock:^{ - NSURL *someURL = [NSURL URLWithString:@"423543523454://"]; + NSURL *someURL = [NSURL URLWithString:@"test12345://"]; canOpenURLReturnValue = [[UIApplication sharedApplication] canOpenURL:someURL]; [[UIApplication sharedApplication] openURL:someURL options:[NSDictionary dictionary] completionHandler:nil]; } returning:YES]; diff --git a/Test Host/CustomPickerController.m b/Test Host/CustomPickerController.m index 520759704..ff2b4464d 100644 --- a/Test Host/CustomPickerController.m +++ b/Test Host/CustomPickerController.m @@ -212,4 +212,10 @@ - (void)viewDidLoad textTitleSelectionTextField.accessibilityLabel = @"Text Title Selection"; } +- (void)viewWillDisappear:(BOOL)animated +{ + [self.view endEditing:YES]; + [super viewWillDisappear:animated]; +} + @end diff --git a/Test Host/TapViewController.m b/Test Host/TapViewController.m index ad087637e..1ed1c42a6 100644 --- a/Test Host/TapViewController.m +++ b/Test Host/TapViewController.m @@ -78,10 +78,10 @@ - (void)dealloc - (BOOL)textFieldShouldReturn:(UITextField *)textField { - [textField resignFirstResponder]; - if (textField == self.otherTextField) { [self.greetingTextField becomeFirstResponder]; + } else { + [textField resignFirstResponder]; } return NO; } diff --git a/Test Host/TestSuiteViewController.m b/Test Host/TestSuiteViewController.m index 5a9471727..11ca1cbf9 100644 --- a/Test Host/TestSuiteViewController.m +++ b/Test Host/TestSuiteViewController.m @@ -8,12 +8,13 @@ #import + @interface TestSuiteViewController : UITableViewController @end @implementation TestSuiteViewController --(void) viewDidLoad +- (void)viewDidLoad { [super viewDidLoad]; @@ -30,7 +31,7 @@ - (void)dealloc [[NSNotificationCenter defaultCenter] removeObserver:self]; } -- (void) setupRefreshControl +- (void)setupRefreshControl { self.refreshControl = [[UIRefreshControl alloc] init]; self.refreshControl.backgroundColor = [UIColor grayColor]; @@ -120,10 +121,14 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath -(void)pullToRefreshHandler { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ self.refreshControl.attributedTitle = [[NSAttributedString alloc] initWithString:NSLocalizedString(@"Bingo!", @"") attributes:nil]; - [self.refreshControl endRefreshing]; - [self.tableView setContentOffset:CGPointZero animated:YES]; + + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [self.refreshControl endRefreshing]; + [self resetRefreshControl]; + [self.tableView setContentOffset:CGPointZero animated:YES]; + }); }); } From 424ed5fdaee10fea76914c0e3e0c3608bf954ce9 Mon Sep 17 00:00:00 2001 From: Justin Martin Date: Thu, 19 Sep 2024 15:35:01 -0700 Subject: [PATCH 3/6] Up the default animation waiting timeout from .5s to 2s It doesn't really make sense that the default animation wait time is the same as the stabilization time. This effectively means the behavior of scanning the UI hierarchy for animations in progress is never utilized for most tests out of the box. For what its worth, we've used a 2s animation wait time and .1s stabilization time as our defaults for a very long time. This should generally not slow down any tests if there weren't any animations in progress. If there were animations in progress, this is probably a worthwhile tradeoff to make things more reliable. This can still be configured globally to be overidden. As part of this change, use `waitForAnimationsToFinish` in place of a static .5s sleep for the `longPress` action. There will be a followup PR #1301 that should speed up some scenarios where we're waiting longer than desired for animations to complete. --- Sources/KIF/Classes/KIFTestActor.m | 2 +- Sources/KIF/Classes/KIFUITestActor.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/KIF/Classes/KIFTestActor.m b/Sources/KIF/Classes/KIFTestActor.m index ad6dfa12e..79325e5d9 100644 --- a/Sources/KIF/Classes/KIFTestActor.m +++ b/Sources/KIF/Classes/KIFTestActor.m @@ -131,7 +131,7 @@ - (void)runBlock:(KIFTestExecutionBlock)executionBlock #pragma mark Class Methods -static NSTimeInterval KIFTestStepDefaultAnimationWaitingTimeout = 0.5; +static NSTimeInterval KIFTestStepDefaultAnimationWaitingTimeout = 2.0; static NSTimeInterval KIFTestStepDefaultAnimationStabilizationTimeout = 0.5; static NSTimeInterval KIFTestStepDefaultMainThreadDispatchStabilizationTimeout = 0.5; static NSTimeInterval KIFTestStepDefaultTimeout = 10.0; diff --git a/Sources/KIF/Classes/KIFUITestActor.m b/Sources/KIF/Classes/KIFUITestActor.m index 08c4ad4af..4306dca59 100644 --- a/Sources/KIF/Classes/KIFUITestActor.m +++ b/Sources/KIF/Classes/KIFUITestActor.m @@ -467,7 +467,7 @@ - (void)longPressAccessibilityElement:(UIAccessibilityElement *)element inView:( }]; // Wait for view to settle. - [self waitForTimeInterval:0.5 relativeToAnimationSpeed:YES]; + [self waitForAnimationsToFinish]; } - (void)waitForKeyboard From 0dca5ba26a2fd126d983f247f70d2b0cbf72ab19 Mon Sep 17 00:00:00 2001 From: Justin Martin Date: Thu, 19 Sep 2024 15:43:22 -0700 Subject: [PATCH 4/6] Tweak pullToRefresh to be more realistic Have the pullToRefresh action pull from 25% of the way down the element to 75% of the way down, instead of pulling from the center and pulling a full height of the element --- Sources/KIF/Classes/KIFUITestActor.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Sources/KIF/Classes/KIFUITestActor.m b/Sources/KIF/Classes/KIFUITestActor.m index 4306dca59..e28fae7e4 100644 --- a/Sources/KIF/Classes/KIFUITestActor.m +++ b/Sources/KIF/Classes/KIFUITestActor.m @@ -1335,7 +1335,8 @@ - (void)pullToRefreshAccessibilityElement:(UIAccessibilityElement *)element inVi // Can handle only the touchable space. CGRect elementFrame = [viewToSwipe convertRect:viewToSwipe.bounds toView:[UIApplication sharedApplication].keyWindow.rootViewController.view]; CGPoint swipeStart = CGPointCenteredInRect(elementFrame); - CGPoint swipeDisplacement = CGPointMake(CGRectGetMidX(elementFrame), CGRectGetMaxY(elementFrame)); + swipeStart.y = swipeStart.y - CGRectGetMaxY(elementFrame) / 4.0; + CGPoint swipeDisplacement = CGPointMake(0, CGRectGetMaxY(elementFrame) / 2.0); [viewToSwipe dragFromPoint:swipeStart displacement:swipeDisplacement steps:kNumberOfPointsInSwipePath]; } From b45a3d883f199e1500a8d1f126bc15ac02ee7644 Mon Sep 17 00:00:00 2001 From: Justin Martin Date: Wed, 18 Sep 2024 22:05:15 -0700 Subject: [PATCH 5/6] Get SPM, Calculator, TestableSwift example projects passing again This removes the `KIFFramework` target and its consumer tests. They don't interop well with the way that angle and quote imports work in SPM. More info: https://joesusnick.medium.com/swift-package-manager-with-a-mixed-swift-and-objective-c-project-part-2-2-e71dad234e6 Took this opportunity to remove the spaces in the target names for the 'Testable Swift' target, in case that was causing issues somewhere. --- Default-568h@2x.png | Bin 18594 -> 0 bytes .../Acceptance Tests/BasicCalculatorRobot.m | 2 +- .../Calculator/Acceptance Tests/TestRobot.m | 2 +- .../Calculator.xcodeproj/project.pbxproj | 155 +--- .../BasicCalculatorViewController.m | 27 +- .../SPMIntegration.xcodeproj/project.pbxproj | 6 +- .../xcschemes/SPMIntegration.xcscheme | 97 ++ .../SPMIntegration/SPMIntegration.xctestplan | 24 + .../SPMIntegration/AppDelegate.swift | 0 .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 .../Base.lproj/LaunchScreen.storyboard | 0 .../SPMIntegration/Base.lproj/Main.storyboard | 0 .../SPMIntegration}/SPMIntegration/Info.plist | 0 .../SPMIntegration/ViewController.swift | 0 .../SPMIntegrationTests/Info.plist | 0 .../SPMIntegrationTests.swift | 0 .../Testable.xcodeproj/project.pbxproj | 102 +-- .../TestableSwift.xcodeproj}/project.pbxproj | 242 ++--- .../xcschemes/TestableSwift.xcscheme} | 69 +- .../TestableSwift}/AppDelegate.swift | 0 .../Base.lproj/LaunchScreen.xib | 0 .../TestableSwift}/Base.lproj/Main.storyboard | 0 .../AppIcon.appiconset/Contents.json | 0 .../Images.xcassets/Contents.json | 0 .../TestableSwift}/Info.plist | 0 .../TestableSwift}/MasterViewController.swift | 0 .../TestableSwiftTests}/Info.plist | 0 .../TestableSwiftTests}/SimpleObjCTest.m | 2 +- .../TestableSwiftTests}/SimpleSwiftTest.swift | 0 .../TestableSwiftTests-Bridging-Header.h} | 2 +- .../Testable_SwiftTests.swift | 0 KIF.xcodeproj/project.pbxproj | 844 ------------------ .../xcschemes/KIF Documentation.xcscheme | 4 - .../KIFFrameworkConsumerTests.xcscheme | 56 -- KIFFramework/Info.plist | 26 - KIFFramework/KIF.h | 48 - KIFFrameworkConsumer/AppDelegate.h | 17 - KIFFrameworkConsumer/AppDelegate.m | 45 - .../AppIcon.appiconset/Contents.json | 53 -- .../Base.lproj/Main.storyboard | 47 - KIFFrameworkConsumer/Info.plist | 38 - KIFFrameworkConsumer/ViewController.h | 15 - KIFFrameworkConsumer/ViewController.m | 31 - KIFFrameworkConsumer/main.m | 16 - KIFFrameworkConsumerTests/Info.plist | 24 - .../KIFFrameworkConsumerTests.m | 26 - Scripts/ci.sh | 11 +- 49 files changed, 311 insertions(+), 1720 deletions(-) delete mode 100644 Default-568h@2x.png rename {SPMIntegration => Documentation/Examples/SPMIntegration}/SPMIntegration.xcodeproj/project.pbxproj (98%) create mode 100644 Documentation/Examples/SPMIntegration/SPMIntegration.xcodeproj/xcshareddata/xcschemes/SPMIntegration.xcscheme create mode 100644 Documentation/Examples/SPMIntegration/SPMIntegration.xctestplan rename {SPMIntegration => Documentation/Examples/SPMIntegration}/SPMIntegration/AppDelegate.swift (100%) rename {SPMIntegration => Documentation/Examples/SPMIntegration}/SPMIntegration/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename {SPMIntegration => Documentation/Examples/SPMIntegration}/SPMIntegration/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {SPMIntegration => Documentation/Examples/SPMIntegration}/SPMIntegration/Assets.xcassets/Contents.json (100%) rename {SPMIntegration => Documentation/Examples/SPMIntegration}/SPMIntegration/Base.lproj/LaunchScreen.storyboard (100%) rename {SPMIntegration => Documentation/Examples/SPMIntegration}/SPMIntegration/Base.lproj/Main.storyboard (100%) rename {SPMIntegration => Documentation/Examples/SPMIntegration}/SPMIntegration/Info.plist (100%) rename {SPMIntegration => Documentation/Examples/SPMIntegration}/SPMIntegration/ViewController.swift (100%) rename {SPMIntegration => Documentation/Examples/SPMIntegration}/SPMIntegrationTests/Info.plist (100%) rename {SPMIntegration => Documentation/Examples/SPMIntegration}/SPMIntegrationTests/SPMIntegrationTests.swift (100%) rename Documentation/Examples/{Testable Swift/Testable Swift.xcodeproj => TestableSwift/TestableSwift.xcodeproj}/project.pbxproj (67%) rename Documentation/Examples/{Testable Swift/Testable Swift.xcodeproj/xcshareddata/xcschemes/Testable Swift.xcscheme => TestableSwift/TestableSwift.xcodeproj/xcshareddata/xcschemes/TestableSwift.xcscheme} (66%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/AppDelegate.swift (100%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/Base.lproj/LaunchScreen.xib (100%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/Base.lproj/Main.storyboard (100%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/Images.xcassets/Contents.json (100%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/Info.plist (100%) rename Documentation/Examples/{Testable Swift/Testable Swift => TestableSwift/TestableSwift}/MasterViewController.swift (100%) rename Documentation/Examples/{Testable Swift/Testable SwiftTests => TestableSwift/TestableSwiftTests}/Info.plist (100%) rename Documentation/Examples/{Testable Swift/Testable SwiftTests => TestableSwift/TestableSwiftTests}/SimpleObjCTest.m (96%) rename Documentation/Examples/{Testable Swift/Testable SwiftTests => TestableSwift/TestableSwiftTests}/SimpleSwiftTest.swift (100%) rename Documentation/Examples/{Testable Swift/Testable SwiftTests/Testable SwiftTests-Bridging-Header.h => TestableSwift/TestableSwiftTests/TestableSwiftTests-Bridging-Header.h} (83%) rename Documentation/Examples/{Testable Swift/Testable SwiftTests => TestableSwift/TestableSwiftTests}/Testable_SwiftTests.swift (100%) delete mode 100644 KIF.xcodeproj/xcshareddata/xcschemes/KIFFrameworkConsumerTests.xcscheme delete mode 100644 KIFFramework/Info.plist delete mode 100644 KIFFramework/KIF.h delete mode 100644 KIFFrameworkConsumer/AppDelegate.h delete mode 100644 KIFFrameworkConsumer/AppDelegate.m delete mode 100644 KIFFrameworkConsumer/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 KIFFrameworkConsumer/Base.lproj/Main.storyboard delete mode 100644 KIFFrameworkConsumer/Info.plist delete mode 100644 KIFFrameworkConsumer/ViewController.h delete mode 100644 KIFFrameworkConsumer/ViewController.m delete mode 100644 KIFFrameworkConsumer/main.m delete mode 100644 KIFFrameworkConsumerTests/Info.plist delete mode 100644 KIFFrameworkConsumerTests/KIFFrameworkConsumerTests.m diff --git a/Default-568h@2x.png b/Default-568h@2x.png deleted file mode 100644 index 0891b7aabfcf3422423b109c8beed2bab838c607..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18594 zcmeI4X;f257Jx&9fS`ixvS;&$x8J@slQFSel)6zJN=?13FB7H(lQjRkSy8x_-S~tvu2gzn1oS+dLcF#eqtq$ z%tf9TTvX?`)R@}3uBI;jzS-=ZR-Td&MHaS&;!0?Ni*#$#`n*~CcQK)Q9vAQ~TUpnI!j)a2biYK^R)M~A5wUDZhx?ULMX z3x1P&qt=trOY6P2U67L=m=U?F|5#Uj(eCueNTZaHs_ceWiHeET+j+tp3Jt9g(ekqP z2WOvfR{qV+9r+o4J5?qK>7;;^+I7tGv-i)es$X_D=EoKF+S?zsyj^oRFElP}c}JT< zd8SUs-?O?}2YD#ngKbnHgzHBcboxK_2r9l(?eNCl-pEzkJm}fY?WC*jnS?VBE4EpY zO$fEejz6fU;W2Kl>JeQBZBl-%Irg`obSlg*@4QB;Dd1H7^Oi5wvt4d{RZ!8Og?^aE z)k0$1g+V3fd(gdQ3d&q2q-FL*uy#}|bc^=VhFsl0jBgUGJ+-s3U8MK9A!YJJMxpci z5hJ%|{DwV48fZn0{n5l$N_KcSb#NKE4plB`9I6Zt=Z!~-zw0{9tg$L&Ju1F0X)Cy8 zKF;(&lJ>x)Jw(=;p~sF(Sd9VWGwFE2rnyS9!f^DZ8+aCLq zQ};>lcJ1GDLqjm6Hd>|Eabno@P`~Bn(~6^aD_#yoEH(a?Nm1S<;S+hSxI5d16^<1lEM3NPFi zkqPrpL)+ zgnseFikg`gJVBha1&7C4;O6>h=dt~`ND+;Zd?W(4v2JIb7Pt>Td42%M-Ju-XAH#Pns762L}K3 zDhvsRqN0Ni(1UrishD2YvV?4*h2iFj$+&N||Fn$4n|^NSU+o?~jq`0jVQt8T9l{7b zXiwwODFh2V!Q6sqP9S>WH$oOf$N~=d0-bqTlD61!=`&0eAP-F>XN?*|gtOXX{ zQVTWyYo4ZK0GAw!GHf|pz9`D;-bbb*5LBX*{bnz|+)$@&P9|ORM2o?95{;ejvo&r- zq8cBhTN6nn)7~W>54U)%-F_-b?YKdfk5I8MHcuzBD5)!;yv#Z&R&^y=@=>VTIMy#r zX&U<=BsPkdqcMe<_}2+>H%XKyrr5ZR8_KVe>ZqYN z^=^~TFD};;rHJ$U;{~w^hYojl4hRI@SH$^K{YEo=sg)WY87r!*7blQK&qnpDo0`Vn zkl)9u9g=mCh&ZCJS(L4yN3k0kQ zuvg$h2KEEk51T+O0JQ+r0`R>g{jvqM0Mr6d3qUOZwE!?PI7HY@CE|dr sfw?Q;rAv?G4&^^8-z_>&sWXMxvD*gPOU4CBe-*@OtE+wfmVJNyHv)PfH~;_u diff --git a/Documentation/Examples/Calculator/Acceptance Tests/BasicCalculatorRobot.m b/Documentation/Examples/Calculator/Acceptance Tests/BasicCalculatorRobot.m index 42c68141e..af27e55df 100644 --- a/Documentation/Examples/Calculator/Acceptance Tests/BasicCalculatorRobot.m +++ b/Documentation/Examples/Calculator/Acceptance Tests/BasicCalculatorRobot.m @@ -2,7 +2,7 @@ // See the LICENSE file distributed with this work for the terms under // which Square, Inc. licenses this file to you. -#import +@import KIF; #import "BasicCalculatorRobot.h" diff --git a/Documentation/Examples/Calculator/Acceptance Tests/TestRobot.m b/Documentation/Examples/Calculator/Acceptance Tests/TestRobot.m index a0f077cac..faf788217 100644 --- a/Documentation/Examples/Calculator/Acceptance Tests/TestRobot.m +++ b/Documentation/Examples/Calculator/Acceptance Tests/TestRobot.m @@ -6,7 +6,7 @@ // Copyright © 2017 SSK Development. All rights reserved. // -#import +@import KIF; #import "TestRobot.h" diff --git a/Documentation/Examples/Calculator/Calculator.xcodeproj/project.pbxproj b/Documentation/Examples/Calculator/Calculator.xcodeproj/project.pbxproj index 9a76c982b..3c04068ce 100644 --- a/Documentation/Examples/Calculator/Calculator.xcodeproj/project.pbxproj +++ b/Documentation/Examples/Calculator/Calculator.xcodeproj/project.pbxproj @@ -3,11 +3,11 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ - 62F81B511EBBE965009B2400 /* KIF.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 62F81B3C1EBBE917009B2400 /* KIF.framework */; }; + 6282C6352C9CBE210040DCDB /* KIF in Frameworks */ = {isa = PBXBuildFile; productRef = 6282C6342C9CBE210040DCDB /* KIF */; }; 62F81B521EBBE976009B2400 /* BasicCalculatorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EB4C315F167BAE6100E31109 /* BasicCalculatorTests.m */; }; 62F81B5D1EBBEB6B009B2400 /* BasicCalculatorRobot.m in Sources */ = {isa = PBXBuildFile; fileRef = 62F81B5C1EBBEB6B009B2400 /* BasicCalculatorRobot.m */; }; 62F972EB1F708273003EFFDA /* TestRobot.m in Sources */ = {isa = PBXBuildFile; fileRef = 62F972EA1F708273003EFFDA /* TestRobot.m */; }; @@ -29,27 +29,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 62F81B3B1EBBE917009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 9CC9673B1AD4B1B600576D13; - remoteInfo = KIFFramework; - }; - 62F81B3D1EBBE917009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = FAB89FFC1CAC546900C6DFC1; - remoteInfo = KIFFrameworkConsumer; - }; - 62F81B3F1EBBE917009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = FAB8A0141CAC546A00C6DFC1; - remoteInfo = KIFFrameworkConsumerTests; - }; 62F81B4A1EBBE925009B2400 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = EB4C30D0167B9E3A00E31109 /* Project object */; @@ -57,34 +36,6 @@ remoteGlobalIDString = EB4C30D8167B9E3A00E31109; remoteInfo = Calculator; }; - 62F81B4F1EBBE961009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 9CC9673A1AD4B1B600576D13; - remoteInfo = KIFFramework; - }; - A8892FFF1684F0A400FC7C63 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = AAB07268139719AC008AF393; - remoteInfo = KIF; - }; - EB2A8A871781D68600C6299F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EB60ECC1177F8C83005A041A; - remoteInfo = "Test Host"; - }; - EB2A8A891781D68600C6299F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EB60ECEB177F8DB3005A041A; - remoteInfo = "KIF Tests"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -94,7 +45,7 @@ 62F81B5C1EBBEB6B009B2400 /* BasicCalculatorRobot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BasicCalculatorRobot.m; sourceTree = ""; }; 62F972E91F708273003EFFDA /* TestRobot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestRobot.h; sourceTree = ""; }; 62F972EA1F708273003EFFDA /* TestRobot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestRobot.m; sourceTree = ""; }; - A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = KIF.xcodeproj; path = ../../../KIF.xcodeproj; sourceTree = ""; }; + 62FA513E2C9CBDCD00E335D6 /* KIF */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = KIF; path = ../../..; sourceTree = ""; }; EB4C30D9167B9E3A00E31109 /* Calculator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Calculator.app; sourceTree = BUILT_PRODUCTS_DIR; }; EB4C30DD167B9E3A00E31109 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; EB4C30DF167B9E3A00E31109 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -120,7 +71,6 @@ EB4C3158167BA99D00E31109 /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = ""; }; EB4C3159167BA99E00E31109 /* HomeViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HomeViewController.xib; sourceTree = ""; }; EB4C315F167BAE6100E31109 /* BasicCalculatorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BasicCalculatorTests.m; sourceTree = ""; }; - EB7204861680E02800278DA2 /* libKIFTestCase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libKIFTestCase.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -128,7 +78,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 62F81B511EBBE965009B2400 /* KIF.framework in Frameworks */, + 6282C6352C9CBE210040DCDB /* KIF in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -145,19 +95,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - A8892FF81684F0A400FC7C63 /* Products */ = { - isa = PBXGroup; - children = ( - A88930001684F0A400FC7C63 /* libKIF.a */, - EB2A8A881781D68600C6299F /* Test Host.app */, - EB2A8A8A1781D68600C6299F /* KIF Tests - XCTest.xctest */, - 62F81B3C1EBBE917009B2400 /* KIF.framework */, - 62F81B3E1EBBE917009B2400 /* KIFFrameworkConsumer.app */, - 62F81B401EBBE917009B2400 /* KIFFrameworkConsumerTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; EB4C30CE167B9E3A00E31109 = { isa = PBXGroup; children = ( @@ -180,8 +117,7 @@ EB4C30DC167B9E3A00E31109 /* Frameworks */ = { isa = PBXGroup; children = ( - A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */, - EB7204861680E02800278DA2 /* libKIFTestCase.a */, + 62FA513E2C9CBDCD00E335D6 /* KIF */, EB4C30DD167B9E3A00E31109 /* UIKit.framework */, EB4C30DF167B9E3A00E31109 /* Foundation.framework */, EB4C30E1167B9E3A00E31109 /* CoreGraphics.framework */, @@ -259,10 +195,12 @@ buildRules = ( ); dependencies = ( - 62F81B501EBBE961009B2400 /* PBXTargetDependency */, 62F81B4B1EBBE925009B2400 /* PBXTargetDependency */, ); name = "Acceptance Tests"; + packageProductDependencies = ( + 6282C6342C9CBE210040DCDB /* KIF */, + ); productName = "Acceptance Tests"; productReference = 62F81B451EBBE925009B2400 /* Acceptance Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; @@ -280,6 +218,8 @@ dependencies = ( ); name = Calculator; + packageProductDependencies = ( + ); productName = Calculator; productReference = EB4C30D9167B9E3A00E31109 /* Calculator.app */; productType = "com.apple.product-type.application"; @@ -311,12 +251,6 @@ mainGroup = EB4C30CE167B9E3A00E31109; productRefGroup = EB4C30DA167B9E3A00E31109 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = A8892FF81684F0A400FC7C63 /* Products */; - ProjectRef = A8892FF71684F0A400FC7C63 /* KIF.xcodeproj */; - }, - ); projectRoot = ""; targets = ( EB4C30D8167B9E3A00E31109 /* Calculator */, @@ -325,51 +259,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 62F81B3C1EBBE917009B2400 /* KIF.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = KIF.framework; - remoteRef = 62F81B3B1EBBE917009B2400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 62F81B3E1EBBE917009B2400 /* KIFFrameworkConsumer.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = KIFFrameworkConsumer.app; - remoteRef = 62F81B3D1EBBE917009B2400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 62F81B401EBBE917009B2400 /* KIFFrameworkConsumerTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = KIFFrameworkConsumerTests.xctest; - remoteRef = 62F81B3F1EBBE917009B2400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - A88930001684F0A400FC7C63 /* libKIF.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libKIF.a; - remoteRef = A8892FFF1684F0A400FC7C63 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - EB2A8A881781D68600C6299F /* Test Host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "Test Host.app"; - remoteRef = EB2A8A871781D68600C6299F /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - EB2A8A8A1781D68600C6299F /* KIF Tests - XCTest.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "KIF Tests - XCTest.xctest"; - remoteRef = EB2A8A891781D68600C6299F /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 62F81B431EBBE925009B2400 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -425,11 +314,6 @@ target = EB4C30D8167B9E3A00E31109 /* Calculator */; targetProxy = 62F81B4A1EBBE925009B2400 /* PBXContainerItemProxy */; }; - 62F81B501EBBE961009B2400 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = KIFFramework; - targetProxy = 62F81B4F1EBBE961009B2400 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -486,7 +370,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "Acceptance Tests/Acceptance Tests-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = YES; OTHER_CFLAGS = ( "-DDEPRECATE_KIF_SYSTEM=1", @@ -526,7 +414,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "Acceptance Tests/Acceptance Tests-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = "com.squareup.Acceptance-Tests"; @@ -683,6 +575,13 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 6282C6342C9CBE210040DCDB /* KIF */ = { + isa = XCSwiftPackageProductDependency; + productName = KIF; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = EB4C30D0167B9E3A00E31109 /* Project object */; } diff --git a/Documentation/Examples/Calculator/Calculator/BasicCalculatorViewController.m b/Documentation/Examples/Calculator/Calculator/BasicCalculatorViewController.m index f2e99b594..6d42e1a01 100644 --- a/Documentation/Examples/Calculator/Calculator/BasicCalculatorViewController.m +++ b/Documentation/Examples/Calculator/Calculator/BasicCalculatorViewController.m @@ -36,18 +36,25 @@ - (id)init return self; } -- (void)setAccessibilityLabel:(NSString *)label forSegment:(NSInteger)segment -{ - UIView *view = (self.operationInput.subviews)[self.operationInput.subviews.count - segment - 1]; - view.accessibilityLabel = label; -} - - (void)viewDidLoad { - [self setAccessibilityLabel:@"Add" forSegment:Add]; - [self setAccessibilityLabel:@"Subtract" forSegment:Subtract]; - [self setAccessibilityLabel:@"Multiply" forSegment:Multiply]; - [self setAccessibilityLabel:@"Divide" forSegment:Divide]; + for (int i = 0; i < self.operationInput.subviews.count; i++) { + UIView *segment = (UIView *)self.operationInput.subviews[i]; + UIView *label = segment.subviews[0]; + NSString *segmentText = [(id)label text]; + + if ([segmentText isEqualToString:@"+"]) { + segment.accessibilityLabel = @"Add"; + } else if ([segmentText isEqualToString:@"–"]) { + segment.accessibilityLabel = @"Subtract"; + } else if ([segmentText isEqualToString:@"×"]) { + segment.accessibilityLabel = @"Multiply"; + } else if ([segmentText isEqualToString:@"÷"]) { + segment.accessibilityLabel = @"Divide"; + } else { + @throw([NSException exceptionWithName:NSInvalidArgumentException reason:[NSString stringWithFormat:@"Invalid segment text value (%@)", segmentText] userInfo:nil]); + } + } } - (IBAction)recalculate diff --git a/SPMIntegration/SPMIntegration.xcodeproj/project.pbxproj b/Documentation/Examples/SPMIntegration/SPMIntegration.xcodeproj/project.pbxproj similarity index 98% rename from SPMIntegration/SPMIntegration.xcodeproj/project.pbxproj rename to Documentation/Examples/SPMIntegration/SPMIntegration.xcodeproj/project.pbxproj index dc55e88ea..904565357 100644 --- a/SPMIntegration/SPMIntegration.xcodeproj/project.pbxproj +++ b/Documentation/Examples/SPMIntegration/SPMIntegration.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -27,6 +27,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 62582A9C2C9B9B5B00F800BF /* SPMIntegration.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = SPMIntegration.xctestplan; sourceTree = ""; }; B4310BDF260BA21400EE03AF /* SPMIntegration.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SPMIntegration.app; sourceTree = BUILT_PRODUCTS_DIR; }; B4310BE2260BA21400EE03AF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; B4310BE6260BA21400EE03AF /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -37,7 +38,7 @@ B4310BF5260BA21500EE03AF /* SPMIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SPMIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; B4310BF9260BA21500EE03AF /* SPMIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPMIntegrationTests.swift; sourceTree = ""; }; B4310BFB260BA21500EE03AF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B488554F260CE596008916AB /* KIF */ = {isa = PBXFileReference; lastKnownFileType = folder; name = KIF; path = ../..; sourceTree = ""; }; + B488554F260CE596008916AB /* KIF */ = {isa = PBXFileReference; lastKnownFileType = folder; name = KIF; path = ../../../..; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -62,6 +63,7 @@ B4310BD6260BA21400EE03AF = { isa = PBXGroup; children = ( + 62582A9C2C9B9B5B00F800BF /* SPMIntegration.xctestplan */, B4310BE1260BA21400EE03AF /* SPMIntegration */, B4310BF8260BA21500EE03AF /* SPMIntegrationTests */, B4310BE0260BA21400EE03AF /* Products */, diff --git a/Documentation/Examples/SPMIntegration/SPMIntegration.xcodeproj/xcshareddata/xcschemes/SPMIntegration.xcscheme b/Documentation/Examples/SPMIntegration/SPMIntegration.xcodeproj/xcshareddata/xcschemes/SPMIntegration.xcscheme new file mode 100644 index 000000000..ea78d87d9 --- /dev/null +++ b/Documentation/Examples/SPMIntegration/SPMIntegration.xcodeproj/xcshareddata/xcschemes/SPMIntegration.xcscheme @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Documentation/Examples/SPMIntegration/SPMIntegration.xctestplan b/Documentation/Examples/SPMIntegration/SPMIntegration.xctestplan new file mode 100644 index 000000000..6d0c31d34 --- /dev/null +++ b/Documentation/Examples/SPMIntegration/SPMIntegration.xctestplan @@ -0,0 +1,24 @@ +{ + "configurations" : [ + { + "id" : "F823B32F-2F22-4DD2-8CA2-174EF43D6620", + "name" : "Configuration 1", + "options" : { + + } + } + ], + "defaultOptions" : { + + }, + "testTargets" : [ + { + "target" : { + "containerPath" : "container:SPMIntegration.xcodeproj", + "identifier" : "B4310BF4260BA21500EE03AF", + "name" : "SPMIntegrationTests" + } + } + ], + "version" : 1 +} diff --git a/SPMIntegration/SPMIntegration/AppDelegate.swift b/Documentation/Examples/SPMIntegration/SPMIntegration/AppDelegate.swift similarity index 100% rename from SPMIntegration/SPMIntegration/AppDelegate.swift rename to Documentation/Examples/SPMIntegration/SPMIntegration/AppDelegate.swift diff --git a/SPMIntegration/SPMIntegration/Assets.xcassets/AccentColor.colorset/Contents.json b/Documentation/Examples/SPMIntegration/SPMIntegration/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from SPMIntegration/SPMIntegration/Assets.xcassets/AccentColor.colorset/Contents.json rename to Documentation/Examples/SPMIntegration/SPMIntegration/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/SPMIntegration/SPMIntegration/Assets.xcassets/AppIcon.appiconset/Contents.json b/Documentation/Examples/SPMIntegration/SPMIntegration/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from SPMIntegration/SPMIntegration/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Documentation/Examples/SPMIntegration/SPMIntegration/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/SPMIntegration/SPMIntegration/Assets.xcassets/Contents.json b/Documentation/Examples/SPMIntegration/SPMIntegration/Assets.xcassets/Contents.json similarity index 100% rename from SPMIntegration/SPMIntegration/Assets.xcassets/Contents.json rename to Documentation/Examples/SPMIntegration/SPMIntegration/Assets.xcassets/Contents.json diff --git a/SPMIntegration/SPMIntegration/Base.lproj/LaunchScreen.storyboard b/Documentation/Examples/SPMIntegration/SPMIntegration/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from SPMIntegration/SPMIntegration/Base.lproj/LaunchScreen.storyboard rename to Documentation/Examples/SPMIntegration/SPMIntegration/Base.lproj/LaunchScreen.storyboard diff --git a/SPMIntegration/SPMIntegration/Base.lproj/Main.storyboard b/Documentation/Examples/SPMIntegration/SPMIntegration/Base.lproj/Main.storyboard similarity index 100% rename from SPMIntegration/SPMIntegration/Base.lproj/Main.storyboard rename to Documentation/Examples/SPMIntegration/SPMIntegration/Base.lproj/Main.storyboard diff --git a/SPMIntegration/SPMIntegration/Info.plist b/Documentation/Examples/SPMIntegration/SPMIntegration/Info.plist similarity index 100% rename from SPMIntegration/SPMIntegration/Info.plist rename to Documentation/Examples/SPMIntegration/SPMIntegration/Info.plist diff --git a/SPMIntegration/SPMIntegration/ViewController.swift b/Documentation/Examples/SPMIntegration/SPMIntegration/ViewController.swift similarity index 100% rename from SPMIntegration/SPMIntegration/ViewController.swift rename to Documentation/Examples/SPMIntegration/SPMIntegration/ViewController.swift diff --git a/SPMIntegration/SPMIntegrationTests/Info.plist b/Documentation/Examples/SPMIntegration/SPMIntegrationTests/Info.plist similarity index 100% rename from SPMIntegration/SPMIntegrationTests/Info.plist rename to Documentation/Examples/SPMIntegration/SPMIntegrationTests/Info.plist diff --git a/SPMIntegration/SPMIntegrationTests/SPMIntegrationTests.swift b/Documentation/Examples/SPMIntegration/SPMIntegrationTests/SPMIntegrationTests.swift similarity index 100% rename from SPMIntegration/SPMIntegrationTests/SPMIntegrationTests.swift rename to Documentation/Examples/SPMIntegration/SPMIntegrationTests/SPMIntegrationTests.swift diff --git a/Documentation/Examples/Testable/Testable.xcodeproj/project.pbxproj b/Documentation/Examples/Testable/Testable.xcodeproj/project.pbxproj index 0a77225f1..511029965 100644 --- a/Documentation/Examples/Testable/Testable.xcodeproj/project.pbxproj +++ b/Documentation/Examples/Testable/Testable.xcodeproj/project.pbxproj @@ -8,9 +8,9 @@ /* Begin PBXBuildFile section */ 4440B32C17F5692A00253D51 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4440B32B17F5692A00253D51 /* Default-568h@2x.png */; }; + 6282C65B2C9CE4080040DCDB /* libKIF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6282C6562C9CE3F70040DCDB /* libKIF.a */; }; 62F81B001EBBD073009B2400 /* IntegrationTestCases.m in Sources */ = {isa = PBXBuildFile; fileRef = EB47EFB21781DF6D006BBFAC /* IntegrationTestCases.m */; }; 62F81B011EBBD073009B2400 /* KIFUITestActor+EXAddition.m in Sources */ = {isa = PBXBuildFile; fileRef = EB47EFB41781DF6D006BBFAC /* KIFUITestActor+EXAddition.m */; }; - 62F81B2F1EBBDCB6009B2400 /* libKIF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 62F81AD91EBBCF26009B2400 /* libKIF.a */; }; 62F81B311EBBE348009B2400 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 62F81B301EBBE348009B2400 /* IOKit.framework */; }; AAB073AD139861C0008AF393 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB073AC139861C0008AF393 /* UIKit.framework */; }; AAB073AF139861C0008AF393 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB073AE139861C0008AF393 /* Foundation.framework */; }; @@ -26,48 +26,27 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 62F81AD81EBBCF26009B2400 /* PBXContainerItemProxy */ = { + 6282C6552C9CE3F70040DCDB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 62F81ACE1EBBCF26009B2400 /* KIF.xcodeproj */; + containerPortal = 6282C64E2C9CE3F70040DCDB /* KIF.xcodeproj */; proxyType = 2; remoteGlobalIDString = EABD46AA1857A0C700A5F081; remoteInfo = KIF; }; - 62F81ADA1EBBCF26009B2400 /* PBXContainerItemProxy */ = { + 6282C6572C9CE3F70040DCDB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 62F81ACE1EBBCF26009B2400 /* KIF.xcodeproj */; + containerPortal = 6282C64E2C9CE3F70040DCDB /* KIF.xcodeproj */; proxyType = 2; remoteGlobalIDString = EB60ECC1177F8C83005A041A; remoteInfo = "Test Host"; }; - 62F81ADC1EBBCF26009B2400 /* PBXContainerItemProxy */ = { + 6282C6592C9CE3F70040DCDB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 62F81ACE1EBBCF26009B2400 /* KIF.xcodeproj */; + containerPortal = 6282C64E2C9CE3F70040DCDB /* KIF.xcodeproj */; proxyType = 2; remoteGlobalIDString = EABD46CD1857A0F300A5F081; remoteInfo = "KIF Tests"; }; - 62F81ADE1EBBCF26009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 62F81ACE1EBBCF26009B2400 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 9CC9673B1AD4B1B600576D13; - remoteInfo = KIFFramework; - }; - 62F81AE01EBBCF26009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 62F81ACE1EBBCF26009B2400 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = FAB89FFC1CAC546900C6DFC1; - remoteInfo = KIFFrameworkConsumer; - }; - 62F81AE21EBBCF26009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 62F81ACE1EBBCF26009B2400 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = FAB8A0141CAC546A00C6DFC1; - remoteInfo = KIFFrameworkConsumerTests; - }; 62F81AFB1EBBD038009B2400 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = AAB0739F139861C0008AF393 /* Project object */; @@ -75,20 +54,13 @@ remoteGlobalIDString = AAB073A7139861C0008AF393; remoteInfo = Testable; }; - 62F81B2D1EBBDC54009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 62F81ACE1EBBCF26009B2400 /* KIF.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = EABD46791857A0C700A5F081; - remoteInfo = KIF; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 22191E0524BF79F4004CAA18 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainWindow.xib; sourceTree = ""; }; 22191E0624BF79F4004CAA18 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/RootViewController.xib; sourceTree = ""; }; 4440B32B17F5692A00253D51 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; - 62F81ACE1EBBCF26009B2400 /* KIF.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = KIF.xcodeproj; path = ../../../../KIF.xcodeproj; sourceTree = ""; }; + 6282C64E2C9CE3F70040DCDB /* KIF.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = KIF.xcodeproj; path = ../../../KIF.xcodeproj; sourceTree = ""; }; 62F81AF61EBBD038009B2400 /* Acceptance Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Acceptance Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 62F81B301EBBE348009B2400 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/IOKit.framework; sourceTree = DEVELOPER_DIR; }; AAB073A8139861C0008AF393 /* Testable.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Testable.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -118,7 +90,7 @@ buildActionMask = 2147483647; files = ( BCA154372331FFF700CDC69F /* WebKit.framework in Frameworks */, - 62F81B2F1EBBDCB6009B2400 /* libKIF.a in Frameworks */, + 6282C65B2C9CE4080040DCDB /* libKIF.a in Frameworks */, 62F81B311EBBE348009B2400 /* IOKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -137,15 +109,12 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 62F81ACF1EBBCF26009B2400 /* Products */ = { + 6282C64F2C9CE3F70040DCDB /* Products */ = { isa = PBXGroup; children = ( - 62F81AD91EBBCF26009B2400 /* libKIF.a */, - 62F81ADB1EBBCF26009B2400 /* Test Host.app */, - 62F81ADD1EBBCF26009B2400 /* KIF Tests - XCTest.xctest */, - 62F81ADF1EBBCF26009B2400 /* KIF.framework */, - 62F81AE11EBBCF26009B2400 /* KIFFrameworkConsumer.app */, - 62F81AE31EBBCF26009B2400 /* KIFFrameworkConsumerTests.xctest */, + 6282C6562C9CE3F70040DCDB /* libKIF.a */, + 6282C6582C9CE3F70040DCDB /* Test Host.app */, + 6282C65A2C9CE3F70040DCDB /* KIF Tests - XCTest.xctest */, ); name = Products; sourceTree = ""; @@ -173,6 +142,7 @@ AAB073AB139861C0008AF393 /* Frameworks */ = { isa = PBXGroup; children = ( + 6282C64E2C9CE3F70040DCDB /* KIF.xcodeproj */, BCA1542F2331FF8C00CDC69F /* WebKit.framework */, EB9DB7431781DDBA0087B6FD /* libKIF.a */, 62F81B301EBBE348009B2400 /* IOKit.framework */, @@ -212,7 +182,6 @@ EB9DB7361781DBD40087B6FD /* Acceptance Tests */ = { isa = PBXGroup; children = ( - 62F81ACE1EBBCF26009B2400 /* KIF.xcodeproj */, EB47EFB21781DF6D006BBFAC /* IntegrationTestCases.m */, EB47EFB31781DF6D006BBFAC /* KIFUITestActor+EXAddition.h */, EB47EFB41781DF6D006BBFAC /* KIFUITestActor+EXAddition.m */, @@ -244,7 +213,6 @@ ); dependencies = ( 62F81AFC1EBBD038009B2400 /* PBXTargetDependency */, - 62F81B2E1EBBDC54009B2400 /* PBXTargetDependency */, ); name = "Acceptance Tests"; productName = "Acceptance Tests"; @@ -296,8 +264,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = 62F81ACF1EBBCF26009B2400 /* Products */; - ProjectRef = 62F81ACE1EBBCF26009B2400 /* KIF.xcodeproj */; + ProductGroup = 6282C64F2C9CE3F70040DCDB /* Products */; + ProjectRef = 6282C64E2C9CE3F70040DCDB /* KIF.xcodeproj */; }, ); projectRoot = ""; @@ -309,46 +277,25 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 62F81AD91EBBCF26009B2400 /* libKIF.a */ = { + 6282C6562C9CE3F70040DCDB /* libKIF.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libKIF.a; - remoteRef = 62F81AD81EBBCF26009B2400 /* PBXContainerItemProxy */; + remoteRef = 6282C6552C9CE3F70040DCDB /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 62F81ADB1EBBCF26009B2400 /* Test Host.app */ = { + 6282C6582C9CE3F70040DCDB /* Test Host.app */ = { isa = PBXReferenceProxy; fileType = wrapper.application; path = "Test Host.app"; - remoteRef = 62F81ADA1EBBCF26009B2400 /* PBXContainerItemProxy */; + remoteRef = 6282C6572C9CE3F70040DCDB /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 62F81ADD1EBBCF26009B2400 /* KIF Tests - XCTest.xctest */ = { + 6282C65A2C9CE3F70040DCDB /* KIF Tests - XCTest.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; path = "KIF Tests - XCTest.xctest"; - remoteRef = 62F81ADC1EBBCF26009B2400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 62F81ADF1EBBCF26009B2400 /* KIF.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = KIF.framework; - remoteRef = 62F81ADE1EBBCF26009B2400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 62F81AE11EBBCF26009B2400 /* KIFFrameworkConsumer.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = KIFFrameworkConsumer.app; - remoteRef = 62F81AE01EBBCF26009B2400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 62F81AE31EBBCF26009B2400 /* KIFFrameworkConsumerTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = KIFFrameworkConsumerTests.xctest; - remoteRef = 62F81AE21EBBCF26009B2400 /* PBXContainerItemProxy */; + remoteRef = 6282C6592C9CE3F70040DCDB /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -402,11 +349,6 @@ target = AAB073A7139861C0008AF393 /* Testable */; targetProxy = 62F81AFB1EBBD038009B2400 /* PBXContainerItemProxy */; }; - 62F81B2E1EBBDC54009B2400 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = KIF; - targetProxy = 62F81B2D1EBBDC54009B2400 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ diff --git a/Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/project.pbxproj b/Documentation/Examples/TestableSwift/TestableSwift.xcodeproj/project.pbxproj similarity index 67% rename from Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/project.pbxproj rename to Documentation/Examples/TestableSwift/TestableSwift.xcodeproj/project.pbxproj index 7cef8ab3e..30ffdd0c0 100644 --- a/Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/project.pbxproj +++ b/Documentation/Examples/TestableSwift/TestableSwift.xcodeproj/project.pbxproj @@ -3,12 +3,13 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ 5600E94A1C3BBCC800235220 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5600E9491C3BBCC700235220 /* IOKit.framework */; }; - 62F81B141EBBD11A009B2400 /* KIF.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5600E9411C3BBB8300235220 /* KIF.framework */; }; + 62582AF22C9CB00E00F800BF /* KIF in Resources */ = {isa = PBXBuildFile; fileRef = 62582AF12C9CAFEA00F800BF /* KIF */; }; + 62FA513C2C9CB1A500E335D6 /* KIF in Frameworks */ = {isa = PBXBuildFile; productRef = 62FA513B2C9CB1A500E335D6 /* KIF */; }; A88CD9831A019AFF0064F706 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A88CD9821A019AFF0064F706 /* AppDelegate.swift */; }; A88CD9851A019AFF0064F706 /* MasterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A88CD9841A019AFF0064F706 /* MasterViewController.swift */; }; A88CD98A1A019AFF0064F706 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A88CD9881A019AFF0064F706 /* Main.storyboard */; }; @@ -20,79 +21,29 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 548FAB951E6814BB00C01467 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = FAB89FFC1CAC546900C6DFC1; - remoteInfo = KIFFrameworkConsumer; - }; - 548FAB971E6814BB00C01467 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = FAB8A0141CAC546A00C6DFC1; - remoteInfo = KIFFrameworkConsumerTests; - }; - 5600E93A1C3BBB8300235220 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EABD46AA1857A0C700A5F081; - remoteInfo = KIF; - }; - 5600E93C1C3BBB8300235220 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EB60ECC1177F8C83005A041A; - remoteInfo = "Test Host"; - }; - 5600E93E1C3BBB8300235220 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EABD46CD1857A0F300A5F081; - remoteInfo = "KIF Tests"; - }; - 5600E9401C3BBB8300235220 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 9CC9673B1AD4B1B600576D13; - remoteInfo = KIFFramework; - }; - 62F81B0B1EBBD094009B2400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 9CC9673A1AD4B1B600576D13; - remoteInfo = KIFFramework; - }; A88CD9951A019AFF0064F706 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = A88CD9751A019AFF0064F706 /* Project object */; proxyType = 1; remoteGlobalIDString = A88CD97C1A019AFF0064F706; - remoteInfo = "Testable Swift"; + remoteInfo = TestableSwift; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 5600E9301C3BB8F700235220 /* KIF.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = KIF.framework; path = "../../../../build/Debug-iphoneos/KIF.framework"; sourceTree = ""; }; - 5600E9321C3BBB8300235220 /* KIF.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = KIF.xcodeproj; path = ../../../KIF.xcodeproj; sourceTree = SOURCE_ROOT; }; 5600E9491C3BBCC700235220 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/IOKit.framework; sourceTree = DEVELOPER_DIR; }; - A88CD97D1A019AFF0064F706 /* Testable Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Testable Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 62582AF12C9CAFEA00F800BF /* KIF */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = KIF; path = ../../../..; sourceTree = ""; }; + A88CD97D1A019AFF0064F706 /* TestableSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestableSwift.app; sourceTree = BUILT_PRODUCTS_DIR; }; A88CD9811A019AFF0064F706 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A88CD9821A019AFF0064F706 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; A88CD9841A019AFF0064F706 /* MasterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterViewController.swift; sourceTree = ""; }; A88CD9891A019AFF0064F706 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; A88CD98B1A019AFF0064F706 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; A88CD98E1A019AFF0064F706 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - A88CD9941A019AFF0064F706 /* Testable SwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Testable SwiftTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + A88CD9941A019AFF0064F706 /* TestableSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestableSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A88CD9991A019AFF0064F706 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A88CD99A1A019AFF0064F706 /* Testable_SwiftTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Testable_SwiftTests.swift; sourceTree = ""; }; - A88CD9BA1A019F0B0064F706 /* Testable SwiftTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Testable SwiftTests-Bridging-Header.h"; sourceTree = ""; }; + A88CD9BA1A019F0B0064F706 /* TestableSwiftTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TestableSwiftTests-Bridging-Header.h"; sourceTree = ""; }; A88CD9BB1A019F0B0064F706 /* SimpleObjCTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimpleObjCTest.m; sourceTree = ""; }; A88CD9BD1A019F300064F706 /* SimpleSwiftTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimpleSwiftTest.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -109,46 +60,41 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 62F81B141EBBD11A009B2400 /* KIF.framework in Frameworks */, 5600E94A1C3BBCC800235220 /* IOKit.framework in Frameworks */, + 62FA513C2C9CB1A500E335D6 /* KIF in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 5600E9331C3BBB8300235220 /* Products */ = { + 62FA513A2C9CB1A500E335D6 /* Frameworks */ = { isa = PBXGroup; children = ( - 5600E93B1C3BBB8300235220 /* libKIF.a */, - 5600E93D1C3BBB8300235220 /* Test Host.app */, - 5600E93F1C3BBB8300235220 /* KIF Tests - XCTest.xctest */, - 5600E9411C3BBB8300235220 /* KIF.framework */, - 548FAB961E6814BB00C01467 /* KIFFrameworkConsumer.app */, - 548FAB981E6814BB00C01467 /* KIFFrameworkConsumerTests.xctest */, ); - name = Products; + name = Frameworks; sourceTree = ""; }; A88CD9741A019AFF0064F706 = { isa = PBXGroup; children = ( - A88CD97F1A019AFF0064F706 /* Testable Swift */, - A88CD9971A019AFF0064F706 /* Testable SwiftTests */, + A88CD97F1A019AFF0064F706 /* TestableSwift */, + A88CD9971A019AFF0064F706 /* TestableSwiftTests */, A88CD97E1A019AFF0064F706 /* Products */, + 62FA513A2C9CB1A500E335D6 /* Frameworks */, ); sourceTree = ""; }; A88CD97E1A019AFF0064F706 /* Products */ = { isa = PBXGroup; children = ( - A88CD97D1A019AFF0064F706 /* Testable Swift.app */, - A88CD9941A019AFF0064F706 /* Testable SwiftTests.xctest */, + A88CD97D1A019AFF0064F706 /* TestableSwift.app */, + A88CD9941A019AFF0064F706 /* TestableSwiftTests.xctest */, ); name = Products; sourceTree = ""; }; - A88CD97F1A019AFF0064F706 /* Testable Swift */ = { + A88CD97F1A019AFF0064F706 /* TestableSwift */ = { isa = PBXGroup; children = ( A88CD9821A019AFF0064F706 /* AppDelegate.swift */, @@ -158,7 +104,7 @@ A88CD98D1A019AFF0064F706 /* LaunchScreen.xib */, A88CD9801A019AFF0064F706 /* Supporting Files */, ); - path = "Testable Swift"; + path = TestableSwift; sourceTree = ""; }; A88CD9801A019AFF0064F706 /* Supporting Files */ = { @@ -169,19 +115,18 @@ name = "Supporting Files"; sourceTree = ""; }; - A88CD9971A019AFF0064F706 /* Testable SwiftTests */ = { + A88CD9971A019AFF0064F706 /* TestableSwiftTests */ = { isa = PBXGroup; children = ( - 5600E9321C3BBB8300235220 /* KIF.xcodeproj */, + 62582AF12C9CAFEA00F800BF /* KIF */, 5600E9491C3BBCC700235220 /* IOKit.framework */, A88CD99A1A019AFF0064F706 /* Testable_SwiftTests.swift */, A88CD9981A019AFF0064F706 /* Supporting Files */, A88CD9BB1A019F0B0064F706 /* SimpleObjCTest.m */, A88CD9BD1A019F300064F706 /* SimpleSwiftTest.swift */, - A88CD9BA1A019F0B0064F706 /* Testable SwiftTests-Bridging-Header.h */, - 5600E9301C3BB8F700235220 /* KIF.framework */, + A88CD9BA1A019F0B0064F706 /* TestableSwiftTests-Bridging-Header.h */, ); - path = "Testable SwiftTests"; + path = TestableSwiftTests; sourceTree = ""; }; A88CD9981A019AFF0064F706 /* Supporting Files */ = { @@ -195,9 +140,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - A88CD97C1A019AFF0064F706 /* Testable Swift */ = { + A88CD97C1A019AFF0064F706 /* TestableSwift */ = { isa = PBXNativeTarget; - buildConfigurationList = A88CD99E1A019AFF0064F706 /* Build configuration list for PBXNativeTarget "Testable Swift" */; + buildConfigurationList = A88CD99E1A019AFF0064F706 /* Build configuration list for PBXNativeTarget "TestableSwift" */; buildPhases = ( A88CD9791A019AFF0064F706 /* Sources */, A88CD97A1A019AFF0064F706 /* Frameworks */, @@ -207,14 +152,14 @@ ); dependencies = ( ); - name = "Testable Swift"; - productName = "Testable Swift"; - productReference = A88CD97D1A019AFF0064F706 /* Testable Swift.app */; + name = TestableSwift; + productName = TestableSwift; + productReference = A88CD97D1A019AFF0064F706 /* TestableSwift.app */; productType = "com.apple.product-type.application"; }; - A88CD9931A019AFF0064F706 /* Testable SwiftTests */ = { + A88CD9931A019AFF0064F706 /* TestableSwiftTests */ = { isa = PBXNativeTarget; - buildConfigurationList = A88CD9A11A019AFF0064F706 /* Build configuration list for PBXNativeTarget "Testable SwiftTests" */; + buildConfigurationList = A88CD9A11A019AFF0064F706 /* Build configuration list for PBXNativeTarget "TestableSwiftTests" */; buildPhases = ( A88CD9901A019AFF0064F706 /* Sources */, A88CD9911A019AFF0064F706 /* Frameworks */, @@ -223,12 +168,14 @@ buildRules = ( ); dependencies = ( - 62F81B0C1EBBD094009B2400 /* PBXTargetDependency */, A88CD9961A019AFF0064F706 /* PBXTargetDependency */, ); - name = "Testable SwiftTests"; - productName = "Testable SwiftTests"; - productReference = A88CD9941A019AFF0064F706 /* Testable SwiftTests.xctest */; + name = TestableSwiftTests; + packageProductDependencies = ( + 62FA513B2C9CB1A500E335D6 /* KIF */, + ); + productName = TestableSwiftTests; + productReference = A88CD9941A019AFF0064F706 /* TestableSwiftTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -251,7 +198,7 @@ }; }; }; - buildConfigurationList = A88CD9781A019AFF0064F706 /* Build configuration list for PBXProject "Testable Swift" */; + buildConfigurationList = A88CD9781A019AFF0064F706 /* Build configuration list for PBXProject "TestableSwift" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = en; hasScannedForEncodings = 0; @@ -262,65 +209,14 @@ mainGroup = A88CD9741A019AFF0064F706; productRefGroup = A88CD97E1A019AFF0064F706 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 5600E9331C3BBB8300235220 /* Products */; - ProjectRef = 5600E9321C3BBB8300235220 /* KIF.xcodeproj */; - }, - ); projectRoot = ""; targets = ( - A88CD97C1A019AFF0064F706 /* Testable Swift */, - A88CD9931A019AFF0064F706 /* Testable SwiftTests */, + A88CD97C1A019AFF0064F706 /* TestableSwift */, + A88CD9931A019AFF0064F706 /* TestableSwiftTests */, ); }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 548FAB961E6814BB00C01467 /* KIFFrameworkConsumer.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = KIFFrameworkConsumer.app; - remoteRef = 548FAB951E6814BB00C01467 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 548FAB981E6814BB00C01467 /* KIFFrameworkConsumerTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = KIFFrameworkConsumerTests.xctest; - remoteRef = 548FAB971E6814BB00C01467 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5600E93B1C3BBB8300235220 /* libKIF.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libKIF.a; - remoteRef = 5600E93A1C3BBB8300235220 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5600E93D1C3BBB8300235220 /* Test Host.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "Test Host.app"; - remoteRef = 5600E93C1C3BBB8300235220 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5600E93F1C3BBB8300235220 /* KIF Tests - XCTest.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "KIF Tests - XCTest.xctest"; - remoteRef = 5600E93E1C3BBB8300235220 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5600E9411C3BBB8300235220 /* KIF.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = KIF.framework; - remoteRef = 5600E9401C3BBB8300235220 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ A88CD97B1A019AFF0064F706 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -336,6 +232,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 62582AF22C9CB00E00F800BF /* KIF in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -364,14 +261,9 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 62F81B0C1EBBD094009B2400 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = KIFFramework; - targetProxy = 62F81B0B1EBBD094009B2400 /* PBXContainerItemProxy */; - }; A88CD9961A019AFF0064F706 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A88CD97C1A019AFF0064F706 /* Testable Swift */; + target = A88CD97C1A019AFF0064F706 /* TestableSwift */; targetProxy = A88CD9951A019AFF0064F706 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -492,7 +384,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -501,8 +394,11 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = "Testable Swift/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + INFOPLIST_FILE = TestableSwift/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.squareup.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; @@ -515,8 +411,11 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = "Testable Swift/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + INFOPLIST_FILE = TestableSwift/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.squareup.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; @@ -534,8 +433,12 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = "Testable SwiftTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + INFOPLIST_FILE = TestableSwiftTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_CFLAGS = ( "-DDEPRECATE_KIF_SYSTEM=1", "-DDEPRECATE_KIF_TESTER=1", @@ -548,11 +451,11 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.squareup.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Testable SwiftTests/Testable SwiftTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "TestableSwiftTests/TestableSwiftTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Testable Swift.app/Testable Swift"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestableSwift.app/TestableSwift"; }; name = Debug; }; @@ -561,8 +464,12 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ENABLE_MODULES = YES; - INFOPLIST_FILE = "Testable SwiftTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + INFOPLIST_FILE = TestableSwiftTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = ( "$(inherited)", "-framework", @@ -571,17 +478,17 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.squareup.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Testable SwiftTests/Testable SwiftTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "TestableSwiftTests/TestableSwiftTests-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Testable Swift.app/Testable Swift"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestableSwift.app/TestableSwift"; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - A88CD9781A019AFF0064F706 /* Build configuration list for PBXProject "Testable Swift" */ = { + A88CD9781A019AFF0064F706 /* Build configuration list for PBXProject "TestableSwift" */ = { isa = XCConfigurationList; buildConfigurations = ( A88CD99C1A019AFF0064F706 /* Debug */, @@ -590,7 +497,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A88CD99E1A019AFF0064F706 /* Build configuration list for PBXNativeTarget "Testable Swift" */ = { + A88CD99E1A019AFF0064F706 /* Build configuration list for PBXNativeTarget "TestableSwift" */ = { isa = XCConfigurationList; buildConfigurations = ( A88CD99F1A019AFF0064F706 /* Debug */, @@ -599,7 +506,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A88CD9A11A019AFF0064F706 /* Build configuration list for PBXNativeTarget "Testable SwiftTests" */ = { + A88CD9A11A019AFF0064F706 /* Build configuration list for PBXNativeTarget "TestableSwiftTests" */ = { isa = XCConfigurationList; buildConfigurations = ( A88CD9A21A019AFF0064F706 /* Debug */, @@ -609,6 +516,13 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 62FA513B2C9CB1A500E335D6 /* KIF */ = { + isa = XCSwiftPackageProductDependency; + productName = KIF; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = A88CD9751A019AFF0064F706 /* Project object */; } diff --git a/Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/xcshareddata/xcschemes/Testable Swift.xcscheme b/Documentation/Examples/TestableSwift/TestableSwift.xcodeproj/xcshareddata/xcschemes/TestableSwift.xcscheme similarity index 66% rename from Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/xcshareddata/xcschemes/Testable Swift.xcscheme rename to Documentation/Examples/TestableSwift/TestableSwift.xcodeproj/xcshareddata/xcschemes/TestableSwift.xcscheme index 0768715c2..6667dde16 100644 --- a/Documentation/Examples/Testable Swift/Testable Swift.xcodeproj/xcshareddata/xcschemes/Testable Swift.xcscheme +++ b/Documentation/Examples/TestableSwift/TestableSwift.xcodeproj/xcshareddata/xcschemes/TestableSwift.xcscheme @@ -15,9 +15,23 @@ + BuildableName = "TestableSwift.app" + BlueprintName = "TestableSwift" + ReferencedContainer = "container:TestableSwift.xcodeproj"> + + + + @@ -27,29 +41,27 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + + BuildableName = "TestableSwiftTests.xctest" + BlueprintName = "TestableSwiftTests" + ReferencedContainer = "container:TestableSwift.xcodeproj"> - - - - - - - - - - - - - + + BuildableName = "TestableSwift.app" + BlueprintName = "TestableSwift" + ReferencedContainer = "container:TestableSwift.xcodeproj"> - + diff --git a/Documentation/Examples/Testable Swift/Testable Swift/AppDelegate.swift b/Documentation/Examples/TestableSwift/TestableSwift/AppDelegate.swift similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/AppDelegate.swift rename to Documentation/Examples/TestableSwift/TestableSwift/AppDelegate.swift diff --git a/Documentation/Examples/Testable Swift/Testable Swift/Base.lproj/LaunchScreen.xib b/Documentation/Examples/TestableSwift/TestableSwift/Base.lproj/LaunchScreen.xib similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/Base.lproj/LaunchScreen.xib rename to Documentation/Examples/TestableSwift/TestableSwift/Base.lproj/LaunchScreen.xib diff --git a/Documentation/Examples/Testable Swift/Testable Swift/Base.lproj/Main.storyboard b/Documentation/Examples/TestableSwift/TestableSwift/Base.lproj/Main.storyboard similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/Base.lproj/Main.storyboard rename to Documentation/Examples/TestableSwift/TestableSwift/Base.lproj/Main.storyboard diff --git a/Documentation/Examples/Testable Swift/Testable Swift/Images.xcassets/AppIcon.appiconset/Contents.json b/Documentation/Examples/TestableSwift/TestableSwift/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/Images.xcassets/AppIcon.appiconset/Contents.json rename to Documentation/Examples/TestableSwift/TestableSwift/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/Documentation/Examples/Testable Swift/Testable Swift/Images.xcassets/Contents.json b/Documentation/Examples/TestableSwift/TestableSwift/Images.xcassets/Contents.json similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/Images.xcassets/Contents.json rename to Documentation/Examples/TestableSwift/TestableSwift/Images.xcassets/Contents.json diff --git a/Documentation/Examples/Testable Swift/Testable Swift/Info.plist b/Documentation/Examples/TestableSwift/TestableSwift/Info.plist similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/Info.plist rename to Documentation/Examples/TestableSwift/TestableSwift/Info.plist diff --git a/Documentation/Examples/Testable Swift/Testable Swift/MasterViewController.swift b/Documentation/Examples/TestableSwift/TestableSwift/MasterViewController.swift similarity index 100% rename from Documentation/Examples/Testable Swift/Testable Swift/MasterViewController.swift rename to Documentation/Examples/TestableSwift/TestableSwift/MasterViewController.swift diff --git a/Documentation/Examples/Testable Swift/Testable SwiftTests/Info.plist b/Documentation/Examples/TestableSwift/TestableSwiftTests/Info.plist similarity index 100% rename from Documentation/Examples/Testable Swift/Testable SwiftTests/Info.plist rename to Documentation/Examples/TestableSwift/TestableSwiftTests/Info.plist diff --git a/Documentation/Examples/Testable Swift/Testable SwiftTests/SimpleObjCTest.m b/Documentation/Examples/TestableSwift/TestableSwiftTests/SimpleObjCTest.m similarity index 96% rename from Documentation/Examples/Testable Swift/Testable SwiftTests/SimpleObjCTest.m rename to Documentation/Examples/TestableSwift/TestableSwiftTests/SimpleObjCTest.m index ecb6334f1..ea39c9e24 100644 --- a/Documentation/Examples/Testable Swift/Testable SwiftTests/SimpleObjCTest.m +++ b/Documentation/Examples/TestableSwift/TestableSwiftTests/SimpleObjCTest.m @@ -8,7 +8,7 @@ // which Square, Inc. licenses this file to you. #import -#import +@import KIF; @interface SimpleObjCTest : KIFTestCase diff --git a/Documentation/Examples/Testable Swift/Testable SwiftTests/SimpleSwiftTest.swift b/Documentation/Examples/TestableSwift/TestableSwiftTests/SimpleSwiftTest.swift similarity index 100% rename from Documentation/Examples/Testable Swift/Testable SwiftTests/SimpleSwiftTest.swift rename to Documentation/Examples/TestableSwift/TestableSwiftTests/SimpleSwiftTest.swift diff --git a/Documentation/Examples/Testable Swift/Testable SwiftTests/Testable SwiftTests-Bridging-Header.h b/Documentation/Examples/TestableSwift/TestableSwiftTests/TestableSwiftTests-Bridging-Header.h similarity index 83% rename from Documentation/Examples/Testable Swift/Testable SwiftTests/Testable SwiftTests-Bridging-Header.h rename to Documentation/Examples/TestableSwift/TestableSwiftTests/TestableSwiftTests-Bridging-Header.h index 12c223598..196f6921a 100644 --- a/Documentation/Examples/Testable Swift/Testable SwiftTests/Testable SwiftTests-Bridging-Header.h +++ b/Documentation/Examples/TestableSwift/TestableSwiftTests/TestableSwiftTests-Bridging-Header.h @@ -2,4 +2,4 @@ // Use this file to import your target's public headers that you would like to expose to Swift. // -#import +#import "KIF.h" diff --git a/Documentation/Examples/Testable Swift/Testable SwiftTests/Testable_SwiftTests.swift b/Documentation/Examples/TestableSwift/TestableSwiftTests/Testable_SwiftTests.swift similarity index 100% rename from Documentation/Examples/Testable Swift/Testable SwiftTests/Testable_SwiftTests.swift rename to Documentation/Examples/TestableSwift/TestableSwiftTests/Testable_SwiftTests.swift diff --git a/KIF.xcodeproj/project.pbxproj b/KIF.xcodeproj/project.pbxproj index 504824c66..9d0492004 100644 --- a/KIF.xcodeproj/project.pbxproj +++ b/KIF.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 0E27A9EE1B45B53D00A6DE6E /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9AD81F91AA180B900B369FD /* IOKit.framework */; }; - 22191DFC24BF7944004CAA18 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 22191DFB24BF7944004CAA18 /* Default-568h@2x.png */; }; 2229D59525BEF47D0093296C /* KIFUITestActor-IdentifierTests.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D53E25BEF47D0093296C /* KIFUITestActor-IdentifierTests.h */; settings = {ATTRIBUTES = (Public, ); }; }; 2229D59625BEF47D0093296C /* KIFUITestActor-IdentifierTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D53F25BEF47D0093296C /* KIFUITestActor-IdentifierTests.m */; }; 2229D59725BEF47D0093296C /* KIFTouchVisualizerViewCoordinator.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D54125BEF47D0093296C /* KIFTouchVisualizerViewCoordinator.m */; }; @@ -90,86 +89,6 @@ 2229D5E525BEF47D0093296C /* KIFTestActor.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D59125BEF47D0093296C /* KIFTestActor.m */; }; 2229D5E625BEF47D0093296C /* KIFUITestActor.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D59225BEF47D0093296C /* KIFUITestActor.h */; settings = {ATTRIBUTES = (Public, ); }; }; 2229D5E725BEF47D0093296C /* UIDatePicker+KIFPrivateAPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D59425BEF47D0093296C /* UIDatePicker+KIFPrivateAPI.h */; }; - 22B1372625D6E27F00D88061 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B1372525D6E27F00D88061 /* IOKit.framework */; }; - 22B1372D25D6E32700D88061 /* NSException-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D54A25BEF47D0093296C /* NSException-KIFAdditions.m */; }; - 22B1372E25D6E32700D88061 /* UIEvent+KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D55725BEF47D0093296C /* UIEvent+KIFAdditions.h */; }; - 22B1372F25D6E32700D88061 /* UIView-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D56525BEF47D0093296C /* UIView-KIFAdditions.m */; }; - 22B1373025D6E32700D88061 /* UIAutomationHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D58C25BEF47D0093296C /* UIAutomationHelper.m */; }; - 22B1373125D6E32700D88061 /* KIFSystemTestActor.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D57825BEF47D0093296C /* KIFSystemTestActor.m */; }; - 22B1373225D6E32700D88061 /* KIFUITestActor_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D58325BEF47D0093296C /* KIFUITestActor_Private.h */; }; - 22B1373325D6E32700D88061 /* NSPredicate+KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D56F25BEF47D0093296C /* NSPredicate+KIFAdditions.m */; }; - 22B1373425D6E32700D88061 /* XCTestCase-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D56E25BEF47D0093296C /* XCTestCase-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1373525D6E32700D88061 /* UIDatePicker+KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D57125BEF47D0093296C /* UIDatePicker+KIFAdditions.h */; }; - 22B1373625D6E32700D88061 /* UIEvent+KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D56B25BEF47D0093296C /* UIEvent+KIFAdditions.m */; }; - 22B1373825D6E32700D88061 /* KIFEventVisualizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D54225BEF47D0093296C /* KIFEventVisualizer.h */; }; - 22B1373925D6E32700D88061 /* UITouch-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D55125BEF47D0093296C /* UITouch-KIFAdditions.m */; }; - 22B1373A25D6E32700D88061 /* KIFUIObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D58825BEF47D0093296C /* KIFUIObject.m */; }; - 22B1373B25D6E32700D88061 /* CALayer-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D55925BEF47D0093296C /* CALayer-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1373C25D6E32700D88061 /* KIFTestActor.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D58125BEF47D0093296C /* KIFTestActor.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1373D25D6E32700D88061 /* KIFTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D59025BEF47D0093296C /* KIFTestCase.m */; }; - 22B1373E25D6E32700D88061 /* KIFAccessibilityEnabler.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D58E25BEF47D0093296C /* KIFAccessibilityEnabler.m */; }; - 22B1373F25D6E32700D88061 /* KIFEventVisualizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D54425BEF47D0093296C /* KIFEventVisualizer.m */; }; - 22B1374025D6E32700D88061 /* UIScrollView-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D54F25BEF47D0093296C /* UIScrollView-KIFAdditions.m */; }; - 22B1374125D6E32700D88061 /* KIFTypist.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D57A25BEF47D0093296C /* KIFTypist.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1374225D6E32700D88061 /* UIApplication-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D54C25BEF47D0093296C /* UIApplication-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1374325D6E32700D88061 /* XCTestCase-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D55C25BEF47D0093296C /* XCTestCase-KIFAdditions.m */; }; - 22B1374425D6E32700D88061 /* CGGeometry-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D55F25BEF47D0093296C /* CGGeometry-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1374525D6E32700D88061 /* UIScrollView-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D55D25BEF47D0093296C /* UIScrollView-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1374625D6E32700D88061 /* KIFTouchVisualizerViewCoordinator.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D54125BEF47D0093296C /* KIFTouchVisualizerViewCoordinator.m */; }; - 22B1374725D6E32700D88061 /* LoadableCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D56D25BEF47D0093296C /* LoadableCategory.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1374825D6E32700D88061 /* UIDatePicker+KIFPrivateAPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D59425BEF47D0093296C /* UIDatePicker+KIFPrivateAPI.h */; }; - 22B1374A25D6E32700D88061 /* UIScreen+KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D54925BEF47D0093296C /* UIScreen+KIFAdditions.m */; }; - 22B1374B25D6E32700D88061 /* KIFAccessibilityEnabler.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D57B25BEF47D0093296C /* KIFAccessibilityEnabler.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1374C25D6E32700D88061 /* UIApplication-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D56025BEF47D0093296C /* UIApplication-KIFAdditions.m */; }; - 22B1374D25D6E32700D88061 /* NSFileManager-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D55425BEF47D0093296C /* NSFileManager-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1374E25D6E32700D88061 /* NSBundle-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D57025BEF47D0093296C /* NSBundle-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1374F25D6E32700D88061 /* NSString+KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D56125BEF47D0093296C /* NSString+KIFAdditions.h */; }; - 22B1375025D6E32700D88061 /* KIFTouchVisualizerView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D54325BEF47D0093296C /* KIFTouchVisualizerView.h */; }; - 22B1375125D6E32700D88061 /* CGGeometry-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D54D25BEF47D0093296C /* CGGeometry-KIFAdditions.m */; }; - 22B1375225D6E32700D88061 /* NSPredicate+KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D55B25BEF47D0093296C /* NSPredicate+KIFAdditions.h */; }; - 22B1375325D6E32700D88061 /* KIFTextInputTraitsOverrides.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D58B25BEF47D0093296C /* KIFTextInputTraitsOverrides.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1375425D6E32700D88061 /* KIFUITestActor.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D59225BEF47D0093296C /* KIFUITestActor.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1375525D6E32700D88061 /* KIFUIViewTestActor.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D58D25BEF47D0093296C /* KIFUIViewTestActor.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1375625D6E32700D88061 /* CALayer-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D57225BEF47D0093296C /* CALayer-KIFAdditions.m */; }; - 22B1375725D6E32700D88061 /* KIFUIObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D57725BEF47D0093296C /* KIFUIObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1375825D6E32700D88061 /* KIFTouchVisualizerViewCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D54525BEF47D0093296C /* KIFTouchVisualizerViewCoordinator.h */; }; - 22B1375925D6E32700D88061 /* NSError-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D56C25BEF47D0093296C /* NSError-KIFAdditions.m */; }; - 22B1375A25D6E32700D88061 /* UIView-Debugging.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D56A25BEF47D0093296C /* UIView-Debugging.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1375B25D6E32700D88061 /* CAAnimation+KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D56725BEF47D0093296C /* CAAnimation+KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1375C25D6E32700D88061 /* KIFUITestActor-ConditionalTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D58725BEF47D0093296C /* KIFUITestActor-ConditionalTests.m */; }; - 22B1375D25D6E32700D88061 /* UITableView-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D56925BEF47D0093296C /* UITableView-KIFAdditions.m */; }; - 22B1375E25D6E32700D88061 /* KIFTestStepValidation.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D57925BEF47D0093296C /* KIFTestStepValidation.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1375F25D6E32700D88061 /* KIFTextInputTraitsOverrides.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D57E25BEF47D0093296C /* KIFTextInputTraitsOverrides.m */; }; - 22B1376025D6E32700D88061 /* UIScreen+KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D56325BEF47D0093296C /* UIScreen+KIFAdditions.h */; }; - 22B1376125D6E32700D88061 /* KIFUITestActor-IdentifierTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D53F25BEF47D0093296C /* KIFUITestActor-IdentifierTests.m */; }; - 22B1376225D6E32700D88061 /* UITableView-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D55225BEF47D0093296C /* UITableView-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1376325D6E32700D88061 /* NSString+KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D54B25BEF47D0093296C /* NSString+KIFAdditions.m */; }; - 22B1376425D6E32700D88061 /* UIAccessibilityElement-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D54825BEF47D0093296C /* UIAccessibilityElement-KIFAdditions.m */; }; - 22B1376525D6E32700D88061 /* KIFTypist.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D58F25BEF47D0093296C /* KIFTypist.m */; }; - 22B1376625D6E32700D88061 /* KIFUIViewTestActor.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D57C25BEF47D0093296C /* KIFUIViewTestActor.m */; }; - 22B1376725D6E32700D88061 /* UIWindow-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D55E25BEF47D0093296C /* UIWindow-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1376825D6E32700D88061 /* UIAutomationHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D57D25BEF47D0093296C /* UIAutomationHelper.h */; }; - 22B1376925D6E32700D88061 /* NSError-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D55625BEF47D0093296C /* NSError-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1376A25D6E32700D88061 /* UIDatePicker+KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D55825BEF47D0093296C /* UIDatePicker+KIFAdditions.m */; }; - 22B1376B25D6E32700D88061 /* UIView-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D55525BEF47D0093296C /* UIView-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1376C25D6E32700D88061 /* KIFTestCase.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D58225BEF47D0093296C /* KIFTestCase.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1376D25D6E32700D88061 /* KIFUITestActor-ConditionalTests.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D57625BEF47D0093296C /* KIFUITestActor-ConditionalTests.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1376E25D6E32700D88061 /* IOHIDEvent+KIF.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D58425BEF47D0093296C /* IOHIDEvent+KIF.m */; }; - 22B1376F25D6E32700D88061 /* KIFTestActor_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D58625BEF47D0093296C /* KIFTestActor_Private.h */; }; - 22B1377025D6E32700D88061 /* CAAnimation+KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D55325BEF47D0093296C /* CAAnimation+KIFAdditions.m */; }; - 22B1377125D6E32700D88061 /* KIFUITestActor-IdentifierTests.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D53E25BEF47D0093296C /* KIFUITestActor-IdentifierTests.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1377225D6E32700D88061 /* NSException-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D56225BEF47D0093296C /* NSException-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1377325D6E32700D88061 /* UIWindow-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D54E25BEF47D0093296C /* UIWindow-KIFAdditions.m */; }; - 22B1377425D6E32700D88061 /* KIFTestActor.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D59125BEF47D0093296C /* KIFTestActor.m */; }; - 22B1377525D6E32700D88061 /* NSBundle-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D55A25BEF47D0093296C /* NSBundle-KIFAdditions.m */; }; - 22B1377625D6E32700D88061 /* NSFileManager-KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D56625BEF47D0093296C /* NSFileManager-KIFAdditions.m */; }; - 22B1377725D6E32700D88061 /* UIAccessibilityElement-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D56425BEF47D0093296C /* UIAccessibilityElement-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1377825D6E32700D88061 /* KIFTestStepValidation.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D58525BEF47D0093296C /* KIFTestStepValidation.m */; }; - 22B1377925D6E32700D88061 /* KIFSystemTestActor.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D58925BEF47D0093296C /* KIFSystemTestActor.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1377A25D6E32700D88061 /* KIFUITestActor.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D58025BEF47D0093296C /* KIFUITestActor.m */; }; - 22B1377B25D6E32700D88061 /* UITouch-KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2229D56825BEF47D0093296C /* UITouch-KIFAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 22B1377C25D6E32700D88061 /* UIView-Debugging.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D55025BEF47D0093296C /* UIView-Debugging.m */; }; - 22B1377D25D6E32700D88061 /* KIFTouchVisualizerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2229D54625BEF47D0093296C /* KIFTouchVisualizerView.m */; }; 2CDEE1CB181DBED200DF6E63 /* PickerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CDEE1CA181DBED200DF6E63 /* PickerController.m */; }; 3812FB611A1212A700335733 /* AnimationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3812FB601A1212A700335733 /* AnimationViewController.m */; }; 3812FB631A12188700335733 /* WaitForAnimationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3812FB621A12188700335733 /* WaitForAnimationTests.m */; }; @@ -184,31 +103,18 @@ 85DB94721C5A5D430025F83E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 85DB94711C5A5D430025F83E /* QuartzCore.framework */; }; 85DB94731C5A5FD50025F83E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 85DB94711C5A5D430025F83E /* QuartzCore.framework */; }; 85DB94741C5A5FE10025F83E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 85DB94711C5A5D430025F83E /* QuartzCore.framework */; }; - 85DB94751C5A5FEA0025F83E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 85DB94711C5A5D430025F83E /* QuartzCore.framework */; }; 8E654FC429D79BD8007F7811 /* OffscreenTests_ViewTestActor.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E654FC329D79BD8007F7811 /* OffscreenTests_ViewTestActor.m */; }; 8E654FCE29DA2FE7007F7811 /* UIWindow+KIFSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E654FCC29DA2FE7007F7811 /* UIWindow+KIFSwizzle.h */; }; - 8E654FCF29DA2FE7007F7811 /* UIWindow+KIFSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E654FCC29DA2FE7007F7811 /* UIWindow+KIFSwizzle.h */; }; 8E654FD029DA2FE7007F7811 /* UIWindow+KIFSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E654FCD29DA2FE7007F7811 /* UIWindow+KIFSwizzle.m */; }; - 8E654FD129DA2FE8007F7811 /* UIWindow+KIFSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E654FCD29DA2FE7007F7811 /* UIWindow+KIFSwizzle.m */; }; 8EAA1EE229D3AF7A008F6029 /* OffscreenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EAA1EE129D3AF7A008F6029 /* OffscreenViewController.m */; }; 8EAA1EE429D3B1F5008F6029 /* OffscreenTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EAA1EE329D3B1F5008F6029 /* OffscreenTests.m */; }; 8EC2CB1F29DB3D3B001BE493 /* NSObject+KIFSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = 8EC2CB1D29DB3D3B001BE493 /* NSObject+KIFSwizzle.h */; }; - 8EC2CB2029DB3D3B001BE493 /* NSObject+KIFSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = 8EC2CB1D29DB3D3B001BE493 /* NSObject+KIFSwizzle.h */; }; 8EC2CB2129DB3D3B001BE493 /* NSObject+KIFSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EC2CB1E29DB3D3B001BE493 /* NSObject+KIFSwizzle.m */; }; - 8EC2CB2229DB3D3B001BE493 /* NSObject+KIFSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EC2CB1E29DB3D3B001BE493 /* NSObject+KIFSwizzle.m */; }; 97E8A5CF1B0A62F700124E3B /* BackgroundViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 97E8A5CE1B0A62F700124E3B /* BackgroundViewController.m */; }; 97E8A5D11B0A63D100124E3B /* BackgroundTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 97E8A5D01B0A63D100124E3B /* BackgroundTests.m */; }; - 9CC881A91AD4CE39002CD34C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB072B413971AEA008AF393 /* UIKit.framework */; }; - 9CC881AA1AD4CE45002CD34C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9AD81F91AA180B900B369FD /* IOKit.framework */; }; - 9CC881AB1AD4CE47002CD34C /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EABD46AB1857A0EB00A5F081 /* XCTest.framework */; }; - 9CC881AC1AD4CE4B002CD34C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB0726B139719AC008AF393 /* Foundation.framework */; }; - 9CC881AD1AD4CE50002CD34C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9CC881A21AD4CAAC002CD34C /* CoreFoundation.framework */; }; - 9CC967401AD4B1B600576D13 /* KIF.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CC9673F1AD4B1B600576D13 /* KIF.h */; settings = {ATTRIBUTES = (Public, ); }; }; ACA242E42C3DA55400E6F1B6 /* CustomActionTests_ViewTestActor.m in Sources */ = {isa = PBXBuildFile; fileRef = ACA242E32C3DA55400E6F1B6 /* CustomActionTests_ViewTestActor.m */; }; ACA242E72C3DB47400E6F1B6 /* UIAccessibilityCustomAction+KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = ACA242E52C3DB46A00E6F1B6 /* UIAccessibilityCustomAction+KIFAdditions.m */; }; ACA242E92C3DB4EA00E6F1B6 /* UIAccessibilityCustomAction+KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = ACA242E82C3DB4B000E6F1B6 /* UIAccessibilityCustomAction+KIFAdditions.h */; settings = {ATTRIBUTES = (Private, ); }; }; - ACA242EA2C3DB4EB00E6F1B6 /* UIAccessibilityCustomAction+KIFAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = ACA242E82C3DB4B000E6F1B6 /* UIAccessibilityCustomAction+KIFAdditions.h */; settings = {ATTRIBUTES = (Private, ); }; }; - ACA242EB2C3DC32500E6F1B6 /* UIAccessibilityCustomAction+KIFAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = ACA242E52C3DB46A00E6F1B6 /* UIAccessibilityCustomAction+KIFAdditions.m */; }; AE62FCD01A1D20E5002B10DA /* WebViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = AE62FCCF1A1D20E5002B10DA /* WebViewTests.m */; }; AE62FCD61A1D2447002B10DA /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AE62FCD51A1D2447002B10DA /* WebViewController.m */; }; AE62FCD81A1D2667002B10DA /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = AE62FCD71A1D2667002B10DA /* index.html */; }; @@ -218,7 +124,6 @@ BCA1542A23312E7300CDC69F /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA1542923312E7300CDC69F /* WebKit.framework */; }; BCA1542B23312E8100CDC69F /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA1542923312E7300CDC69F /* WebKit.framework */; }; BCA1542C23312E8F00CDC69F /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA1542923312E7300CDC69F /* WebKit.framework */; }; - BCA1542D23312E9A00CDC69F /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA1542923312E7300CDC69F /* WebKit.framework */; }; BFE470901C7F44F700580EF9 /* UIScreen+KIFAdditionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BFE4708F1C7F44F700580EF9 /* UIScreen+KIFAdditionsTests.m */; }; CD19A99F1F46482200BF0325 /* CustomPickerController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD19A99E1F46482200BF0325 /* CustomPickerController.m */; }; CD4E91F01F479A8C005D530C /* CustomPickerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CD4E91EF1F479A8C005D530C /* CustomPickerTests.m */; }; @@ -290,13 +195,6 @@ FA8DA74F1A7711E900E0C644 /* WaitForTappableViewTests_ViewTestActor.m in Sources */ = {isa = PBXBuildFile; fileRef = FA8DA74E1A7711E900E0C644 /* WaitForTappableViewTests_ViewTestActor.m */; }; FA8DA7511A7712E300E0C644 /* WaitForAnimationTests_ViewTestActor.m in Sources */ = {isa = PBXBuildFile; fileRef = FA8DA7501A7712E300E0C644 /* WaitForAnimationTests_ViewTestActor.m */; }; FA914DB61A7707550073BB19 /* TypingTests_ViewTestActor.m in Sources */ = {isa = PBXBuildFile; fileRef = FA914DB51A7707550073BB19 /* TypingTests_ViewTestActor.m */; }; - FAB8A0001CAC546A00C6DFC1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = FAB89FFF1CAC546A00C6DFC1 /* main.m */; }; - FAB8A0031CAC546A00C6DFC1 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FAB8A0021CAC546A00C6DFC1 /* AppDelegate.m */; }; - FAB8A0061CAC546A00C6DFC1 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FAB8A0051CAC546A00C6DFC1 /* ViewController.m */; }; - FAB8A0091CAC546A00C6DFC1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FAB8A0071CAC546A00C6DFC1 /* Main.storyboard */; }; - FAB8A00B1CAC546A00C6DFC1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FAB8A00A1CAC546A00C6DFC1 /* Assets.xcassets */; }; - FAB8A0191CAC546A00C6DFC1 /* KIFFrameworkConsumerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = FAB8A0181CAC546A00C6DFC1 /* KIFFrameworkConsumerTests.m */; }; - FAB8A0231CAC547400C6DFC1 /* KIF.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9CC9673B1AD4B1B600576D13 /* KIF.framework */; }; FAC3A5621C5C0CD1003B681E /* PullToRefreshTests_ViewTestActor.m in Sources */ = {isa = PBXBuildFile; fileRef = FAC3A5611C5C0CD1003B681E /* PullToRefreshTests_ViewTestActor.m */; }; FAE2D7631A76DDA90068B440 /* TappingTests_ViewTestActor.m in Sources */ = {isa = PBXBuildFile; fileRef = FAE2D7621A76DDA90068B440 /* TappingTests_ViewTestActor.m */; }; /* End PBXBuildFile section */ @@ -309,18 +207,10 @@ remoteGlobalIDString = EB60ECC0177F8C83005A041A; remoteInfo = "Test Host"; }; - FAB8A0151CAC546A00C6DFC1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = AAB0725F139719AC008AF393 /* Project object */; - proxyType = 1; - remoteGlobalIDString = FAB89FFB1CAC546900C6DFC1; - remoteInfo = KIFFrameworkConsumer; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 22191DFA24BF793F004CAA18 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainStoryboard.storyboard; sourceTree = ""; }; - 22191DFB24BF7944004CAA18 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 221FF9A2252231030058F471 /* TestPlan.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = TestPlan.xctestplan; sourceTree = ""; }; 2229D53E25BEF47D0093296C /* KIFUITestActor-IdentifierTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KIFUITestActor-IdentifierTests.h"; sourceTree = ""; }; 2229D53F25BEF47D0093296C /* KIFUITestActor-IdentifierTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KIFUITestActor-IdentifierTests.m"; sourceTree = ""; }; @@ -427,7 +317,6 @@ 97E8A5CE1B0A62F700124E3B /* BackgroundViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BackgroundViewController.m; sourceTree = ""; }; 97E8A5D01B0A63D100124E3B /* BackgroundTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BackgroundTests.m; sourceTree = ""; }; 9CC881A21AD4CAAC002CD34C /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; - 9CC9673B1AD4B1B600576D13 /* KIF.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = KIF.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9CC9673E1AD4B1B600576D13 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9CC9673F1AD4B1B600576D13 /* KIF.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KIF.h; sourceTree = ""; }; AAB0726B139719AC008AF393 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -509,37 +398,11 @@ FA8DA74E1A7711E900E0C644 /* WaitForTappableViewTests_ViewTestActor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WaitForTappableViewTests_ViewTestActor.m; sourceTree = ""; }; FA8DA7501A7712E300E0C644 /* WaitForAnimationTests_ViewTestActor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WaitForAnimationTests_ViewTestActor.m; sourceTree = ""; }; FA914DB51A7707550073BB19 /* TypingTests_ViewTestActor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TypingTests_ViewTestActor.m; sourceTree = ""; }; - FAB89FFC1CAC546900C6DFC1 /* KIFFrameworkConsumer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KIFFrameworkConsumer.app; sourceTree = BUILT_PRODUCTS_DIR; }; - FAB89FFF1CAC546A00C6DFC1 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - FAB8A0011CAC546A00C6DFC1 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - FAB8A0021CAC546A00C6DFC1 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - FAB8A0041CAC546A00C6DFC1 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - FAB8A0051CAC546A00C6DFC1 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - FAB8A0081CAC546A00C6DFC1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - FAB8A00A1CAC546A00C6DFC1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - FAB8A00F1CAC546A00C6DFC1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - FAB8A0141CAC546A00C6DFC1 /* KIFFrameworkConsumerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KIFFrameworkConsumerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - FAB8A0181CAC546A00C6DFC1 /* KIFFrameworkConsumerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KIFFrameworkConsumerTests.m; sourceTree = ""; }; - FAB8A01A1CAC546A00C6DFC1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; FAC3A5611C5C0CD1003B681E /* PullToRefreshTests_ViewTestActor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PullToRefreshTests_ViewTestActor.m; sourceTree = ""; }; FAE2D7621A76DDA90068B440 /* TappingTests_ViewTestActor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TappingTests_ViewTestActor.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 9CC967371AD4B1B600576D13 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - BCA1542D23312E9A00CDC69F /* WebKit.framework in Frameworks */, - 85DB94751C5A5FEA0025F83E /* QuartzCore.framework in Frameworks */, - 9CC881A91AD4CE39002CD34C /* UIKit.framework in Frameworks */, - 9CC881AC1AD4CE4B002CD34C /* Foundation.framework in Frameworks */, - 9CC881AA1AD4CE45002CD34C /* IOKit.framework in Frameworks */, - 9CC881AD1AD4CE50002CD34C /* CoreFoundation.framework in Frameworks */, - 9CC881AB1AD4CE47002CD34C /* XCTest.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; EABD468C1857A0C700A5F081 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -582,22 +445,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - FAB89FF91CAC546900C6DFC1 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - FAB8A0111CAC546A00C6DFC1 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 22B1372625D6E27F00D88061 /* IOKit.framework in Frameworks */, - FAB8A0231CAC547400C6DFC1 /* KIF.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -749,13 +596,10 @@ AAB0725D139719AC008AF393 = { isa = PBXGroup; children = ( - 22191DFB24BF7944004CAA18 /* Default-568h@2x.png */, EB60ECBC177F8C51005A041A /* KIF */, EB60ECC6177F8C83005A041A /* Test Host */, EB60ECEF177F8DB3005A041A /* KIF Tests */, 9CC9673C1AD4B1B600576D13 /* KIF Framework */, - FAB89FFD1CAC546A00C6DFC1 /* KIFFrameworkConsumer */, - FAB8A0171CAC546A00C6DFC1 /* KIFFrameworkConsumerTests */, AAB0726A139719AC008AF393 /* Frameworks */, AAB07269139719AC008AF393 /* Products */, ); @@ -767,9 +611,6 @@ EB60ECC1177F8C83005A041A /* Test Host.app */, EABD46AA1857A0C700A5F081 /* libKIF.a */, EABD46CD1857A0F300A5F081 /* KIF Tests - XCTest.xctest */, - 9CC9673B1AD4B1B600576D13 /* KIF.framework */, - FAB89FFC1CAC546900C6DFC1 /* KIFFrameworkConsumer.app */, - FAB8A0141CAC546A00C6DFC1 /* KIFFrameworkConsumerTests.xctest */, ); name = Products; sourceTree = ""; @@ -937,93 +778,9 @@ name = "KIFUIViewTestActor Tests"; sourceTree = ""; }; - FAB89FFD1CAC546A00C6DFC1 /* KIFFrameworkConsumer */ = { - isa = PBXGroup; - children = ( - FAB8A0011CAC546A00C6DFC1 /* AppDelegate.h */, - FAB8A0021CAC546A00C6DFC1 /* AppDelegate.m */, - FAB8A0041CAC546A00C6DFC1 /* ViewController.h */, - FAB8A0051CAC546A00C6DFC1 /* ViewController.m */, - FAB8A0071CAC546A00C6DFC1 /* Main.storyboard */, - FAB8A00A1CAC546A00C6DFC1 /* Assets.xcassets */, - FAB8A00F1CAC546A00C6DFC1 /* Info.plist */, - FAB89FFE1CAC546A00C6DFC1 /* Supporting Files */, - ); - path = KIFFrameworkConsumer; - sourceTree = ""; - }; - FAB89FFE1CAC546A00C6DFC1 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - FAB89FFF1CAC546A00C6DFC1 /* main.m */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - FAB8A0171CAC546A00C6DFC1 /* KIFFrameworkConsumerTests */ = { - isa = PBXGroup; - children = ( - FAB8A0181CAC546A00C6DFC1 /* KIFFrameworkConsumerTests.m */, - FAB8A01A1CAC546A00C6DFC1 /* Info.plist */, - ); - path = KIFFrameworkConsumerTests; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 9CC967381AD4B1B600576D13 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 22B1373825D6E32700D88061 /* KIFEventVisualizer.h in Headers */, - 22B1373425D6E32700D88061 /* XCTestCase-KIFAdditions.h in Headers */, - 22B1375325D6E32700D88061 /* KIFTextInputTraitsOverrides.h in Headers */, - 22B1377725D6E32700D88061 /* UIAccessibilityElement-KIFAdditions.h in Headers */, - 22B1376925D6E32700D88061 /* NSError-KIFAdditions.h in Headers */, - 22B1377125D6E32700D88061 /* KIFUITestActor-IdentifierTests.h in Headers */, - 22B1377225D6E32700D88061 /* NSException-KIFAdditions.h in Headers */, - 22B1374525D6E32700D88061 /* UIScrollView-KIFAdditions.h in Headers */, - 22B1374E25D6E32700D88061 /* NSBundle-KIFAdditions.h in Headers */, - 22B1374225D6E32700D88061 /* UIApplication-KIFAdditions.h in Headers */, - 22B1374B25D6E32700D88061 /* KIFAccessibilityEnabler.h in Headers */, - 22B1377B25D6E32700D88061 /* UITouch-KIFAdditions.h in Headers */, - 22B1376825D6E32700D88061 /* UIAutomationHelper.h in Headers */, - 22B1372E25D6E32700D88061 /* UIEvent+KIFAdditions.h in Headers */, - 22B1373B25D6E32700D88061 /* CALayer-KIFAdditions.h in Headers */, - 22B1375825D6E32700D88061 /* KIFTouchVisualizerViewCoordinator.h in Headers */, - 22B1375E25D6E32700D88061 /* KIFTestStepValidation.h in Headers */, - 22B1376025D6E32700D88061 /* UIScreen+KIFAdditions.h in Headers */, - 22B1374825D6E32700D88061 /* UIDatePicker+KIFPrivateAPI.h in Headers */, - 22B1374725D6E32700D88061 /* LoadableCategory.h in Headers */, - 22B1376C25D6E32700D88061 /* KIFTestCase.h in Headers */, - 22B1373225D6E32700D88061 /* KIFUITestActor_Private.h in Headers */, - 22B1375725D6E32700D88061 /* KIFUIObject.h in Headers */, - 8E654FCF29DA2FE7007F7811 /* UIWindow+KIFSwizzle.h in Headers */, - 22B1375525D6E32700D88061 /* KIFUIViewTestActor.h in Headers */, - 22B1375B25D6E32700D88061 /* CAAnimation+KIFAdditions.h in Headers */, - 22B1375225D6E32700D88061 /* NSPredicate+KIFAdditions.h in Headers */, - 22B1374D25D6E32700D88061 /* NSFileManager-KIFAdditions.h in Headers */, - 22B1374125D6E32700D88061 /* KIFTypist.h in Headers */, - 22B1376225D6E32700D88061 /* UITableView-KIFAdditions.h in Headers */, - 9CC967401AD4B1B600576D13 /* KIF.h in Headers */, - 22B1373525D6E32700D88061 /* UIDatePicker+KIFAdditions.h in Headers */, - 8EC2CB2029DB3D3B001BE493 /* NSObject+KIFSwizzle.h in Headers */, - 22B1376F25D6E32700D88061 /* KIFTestActor_Private.h in Headers */, - 22B1375025D6E32700D88061 /* KIFTouchVisualizerView.h in Headers */, - ACA242EA2C3DB4EB00E6F1B6 /* UIAccessibilityCustomAction+KIFAdditions.h in Headers */, - 22B1377925D6E32700D88061 /* KIFSystemTestActor.h in Headers */, - 22B1376D25D6E32700D88061 /* KIFUITestActor-ConditionalTests.h in Headers */, - 22B1374F25D6E32700D88061 /* NSString+KIFAdditions.h in Headers */, - 22B1376B25D6E32700D88061 /* UIView-KIFAdditions.h in Headers */, - 22B1373C25D6E32700D88061 /* KIFTestActor.h in Headers */, - 22B1374425D6E32700D88061 /* CGGeometry-KIFAdditions.h in Headers */, - 22B1375A25D6E32700D88061 /* UIView-Debugging.h in Headers */, - 22B1376725D6E32700D88061 /* UIWindow-KIFAdditions.h in Headers */, - 22B1375425D6E32700D88061 /* KIFUITestActor.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; EABD46901857A0C700A5F081 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1097,24 +854,6 @@ /* End PBXLegacyTarget section */ /* Begin PBXNativeTarget section */ - 9CC9673A1AD4B1B600576D13 /* KIFFramework */ = { - isa = PBXNativeTarget; - buildConfigurationList = 9CC967541AD4B1B600576D13 /* Build configuration list for PBXNativeTarget "KIFFramework" */; - buildPhases = ( - 9CC967361AD4B1B600576D13 /* Sources */, - 9CC967371AD4B1B600576D13 /* Frameworks */, - 9CC967381AD4B1B600576D13 /* Headers */, - 9CC967391AD4B1B600576D13 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = KIFFramework; - productName = KIFFramework; - productReference = 9CC9673B1AD4B1B600576D13 /* KIF.framework */; - productType = "com.apple.product-type.framework"; - }; EABD46791857A0C700A5F081 /* KIF */ = { isa = PBXNativeTarget; buildConfigurationList = EABD46A61857A0C700A5F081 /* Build configuration list for PBXNativeTarget "KIF" */; @@ -1167,41 +906,6 @@ productReference = EB60ECC1177F8C83005A041A /* Test Host.app */; productType = "com.apple.product-type.application"; }; - FAB89FFB1CAC546900C6DFC1 /* KIFFrameworkConsumer */ = { - isa = PBXNativeTarget; - buildConfigurationList = FAB8A0211CAC546A00C6DFC1 /* Build configuration list for PBXNativeTarget "KIFFrameworkConsumer" */; - buildPhases = ( - FAB89FF81CAC546900C6DFC1 /* Sources */, - FAB89FF91CAC546900C6DFC1 /* Frameworks */, - FAB89FFA1CAC546900C6DFC1 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = KIFFrameworkConsumer; - productName = KIFFrameworkConsumer; - productReference = FAB89FFC1CAC546900C6DFC1 /* KIFFrameworkConsumer.app */; - productType = "com.apple.product-type.application"; - }; - FAB8A0131CAC546A00C6DFC1 /* KIFFrameworkConsumerTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = FAB8A0221CAC546A00C6DFC1 /* Build configuration list for PBXNativeTarget "KIFFrameworkConsumerTests" */; - buildPhases = ( - FAB8A0101CAC546A00C6DFC1 /* Sources */, - FAB8A0111CAC546A00C6DFC1 /* Frameworks */, - FAB8A0121CAC546A00C6DFC1 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - FAB8A0161CAC546A00C6DFC1 /* PBXTargetDependency */, - ); - name = KIFFrameworkConsumerTests; - productName = KIFFrameworkConsumerTests; - productReference = FAB8A0141CAC546A00C6DFC1 /* KIFFrameworkConsumerTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -1210,18 +914,6 @@ attributes = { LastTestingUpgradeCheck = 0510; LastUpgradeCheck = 1150; - TargetAttributes = { - 9CC9673A1AD4B1B600576D13 = { - CreatedOnToolsVersion = 6.2; - }; - FAB89FFB1CAC546900C6DFC1 = { - CreatedOnToolsVersion = 7.1.1; - }; - FAB8A0131CAC546A00C6DFC1 = { - CreatedOnToolsVersion = 7.1.1; - TestTargetID = FAB89FFB1CAC546900C6DFC1; - }; - }; }; buildConfigurationList = AAB07262139719AC008AF393 /* Build configuration list for PBXProject "KIF" */; compatibilityVersion = "Xcode 3.2"; @@ -1240,21 +932,11 @@ A88930091685088F00FC7C63 /* KIF Documentation */, EB60ECC0177F8C83005A041A /* Test Host */, EABD46AD1857A0F300A5F081 /* KIF Tests */, - 9CC9673A1AD4B1B600576D13 /* KIFFramework */, - FAB89FFB1CAC546900C6DFC1 /* KIFFrameworkConsumer */, - FAB8A0131CAC546A00C6DFC1 /* KIFFrameworkConsumerTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 9CC967391AD4B1B600576D13 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; EABD46C61857A0F300A5F081 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1277,74 +959,9 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - FAB89FFA1CAC546900C6DFC1 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - FAB8A00B1CAC546A00C6DFC1 /* Assets.xcassets in Resources */, - FAB8A0091CAC546A00C6DFC1 /* Main.storyboard in Resources */, - 22191DFC24BF7944004CAA18 /* Default-568h@2x.png in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - FAB8A0121CAC546A00C6DFC1 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 9CC967361AD4B1B600576D13 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 22B1375625D6E32700D88061 /* CALayer-KIFAdditions.m in Sources */, - 22B1374625D6E32700D88061 /* KIFTouchVisualizerViewCoordinator.m in Sources */, - 22B1376125D6E32700D88061 /* KIFUITestActor-IdentifierTests.m in Sources */, - 22B1373D25D6E32700D88061 /* KIFTestCase.m in Sources */, - 22B1376A25D6E32700D88061 /* UIDatePicker+KIFAdditions.m in Sources */, - 22B1375F25D6E32700D88061 /* KIFTextInputTraitsOverrides.m in Sources */, - 22B1375925D6E32700D88061 /* NSError-KIFAdditions.m in Sources */, - 22B1377025D6E32700D88061 /* CAAnimation+KIFAdditions.m in Sources */, - 8E654FD129DA2FE8007F7811 /* UIWindow+KIFSwizzle.m in Sources */, - 22B1373325D6E32700D88061 /* NSPredicate+KIFAdditions.m in Sources */, - 22B1376E25D6E32700D88061 /* IOHIDEvent+KIF.m in Sources */, - 22B1375D25D6E32700D88061 /* UITableView-KIFAdditions.m in Sources */, - 22B1372D25D6E32700D88061 /* NSException-KIFAdditions.m in Sources */, - 22B1377C25D6E32700D88061 /* UIView-Debugging.m in Sources */, - 22B1377A25D6E32700D88061 /* KIFUITestActor.m in Sources */, - 22B1372F25D6E32700D88061 /* UIView-KIFAdditions.m in Sources */, - 22B1373625D6E32700D88061 /* UIEvent+KIFAdditions.m in Sources */, - 22B1373F25D6E32700D88061 /* KIFEventVisualizer.m in Sources */, - 22B1373E25D6E32700D88061 /* KIFAccessibilityEnabler.m in Sources */, - 22B1377525D6E32700D88061 /* NSBundle-KIFAdditions.m in Sources */, - 22B1373025D6E32700D88061 /* UIAutomationHelper.m in Sources */, - 22B1376325D6E32700D88061 /* NSString+KIFAdditions.m in Sources */, - 22B1377625D6E32700D88061 /* NSFileManager-KIFAdditions.m in Sources */, - 22B1375125D6E32700D88061 /* CGGeometry-KIFAdditions.m in Sources */, - 22B1377325D6E32700D88061 /* UIWindow-KIFAdditions.m in Sources */, - 22B1376625D6E32700D88061 /* KIFUIViewTestActor.m in Sources */, - 22B1377D25D6E32700D88061 /* KIFTouchVisualizerView.m in Sources */, - 22B1374025D6E32700D88061 /* UIScrollView-KIFAdditions.m in Sources */, - 22B1373125D6E32700D88061 /* KIFSystemTestActor.m in Sources */, - 22B1377825D6E32700D88061 /* KIFTestStepValidation.m in Sources */, - 22B1373925D6E32700D88061 /* UITouch-KIFAdditions.m in Sources */, - 22B1374325D6E32700D88061 /* XCTestCase-KIFAdditions.m in Sources */, - 22B1376425D6E32700D88061 /* UIAccessibilityElement-KIFAdditions.m in Sources */, - 22B1374A25D6E32700D88061 /* UIScreen+KIFAdditions.m in Sources */, - 22B1373A25D6E32700D88061 /* KIFUIObject.m in Sources */, - 22B1377425D6E32700D88061 /* KIFTestActor.m in Sources */, - 22B1374C25D6E32700D88061 /* UIApplication-KIFAdditions.m in Sources */, - ACA242EB2C3DC32500E6F1B6 /* UIAccessibilityCustomAction+KIFAdditions.m in Sources */, - 8EC2CB2229DB3D3B001BE493 /* NSObject+KIFSwizzle.m in Sources */, - 22B1375C25D6E32700D88061 /* KIFUITestActor-ConditionalTests.m in Sources */, - 22B1376525D6E32700D88061 /* KIFTypist.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; EABD467A1857A0C700A5F081 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1481,24 +1098,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - FAB89FF81CAC546900C6DFC1 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - FAB8A0061CAC546A00C6DFC1 /* ViewController.m in Sources */, - FAB8A0031CAC546A00C6DFC1 /* AppDelegate.m in Sources */, - FAB8A0001CAC546A00C6DFC1 /* main.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - FAB8A0101CAC546A00C6DFC1 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - FAB8A0191CAC546A00C6DFC1 /* KIFFrameworkConsumerTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -1507,11 +1106,6 @@ target = EB60ECC0177F8C83005A041A /* Test Host */; targetProxy = EABD46AF1857A0F300A5F081 /* PBXContainerItemProxy */; }; - FAB8A0161CAC546A00C6DFC1 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = FAB89FFB1CAC546900C6DFC1 /* KIFFrameworkConsumer */; - targetProxy = FAB8A0151CAC546A00C6DFC1 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -1539,177 +1133,9 @@ name = MainStoryboard.storyboard; sourceTree = ""; }; - FAB8A0071CAC546A00C6DFC1 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - FAB8A0081CAC546A00C6DFC1 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 9CC9674E1AD4B1B600576D13 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks", - ); - GCC_DYNAMIC_NO_PIC = NO; - GCC_PREFIX_HEADER = ""; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = KIFFramework/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "com.square.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = KIF; - PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 9CC9674F1AD4B1B600576D13 /* Coverage */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks", - ); - GCC_PREFIX_HEADER = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = KIFFramework/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "com.square.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = KIF; - PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Coverage; - }; - 9CC967501AD4B1B600576D13 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - "$(PLATFORM_DIR)/Developer/Library/Frameworks", - ); - GCC_PREFIX_HEADER = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = KIFFramework/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "com.square.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = KIF; - PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; A889300B1685088F00FC7C63 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2185,259 +1611,9 @@ }; name = Coverage; }; - FAB8A01B1CAC546A00C6DFC1 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = ""; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = KIFFrameworkConsumer/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.squareup.KIFFrameworkConsumer; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - FAB8A01C1CAC546A00C6DFC1 /* Coverage */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = KIFFrameworkConsumer/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = com.squareup.KIFFrameworkConsumer; - PRODUCT_NAME = "$(TARGET_NAME)"; - VALIDATE_PRODUCT = YES; - }; - name = Coverage; - }; - FAB8A01D1CAC546A00C6DFC1 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = KIFFrameworkConsumer/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = com.squareup.KIFFrameworkConsumer; - PRODUCT_NAME = "$(TARGET_NAME)"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - FAB8A01E1CAC546A00C6DFC1 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - BUNDLE_LOADER = "$(TEST_HOST)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = ""; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = KIFFrameworkConsumerTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_BUNDLE_IDENTIFIER = com.squareup.KIFFrameworkConsumerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KIFFrameworkConsumer.app/KIFFrameworkConsumer"; - }; - name = Debug; - }; - FAB8A01F1CAC546A00C6DFC1 /* Coverage */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - BUNDLE_LOADER = "$(TEST_HOST)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = KIFFrameworkConsumerTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_BUNDLE_IDENTIFIER = com.squareup.KIFFrameworkConsumerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KIFFrameworkConsumer.app/KIFFrameworkConsumer"; - VALIDATE_PRODUCT = YES; - }; - name = Coverage; - }; - FAB8A0201CAC546A00C6DFC1 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - BUNDLE_LOADER = "$(TEST_HOST)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = KIFFrameworkConsumerTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_BUNDLE_IDENTIFIER = com.squareup.KIFFrameworkConsumerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KIFFrameworkConsumer.app/KIFFrameworkConsumer"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 9CC967541AD4B1B600576D13 /* Build configuration list for PBXNativeTarget "KIFFramework" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 9CC9674E1AD4B1B600576D13 /* Debug */, - 9CC9674F1AD4B1B600576D13 /* Coverage */, - 9CC967501AD4B1B600576D13 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; A889300A1685088F00FC7C63 /* Build configuration list for PBXLegacyTarget "KIF Documentation" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -2488,26 +1664,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - FAB8A0211CAC546A00C6DFC1 /* Build configuration list for PBXNativeTarget "KIFFrameworkConsumer" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - FAB8A01B1CAC546A00C6DFC1 /* Debug */, - FAB8A01C1CAC546A00C6DFC1 /* Coverage */, - FAB8A01D1CAC546A00C6DFC1 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - FAB8A0221CAC546A00C6DFC1 /* Build configuration list for PBXNativeTarget "KIFFrameworkConsumerTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - FAB8A01E1CAC546A00C6DFC1 /* Debug */, - FAB8A01F1CAC546A00C6DFC1 /* Coverage */, - FAB8A0201CAC546A00C6DFC1 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = AAB0725F139719AC008AF393 /* Project object */; diff --git a/KIF.xcodeproj/xcshareddata/xcschemes/KIF Documentation.xcscheme b/KIF.xcodeproj/xcshareddata/xcschemes/KIF Documentation.xcscheme index d2841e667..7fce67a0d 100644 --- a/KIF.xcodeproj/xcshareddata/xcschemes/KIF Documentation.xcscheme +++ b/KIF.xcodeproj/xcshareddata/xcschemes/KIF Documentation.xcscheme @@ -29,8 +29,6 @@ shouldUseLaunchSchemeArgsEnv = "YES"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/KIFFramework/Info.plist b/KIFFramework/Info.plist deleted file mode 100644 index d3de8eefb..000000000 --- a/KIFFramework/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/KIFFramework/KIF.h b/KIFFramework/KIF.h deleted file mode 100644 index 45cad3040..000000000 --- a/KIFFramework/KIF.h +++ /dev/null @@ -1,48 +0,0 @@ -// -// KIF.h -// KIF -// -// Created by Shane Zatezalo on 4/7/15. -// Copyright (c) 2015 Lottadot LLC. All rights reserved. -// - -#import -#import -#import - -//! Project version number for KIF. -FOUNDATION_EXPORT double KIFVersionNumber; - -//! Project version string for KIF. -FOUNDATION_EXPORT const unsigned char KIFVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import diff --git a/KIFFrameworkConsumer/AppDelegate.h b/KIFFrameworkConsumer/AppDelegate.h deleted file mode 100644 index 022e78eab..000000000 --- a/KIFFrameworkConsumer/AppDelegate.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// AppDelegate.h -// KIFFrameworkConsumer -// -// Created by Alex Odawa on 3/30/16. -// -// - -#import - -@interface AppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - - -@end - diff --git a/KIFFrameworkConsumer/AppDelegate.m b/KIFFrameworkConsumer/AppDelegate.m deleted file mode 100644 index 28ac4ae58..000000000 --- a/KIFFrameworkConsumer/AppDelegate.m +++ /dev/null @@ -1,45 +0,0 @@ -// -// AppDelegate.m -// KIFFrameworkConsumer -// -// Created by Alex Odawa on 3/30/16. -// -// - -#import "AppDelegate.h" - -@interface AppDelegate () - -@end - -@implementation AppDelegate - - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Override point for customization after application launch. - return YES; -} - -- (void)applicationWillResignActive:(UIApplication *)application { - // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. -} - -- (void)applicationWillTerminate:(UIApplication *)application { - // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. -} - -@end diff --git a/KIFFrameworkConsumer/Assets.xcassets/AppIcon.appiconset/Contents.json b/KIFFrameworkConsumer/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 81213230d..000000000 --- a/KIFFrameworkConsumer/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" - }, - { - "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/KIFFrameworkConsumer/Base.lproj/Main.storyboard b/KIFFrameworkConsumer/Base.lproj/Main.storyboard deleted file mode 100644 index 0352e8451..000000000 --- a/KIFFrameworkConsumer/Base.lproj/Main.storyboard +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/KIFFrameworkConsumer/Info.plist b/KIFFrameworkConsumer/Info.plist deleted file mode 100644 index dd791df0c..000000000 --- a/KIFFrameworkConsumer/Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/KIFFrameworkConsumer/ViewController.h b/KIFFrameworkConsumer/ViewController.h deleted file mode 100644 index 27c0caaa0..000000000 --- a/KIFFrameworkConsumer/ViewController.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// ViewController.h -// KIFFrameworkConsumer -// -// Created by Alex Odawa on 3/30/16. -// -// - -#import - -@interface ViewController : UIViewController - - -@end - diff --git a/KIFFrameworkConsumer/ViewController.m b/KIFFrameworkConsumer/ViewController.m deleted file mode 100644 index f17064b9e..000000000 --- a/KIFFrameworkConsumer/ViewController.m +++ /dev/null @@ -1,31 +0,0 @@ -// -// ViewController.m -// KIFFrameworkConsumer -// -// Created by Alex Odawa on 3/30/16. -// -// - -#import "ViewController.h" - -@interface ViewController () - -@property (strong, nonatomic) IBOutlet UILabel *label; -@end - -@implementation ViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} -- (IBAction)buttonTapped:(id)sender { - [self.label performSelector:@selector(setText:) withObject:@"Tapped" afterDelay:0.5]; -} - -@end diff --git a/KIFFrameworkConsumer/main.m b/KIFFrameworkConsumer/main.m deleted file mode 100644 index e469cecbd..000000000 --- a/KIFFrameworkConsumer/main.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// main.m -// KIFFrameworkConsumer -// -// Created by Alex Odawa on 3/30/16. -// -// - -#import -#import "AppDelegate.h" - -int main(int argc, char * argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/KIFFrameworkConsumerTests/Info.plist b/KIFFrameworkConsumerTests/Info.plist deleted file mode 100644 index ba72822e8..000000000 --- a/KIFFrameworkConsumerTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/KIFFrameworkConsumerTests/KIFFrameworkConsumerTests.m b/KIFFrameworkConsumerTests/KIFFrameworkConsumerTests.m deleted file mode 100644 index 1a38e10b0..000000000 --- a/KIFFrameworkConsumerTests/KIFFrameworkConsumerTests.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// KIFFrameworkConsumerTests.m -// KIFFrameworkConsumerTests -// -// Created by Alex Odawa on 3/30/16. -// -// - -#import - -@interface KIFFrameworkConsumerTests : KIFTestCase - -@end - -@implementation KIFFrameworkConsumerTests - - -- (void)test_Framework { - [tester waitForViewWithAccessibilityLabel:@"Button"]; - [[viewTester usingLabel:@"Button"] tap]; - [tester waitForAbsenceOfViewWithAccessibilityLabel:@"Label"]; - [[viewTester usingLabel:@"Tapped"] waitForView]; -} - - -@end diff --git a/Scripts/ci.sh b/Scripts/ci.sh index 60ba18675..17387f100 100755 --- a/Scripts/ci.sh +++ b/Scripts/ci.sh @@ -14,27 +14,24 @@ fi rm -rf ${PWD}/build -# Run KIF tests (linking KIF as a Static Library) +# Run KIF Tests env NSUnbufferedIO=YES xcodebuild test -project KIF.xcodeproj -scheme KIF -derivedDataPath=${PWD}/build/KIF -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c if [ $RUN_EXTRA_VALIDATIONS != "true" ]; then exit 0 fi -# Consume KIF as a Dynamic Framework -env NSUnbufferedIO=YES xcodebuild test -project KIF.xcodeproj -derivedDataPath=${PWD}/build/KIFFramework -scheme KIFFrameworkConsumerTests -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c - # Compile the KIF SPM package directly swift build -Xcc "-isysroot" -Xcc "$(xcrun --sdk iphonesimulator --show-sdk-path)" -Xcc "-target" -Xcc "x86_64-apple-ios$(xcrun --sdk iphonesimulator --show-sdk-version)-simulator" # Consume KIF via Swift Package Manager in an Xcode project -env NSUnbufferedIO=YES xcodebuild test -project "SPMIntegration/SPMIntegration.xcodeproj" -scheme "SPMIntegration" -derivedDataPath=${PWD}/build/SPMIntegration -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c +env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/SPMIntegration/SPMIntegration.xcodeproj" -scheme "SPMIntegration" -derivedDataPath=${PWD}/build/SPMIntegration -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c # Test the "Testable" example project env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/Testable/Testable.xcodeproj" -scheme Testable -derivedDataPath=${PWD}/build/Testable -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c -# Test the "Testable Swift" example project -env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/Testable Swift/Testable Swift.xcodeproj" -scheme "Testable Swift" -derivedDataPath=${PWD}/build/TestableSwift -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c +# Test the "TestableSwift" example project +env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/TestableSwift/TestableSwift.xcodeproj" -scheme "TestableSwift" -derivedDataPath=${PWD}/build/TestableSwift -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c # Test the "Calculator" example project env NSUnbufferedIO=YES xcodebuild test -project "Documentation/Examples/Calculator/Calculator.xcodeproj" -scheme "Calculator" -derivedDataPath=${PWD}/build/Calculator -destination "platform=iOS Simulator,${SIMULATOR}" | xcpretty -c From ecb0c3237023559bac53cc2485584add83d1c406 Mon Sep 17 00:00:00 2001 From: Justin Martin Date: Thu, 19 Sep 2024 16:23:26 -0700 Subject: [PATCH 6/6] Remove remaining spaces in folders --- .../Testable.xcodeproj/project.pbxproj | 16 +-- KIF Tests/KIF Tests-Prefix.pch | 8 -- KIF.xcodeproj/project.pbxproj | 133 ++++++------------ .../xcshareddata/xcschemes/KIF.xcscheme | 4 +- .../xcschemes/KIFFramework.xcscheme | 80 ----------- Package.swift | 2 +- README.md | 10 +- ...UIAccessibilityCustomAction+KIFAdditions.m | 2 +- Test Host/en.lproj/InfoPlist.strings | 2 - .../AnimationViewController.m | 0 {Test Host => TestHost}/AppDelegate.m | 0 .../BackgroundViewController.m | 0 .../Base.lproj/MainStoryboard.storyboard | 0 .../CollectionViewController.m | 0 .../CustomPickerController.m | 0 {Test Host => TestHost}/Default-568h@2x.png | Bin {Test Host => TestHost}/Default.png | Bin {Test Host => TestHost}/Default@2x.png | Bin .../GestureViewController.m | 0 .../OffscreenViewController.m | 2 +- {Test Host => TestHost}/PickerController.m | 0 .../ScrollViewController.m | 0 .../ShowHideViewController.m | 0 .../SystemAlertViewController.m | 0 {Test Host => TestHost}/TableViewController.m | 0 {Test Host => TestHost}/TapViewController.m | 0 .../TestHost-Info.plist | 0 .../TestHost-Prefix.pch | 2 +- .../TestSuiteViewController.m | 0 {Test Host => TestHost}/WebViewController.m | 0 .../en.lproj/InfoPlist.strings | 0 {Test Host => TestHost}/index.html | 0 {Test Host => TestHost}/main.m | 2 +- {Test Host => TestHost}/page2.html | 0 ...ccessibilityIdentifierPullToRefreshTests.m | 0 .../AccessibilityIdentifierTests.m | 0 ...cessibilityIdentifierTests_ViewTestActor.m | 0 .../Additions/UIScreen+KIFAdditionsTests.m | 0 {KIF Tests => Tests}/AutocorrectTests.m | 0 .../AutocorrectTests_ViewTestActor.m | 0 {KIF Tests => Tests}/BackgroundTests.m | 0 {KIF Tests => Tests}/CascadingFailureTests.m | 0 {KIF Tests => Tests}/CollectionViewTests.m | 0 .../CollectionViewTests_ViewTestActor.m | 0 {KIF Tests => Tests}/CompositionTests.m | 0 .../CompositionTests_ViewTestActor.m | 0 .../CustomActionTests_ViewTestActor.m | 0 {KIF Tests => Tests}/CustomPickerTests.m | 0 .../CustomPickerTests_ViewTestActor.m | 0 {KIF Tests => Tests}/ExistTests.m | 0 .../ExistTests_ViewTestActor.m | 0 {KIF Tests => Tests}/GestureTests.m | 0 .../GestureTests_ViewTestActor.m | 0 .../KIFTests-Info.plist | 0 {KIF Tests => Tests}/LandscapeTests.m | 0 .../LandscapeTests_ViewTestActor.m | 0 {KIF Tests => Tests}/LongPressTests.m | 0 .../LongPressTests_ViewTestActor.m | 0 {KIF Tests => Tests}/ModalViewTests.m | 0 .../ModalViewTests_ViewTestActor.m | 0 .../MultiFingerTests_ViewTestActor.m | 0 {KIF Tests => Tests}/OffscreenTests.m | 0 .../OffscreenTests_ViewTestActor.m | 0 {KIF Tests => Tests}/PickerTests.m | 0 .../PickerTests_ViewTestActor.m | 0 {KIF Tests => Tests}/PullToRefreshTests.m | 0 .../PullToRefreshTests_ViewTestActor.m | 0 {KIF Tests => Tests}/ScrollViewTests.m | 0 .../ScrollViewTests_ViewTestActor.m | 0 {KIF Tests => Tests}/SearchFieldTests.m | 0 .../SearchFieldTests_ViewTestActor.m | 0 {KIF Tests => Tests}/SpecificControlTests.m | 0 .../SpecificControlTests_ViewTestActor.m | 0 {KIF Tests => Tests}/SystemAlertTests.m | 0 .../SystemAlertTests_ViewTestActor.m | 0 {KIF Tests => Tests}/SystemTests.m | 0 {KIF Tests => Tests}/TableViewTests.m | 0 .../TableViewTests_ViewTestActor.m | 0 {KIF Tests => Tests}/TappingTests.m | 0 .../TappingTests_ViewTestActor.m | 0 {KIF Tests => Tests}/TypingTests.m | 0 .../TypingTests_ViewTestActor.m | 0 .../UIApplicationKIFAdditionsTests.m | 0 {KIF Tests => Tests}/WaitForAbscenceTests.m | 0 .../WaitForAbscenceTests_ViewTestActor.m | 0 {KIF Tests => Tests}/WaitForAnimationTests.m | 0 .../WaitForAnimationTests_ViewTestActor.m | 0 .../WaitForTappableViewTests.m | 0 .../WaitForTappableViewTests_ViewTestActor.m | 0 {KIF Tests => Tests}/WaitForViewTests.m | 0 .../WaitForViewTests_ViewTestActor.m | 0 {KIF Tests => Tests}/WebViewTests.m | 0 .../WebViewTests_ViewTestActor.m | 0 93 files changed, 65 insertions(+), 198 deletions(-) delete mode 100644 KIF Tests/KIF Tests-Prefix.pch delete mode 100644 KIF.xcodeproj/xcshareddata/xcschemes/KIFFramework.xcscheme delete mode 100644 Test Host/en.lproj/InfoPlist.strings rename {Test Host => TestHost}/AnimationViewController.m (100%) rename {Test Host => TestHost}/AppDelegate.m (100%) rename {Test Host => TestHost}/BackgroundViewController.m (100%) rename {Test Host => TestHost}/Base.lproj/MainStoryboard.storyboard (100%) rename {Test Host => TestHost}/CollectionViewController.m (100%) rename {Test Host => TestHost}/CustomPickerController.m (100%) rename {Test Host => TestHost}/Default-568h@2x.png (100%) rename {Test Host => TestHost}/Default.png (100%) rename {Test Host => TestHost}/Default@2x.png (100%) rename {Test Host => TestHost}/GestureViewController.m (100%) rename {Test Host => TestHost}/OffscreenViewController.m (99%) rename {Test Host => TestHost}/PickerController.m (100%) rename {Test Host => TestHost}/ScrollViewController.m (100%) rename {Test Host => TestHost}/ShowHideViewController.m (100%) rename {Test Host => TestHost}/SystemAlertViewController.m (100%) rename {Test Host => TestHost}/TableViewController.m (100%) rename {Test Host => TestHost}/TapViewController.m (100%) rename Test Host/Test Host-Info.plist => TestHost/TestHost-Info.plist (100%) rename Test Host/Test Host-Prefix.pch => TestHost/TestHost-Prefix.pch (71%) rename {Test Host => TestHost}/TestSuiteViewController.m (100%) rename {Test Host => TestHost}/WebViewController.m (100%) rename {KIF Tests => TestHost}/en.lproj/InfoPlist.strings (100%) rename {Test Host => TestHost}/index.html (100%) rename {Test Host => TestHost}/main.m (94%) rename {Test Host => TestHost}/page2.html (100%) rename {KIF Tests => Tests}/AccessibilityIdentifierPullToRefreshTests.m (100%) rename {KIF Tests => Tests}/AccessibilityIdentifierTests.m (100%) rename {KIF Tests => Tests}/AccessibilityIdentifierTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/Additions/UIScreen+KIFAdditionsTests.m (100%) rename {KIF Tests => Tests}/AutocorrectTests.m (100%) rename {KIF Tests => Tests}/AutocorrectTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/BackgroundTests.m (100%) rename {KIF Tests => Tests}/CascadingFailureTests.m (100%) rename {KIF Tests => Tests}/CollectionViewTests.m (100%) rename {KIF Tests => Tests}/CollectionViewTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/CompositionTests.m (100%) rename {KIF Tests => Tests}/CompositionTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/CustomActionTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/CustomPickerTests.m (100%) rename {KIF Tests => Tests}/CustomPickerTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/ExistTests.m (100%) rename {KIF Tests => Tests}/ExistTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/GestureTests.m (100%) rename {KIF Tests => Tests}/GestureTests_ViewTestActor.m (100%) rename KIF Tests/KIF Tests-Info.plist => Tests/KIFTests-Info.plist (100%) rename {KIF Tests => Tests}/LandscapeTests.m (100%) rename {KIF Tests => Tests}/LandscapeTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/LongPressTests.m (100%) rename {KIF Tests => Tests}/LongPressTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/ModalViewTests.m (100%) rename {KIF Tests => Tests}/ModalViewTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/MultiFingerTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/OffscreenTests.m (100%) rename {KIF Tests => Tests}/OffscreenTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/PickerTests.m (100%) rename {KIF Tests => Tests}/PickerTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/PullToRefreshTests.m (100%) rename {KIF Tests => Tests}/PullToRefreshTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/ScrollViewTests.m (100%) rename {KIF Tests => Tests}/ScrollViewTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/SearchFieldTests.m (100%) rename {KIF Tests => Tests}/SearchFieldTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/SpecificControlTests.m (100%) rename {KIF Tests => Tests}/SpecificControlTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/SystemAlertTests.m (100%) rename {KIF Tests => Tests}/SystemAlertTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/SystemTests.m (100%) rename {KIF Tests => Tests}/TableViewTests.m (100%) rename {KIF Tests => Tests}/TableViewTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/TappingTests.m (100%) rename {KIF Tests => Tests}/TappingTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/TypingTests.m (100%) rename {KIF Tests => Tests}/TypingTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/UIApplicationKIFAdditionsTests.m (100%) rename {KIF Tests => Tests}/WaitForAbscenceTests.m (100%) rename {KIF Tests => Tests}/WaitForAbscenceTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/WaitForAnimationTests.m (100%) rename {KIF Tests => Tests}/WaitForAnimationTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/WaitForTappableViewTests.m (100%) rename {KIF Tests => Tests}/WaitForTappableViewTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/WaitForViewTests.m (100%) rename {KIF Tests => Tests}/WaitForViewTests_ViewTestActor.m (100%) rename {KIF Tests => Tests}/WebViewTests.m (100%) rename {KIF Tests => Tests}/WebViewTests_ViewTestActor.m (100%) diff --git a/Documentation/Examples/Testable/Testable.xcodeproj/project.pbxproj b/Documentation/Examples/Testable/Testable.xcodeproj/project.pbxproj index 511029965..a5ac6f9ed 100644 --- a/Documentation/Examples/Testable/Testable.xcodeproj/project.pbxproj +++ b/Documentation/Examples/Testable/Testable.xcodeproj/project.pbxproj @@ -38,14 +38,14 @@ containerPortal = 6282C64E2C9CE3F70040DCDB /* KIF.xcodeproj */; proxyType = 2; remoteGlobalIDString = EB60ECC1177F8C83005A041A; - remoteInfo = "Test Host"; + remoteInfo = "TestHost"; }; 6282C6592C9CE3F70040DCDB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 6282C64E2C9CE3F70040DCDB /* KIF.xcodeproj */; proxyType = 2; remoteGlobalIDString = EABD46CD1857A0F300A5F081; - remoteInfo = "KIF Tests"; + remoteInfo = "KIFTests"; }; 62F81AFB1EBBD038009B2400 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -113,8 +113,8 @@ isa = PBXGroup; children = ( 6282C6562C9CE3F70040DCDB /* libKIF.a */, - 6282C6582C9CE3F70040DCDB /* Test Host.app */, - 6282C65A2C9CE3F70040DCDB /* KIF Tests - XCTest.xctest */, + 6282C6582C9CE3F70040DCDB /* TestHost.app */, + 6282C65A2C9CE3F70040DCDB /* KIFTests - XCTest.xctest */, ); name = Products; sourceTree = ""; @@ -284,17 +284,17 @@ remoteRef = 6282C6552C9CE3F70040DCDB /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 6282C6582C9CE3F70040DCDB /* Test Host.app */ = { + 6282C6582C9CE3F70040DCDB /* TestHost.app */ = { isa = PBXReferenceProxy; fileType = wrapper.application; - path = "Test Host.app"; + path = "TestHost.app"; remoteRef = 6282C6572C9CE3F70040DCDB /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 6282C65A2C9CE3F70040DCDB /* KIF Tests - XCTest.xctest */ = { + 6282C65A2C9CE3F70040DCDB /* KIFTests - XCTest.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "KIF Tests - XCTest.xctest"; + path = "KIFTests - XCTest.xctest"; remoteRef = 6282C6592C9CE3F70040DCDB /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; diff --git a/KIF Tests/KIF Tests-Prefix.pch b/KIF Tests/KIF Tests-Prefix.pch deleted file mode 100644 index 755f50c2f..000000000 --- a/KIF Tests/KIF Tests-Prefix.pch +++ /dev/null @@ -1,8 +0,0 @@ -// -// Prefix header for all source files of the 'KIF Tests' target in the 'KIF Tests' project -// - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/KIF.xcodeproj/project.pbxproj b/KIF.xcodeproj/project.pbxproj index 9d0492004..7089bf3cd 100644 --- a/KIF.xcodeproj/project.pbxproj +++ b/KIF.xcodeproj/project.pbxproj @@ -155,7 +155,6 @@ EABD46C31857A0F300A5F081 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB072B413971AEA008AF393 /* UIKit.framework */; }; EABD46C41857A0F300A5F081 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAB0726B139719AC008AF393 /* Foundation.framework */; }; EABD46C51857A0F300A5F081 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EB60ECC4177F8C83005A041A /* CoreGraphics.framework */; }; - EABD46C71857A0F300A5F081 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EB60ECF2177F8DB3005A041A /* InfoPlist.strings */; }; EABD46CF1857A15400A5F081 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EABD46AB1857A0EB00A5F081 /* XCTest.framework */; }; EABD46D21857A24E00A5F081 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EABD46AB1857A0EB00A5F081 /* XCTest.framework */; }; EABD46D61858C8ED00A5F081 /* libKIF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EABD46AA1857A0C700A5F081 /* libKIF.a */; }; @@ -205,7 +204,7 @@ containerPortal = AAB0725F139719AC008AF393 /* Project object */; proxyType = 1; remoteGlobalIDString = EB60ECC0177F8C83005A041A; - remoteInfo = "Test Host"; + remoteInfo = TestHost; }; /* End PBXContainerItemProxy section */ @@ -317,8 +316,6 @@ 97E8A5CE1B0A62F700124E3B /* BackgroundViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BackgroundViewController.m; sourceTree = ""; }; 97E8A5D01B0A63D100124E3B /* BackgroundTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BackgroundTests.m; sourceTree = ""; }; 9CC881A21AD4CAAC002CD34C /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; - 9CC9673E1AD4B1B600576D13 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9CC9673F1AD4B1B600576D13 /* KIF.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KIF.h; sourceTree = ""; }; AAB0726B139719AC008AF393 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; AAB072B413971AEA008AF393 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; ACA242E32C3DA55400E6F1B6 /* CustomActionTests_ViewTestActor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CustomActionTests_ViewTestActor.m; sourceTree = ""; }; @@ -343,24 +340,22 @@ EA0F25491829839E006FF825 /* CollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CollectionViewController.m; sourceTree = ""; }; EABD46AA1857A0C700A5F081 /* libKIF.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libKIF.a; sourceTree = BUILT_PRODUCTS_DIR; }; EABD46AB1857A0EB00A5F081 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; - EABD46CD1857A0F300A5F081 /* KIF Tests - XCTest.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "KIF Tests - XCTest.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + EABD46CD1857A0F300A5F081 /* KIFTests - XCTest.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "KIFTests - XCTest.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; EB02523D17AA109400A7D13A /* CompositionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CompositionTests.m; sourceTree = ""; }; EB09000F17E3696A00AA15B1 /* SearchFieldTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchFieldTests.m; sourceTree = ""; }; EB1A44D91A0C33AD004A3F61 /* AccessibilityIdentifierTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AccessibilityIdentifierTests.m; sourceTree = ""; }; EB22B5AF17AF52640090B848 /* CascadingFailureTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CascadingFailureTests.m; sourceTree = ""; }; EB3F654417AA0B8400469D18 /* TableViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableViewTests.m; sourceTree = ""; }; EB4C3138167BA3D200E31109 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; - EB60ECC1177F8C83005A041A /* Test Host.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Test Host.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + EB60ECC1177F8C83005A041A /* TestHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestHost.app; sourceTree = BUILT_PRODUCTS_DIR; }; EB60ECC4177F8C83005A041A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - EB60ECC8177F8C83005A041A /* Test Host-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Test Host-Info.plist"; sourceTree = ""; }; + EB60ECC8177F8C83005A041A /* TestHost-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TestHost-Info.plist"; sourceTree = ""; }; EB60ECCA177F8C83005A041A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; EB60ECCC177F8C84005A041A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - EB60ECCE177F8C84005A041A /* Test Host-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Test Host-Prefix.pch"; sourceTree = ""; }; + EB60ECCE177F8C84005A041A /* TestHost-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TestHost-Prefix.pch"; sourceTree = ""; }; EB60ECD2177F8C84005A041A /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; EB60ECD4177F8C84005A041A /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; EB60ECD6177F8C84005A041A /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; - EB60ECF1177F8DB3005A041A /* KIF Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "KIF Tests-Info.plist"; sourceTree = ""; }; - EB60ECF3177F8DB3005A041A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; EB60ECFC177F9031005A041A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; EB60ECFD177F9031005A041A /* ShowHideViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShowHideViewController.m; sourceTree = ""; }; EB60ECFE177F9032005A041A /* TapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TapViewController.m; sourceTree = ""; }; @@ -575,31 +570,12 @@ path = Sources/KIF/ApplePrivateAPIs; sourceTree = ""; }; - 9CC9673C1AD4B1B600576D13 /* KIF Framework */ = { - isa = PBXGroup; - children = ( - 9CC9673F1AD4B1B600576D13 /* KIF.h */, - 9CC9673D1AD4B1B600576D13 /* Supporting Files */, - ); - name = "KIF Framework"; - path = KIFFramework; - sourceTree = ""; - }; - 9CC9673D1AD4B1B600576D13 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 9CC9673E1AD4B1B600576D13 /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; AAB0725D139719AC008AF393 = { isa = PBXGroup; children = ( EB60ECBC177F8C51005A041A /* KIF */, - EB60ECC6177F8C83005A041A /* Test Host */, - EB60ECEF177F8DB3005A041A /* KIF Tests */, - 9CC9673C1AD4B1B600576D13 /* KIF Framework */, + EB60ECEF177F8DB3005A041A /* Tests */, + EB60ECC6177F8C83005A041A /* TestHost */, AAB0726A139719AC008AF393 /* Frameworks */, AAB07269139719AC008AF393 /* Products */, ); @@ -608,9 +584,9 @@ AAB07269139719AC008AF393 /* Products */ = { isa = PBXGroup; children = ( - EB60ECC1177F8C83005A041A /* Test Host.app */, + EB60ECC1177F8C83005A041A /* TestHost.app */, EABD46AA1857A0C700A5F081 /* libKIF.a */, - EABD46CD1857A0F300A5F081 /* KIF Tests - XCTest.xctest */, + EABD46CD1857A0F300A5F081 /* KIFTests - XCTest.xctest */, ); name = Products; sourceTree = ""; @@ -654,7 +630,7 @@ name = KIF; sourceTree = ""; }; - EB60ECC6177F8C83005A041A /* Test Host */ = { + EB60ECC6177F8C83005A041A /* TestHost */ = { isa = PBXGroup; children = ( 3812FB601A1212A700335733 /* AnimationViewController.m */, @@ -676,16 +652,16 @@ EB60ECC7177F8C83005A041A /* Supporting Files */, 8EAA1EE129D3AF7A008F6029 /* OffscreenViewController.m */, ); - path = "Test Host"; + path = TestHost; sourceTree = ""; }; EB60ECC7177F8C83005A041A /* Supporting Files */ = { isa = PBXGroup; children = ( - EB60ECC8177F8C83005A041A /* Test Host-Info.plist */, + EB60ECC8177F8C83005A041A /* TestHost-Info.plist */, EB60ECC9177F8C83005A041A /* InfoPlist.strings */, EB60ECCC177F8C84005A041A /* main.m */, - EB60ECCE177F8C84005A041A /* Test Host-Prefix.pch */, + EB60ECCE177F8C84005A041A /* TestHost-Prefix.pch */, EB60ECD2177F8C84005A041A /* Default.png */, EB60ECD4177F8C84005A041A /* Default@2x.png */, EB60ECD6177F8C84005A041A /* Default-568h@2x.png */, @@ -695,7 +671,7 @@ name = "Supporting Files"; sourceTree = ""; }; - EB60ECEF177F8DB3005A041A /* KIF Tests */ = { + EB60ECEF177F8DB3005A041A /* Tests */ = { isa = PBXGroup; children = ( FA8DA74D1A77117A00E0C644 /* KIFUIViewTestActor Tests */, @@ -729,19 +705,9 @@ EB60ED0A177F90BA005A041A /* SystemTests.m */, 5F6A1B371C191F9600F20F22 /* UIApplicationKIFAdditionsTests.m */, B66B1BF3202BC94F00D0E4B2 /* AutocorrectTests.m */, - EB60ECF0177F8DB3005A041A /* Supporting Files */, 8EAA1EE329D3B1F5008F6029 /* OffscreenTests.m */, ); - path = "KIF Tests"; - sourceTree = ""; - }; - EB60ECF0177F8DB3005A041A /* Supporting Files */ = { - isa = PBXGroup; - children = ( - EB60ECF1177F8DB3005A041A /* KIF Tests-Info.plist */, - EB60ECF2177F8DB3005A041A /* InfoPlist.strings */, - ); - name = "Supporting Files"; + path = Tests; sourceTree = ""; }; FA8DA74D1A77117A00E0C644 /* KIFUIViewTestActor Tests */ = { @@ -871,9 +837,9 @@ productReference = EABD46AA1857A0C700A5F081 /* libKIF.a */; productType = "com.apple.product-type.library.static"; }; - EABD46AD1857A0F300A5F081 /* KIF Tests */ = { + EABD46AD1857A0F300A5F081 /* KIFTests */ = { isa = PBXNativeTarget; - buildConfigurationList = EABD46C91857A0F300A5F081 /* Build configuration list for PBXNativeTarget "KIF Tests" */; + buildConfigurationList = EABD46C91857A0F300A5F081 /* Build configuration list for PBXNativeTarget "KIFTests" */; buildPhases = ( EABD46B01857A0F300A5F081 /* Sources */, EABD46C01857A0F300A5F081 /* Frameworks */, @@ -884,14 +850,14 @@ dependencies = ( EABD46AE1857A0F300A5F081 /* PBXTargetDependency */, ); - name = "KIF Tests"; - productName = "KIF Tests"; - productReference = EABD46CD1857A0F300A5F081 /* KIF Tests - XCTest.xctest */; + name = KIFTests; + productName = KIFTests; + productReference = EABD46CD1857A0F300A5F081 /* KIFTests - XCTest.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - EB60ECC0177F8C83005A041A /* Test Host */ = { + EB60ECC0177F8C83005A041A /* TestHost */ = { isa = PBXNativeTarget; - buildConfigurationList = EB60ECD8177F8C84005A041A /* Build configuration list for PBXNativeTarget "Test Host" */; + buildConfigurationList = EB60ECD8177F8C84005A041A /* Build configuration list for PBXNativeTarget "TestHost" */; buildPhases = ( EB60ECBD177F8C83005A041A /* Sources */, EB60ECBE177F8C83005A041A /* Frameworks */, @@ -901,9 +867,9 @@ ); dependencies = ( ); - name = "Test Host"; - productName = "Test Host"; - productReference = EB60ECC1177F8C83005A041A /* Test Host.app */; + name = TestHost; + productName = TestHost; + productReference = EB60ECC1177F8C83005A041A /* TestHost.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -930,8 +896,8 @@ targets = ( EABD46791857A0C700A5F081 /* KIF */, A88930091685088F00FC7C63 /* KIF Documentation */, - EB60ECC0177F8C83005A041A /* Test Host */, - EABD46AD1857A0F300A5F081 /* KIF Tests */, + EB60ECC0177F8C83005A041A /* TestHost */, + EABD46AD1857A0F300A5F081 /* KIFTests */, ); }; /* End PBXProject section */ @@ -941,7 +907,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - EABD46C71857A0F300A5F081 /* InfoPlist.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1103,7 +1068,7 @@ /* Begin PBXTargetDependency section */ EABD46AE1857A0F300A5F081 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = EB60ECC0177F8C83005A041A /* Test Host */; + target = EB60ECC0177F8C83005A041A /* TestHost */; targetProxy = EABD46AF1857A0F300A5F081 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1117,14 +1082,6 @@ name = InfoPlist.strings; sourceTree = ""; }; - EB60ECF2177F8DB3005A041A /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - EB60ECF3177F8DB3005A041A /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; EB60ED04177F9041005A041A /* MainStoryboard.storyboard */ = { isa = PBXVariantGroup; children = ( @@ -1337,7 +1294,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Test Host.app/Test Host"; + BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/TestHost.app/TestHost"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; @@ -1358,11 +1315,11 @@ ); GCC_WARN_UNINITIALIZED_AUTOS = YES; HEADER_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = "KIF Tests/KIF Tests-Info.plist"; + INFOPLIST_FILE = "Tests/KIFTests-Info.plist"; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = "com.square.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "KIF Tests - XCTest"; + PRODUCT_NAME = "KIFTests - XCTest"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; }; @@ -1372,7 +1329,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Test Host.app/Test Host"; + BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/TestHost.app/TestHost"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; @@ -1393,11 +1350,11 @@ ); GCC_WARN_UNINITIALIZED_AUTOS = YES; HEADER_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = "KIF Tests/KIF Tests-Info.plist"; + INFOPLIST_FILE = "Tests/KIFTests-Info.plist"; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = "com.square.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "KIF Tests - XCTest"; + PRODUCT_NAME = "KIFTests - XCTest"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; }; @@ -1407,7 +1364,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Test Host.app/Test Host"; + BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/TestHost.app/TestHost"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; @@ -1423,10 +1380,10 @@ GCC_PREFIX_HEADER = ""; GCC_WARN_UNINITIALIZED_AUTOS = YES; HEADER_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = "KIF Tests/KIF Tests-Info.plist"; + INFOPLIST_FILE = "Tests/KIFTests-Info.plist"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = "com.square.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "KIF Tests - XCTest"; + PRODUCT_NAME = "KIFTests - XCTest"; TEST_HOST = "$(BUNDLE_LOADER)"; VALIDATE_PRODUCT = YES; WRAPPER_EXTENSION = xctest; @@ -1451,14 +1408,14 @@ ENABLE_BITCODE = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Test Host/Test Host-Prefix.pch"; + GCC_PREFIX_HEADER = "TestHost/TestHost-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_UNINITIALIZED_AUTOS = YES; - INFOPLIST_FILE = "Test Host/Test Host-Info.plist"; + INFOPLIST_FILE = "TestHost/TestHost-Info.plist"; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.square.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1484,10 +1441,10 @@ DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Test Host/Test Host-Prefix.pch"; + GCC_PREFIX_HEADER = "TestHost/TestHost-Prefix.pch"; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_UNINITIALIZED_AUTOS = YES; - INFOPLIST_FILE = "Test Host/Test Host-Info.plist"; + INFOPLIST_FILE = "TestHost/TestHost-Info.plist"; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_BUNDLE_IDENTIFIER = "com.square.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1595,14 +1552,14 @@ ENABLE_BITCODE = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Test Host/Test Host-Prefix.pch"; + GCC_PREFIX_HEADER = "TestHost/TestHost-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_UNINITIALIZED_AUTOS = YES; - INFOPLIST_FILE = "Test Host/Test Host-Info.plist"; + INFOPLIST_FILE = "TestHost/TestHost-Info.plist"; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.square.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1644,7 +1601,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EABD46C91857A0F300A5F081 /* Build configuration list for PBXNativeTarget "KIF Tests" */ = { + EABD46C91857A0F300A5F081 /* Build configuration list for PBXNativeTarget "KIFTests" */ = { isa = XCConfigurationList; buildConfigurations = ( EABD46CA1857A0F300A5F081 /* Debug */, @@ -1654,7 +1611,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EB60ECD8177F8C84005A041A /* Build configuration list for PBXNativeTarget "Test Host" */ = { + EB60ECD8177F8C84005A041A /* Build configuration list for PBXNativeTarget "TestHost" */ = { isa = XCConfigurationList; buildConfigurations = ( EB60ECD9177F8C84005A041A /* Debug */, diff --git a/KIF.xcodeproj/xcshareddata/xcschemes/KIF.xcscheme b/KIF.xcodeproj/xcshareddata/xcschemes/KIF.xcscheme index c135629a6..342fe03d2 100644 --- a/KIF.xcodeproj/xcshareddata/xcschemes/KIF.xcscheme +++ b/KIF.xcodeproj/xcshareddata/xcschemes/KIF.xcscheme @@ -42,8 +42,8 @@ diff --git a/KIF.xcodeproj/xcshareddata/xcschemes/KIFFramework.xcscheme b/KIF.xcodeproj/xcshareddata/xcschemes/KIFFramework.xcscheme deleted file mode 100644 index 8d67f0179..000000000 --- a/KIF.xcodeproj/xcshareddata/xcschemes/KIFFramework.xcscheme +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Package.swift b/Package.swift index 5f379b6b5..1b3ce13cc 100644 --- a/Package.swift +++ b/Package.swift @@ -31,7 +31,7 @@ let package = Package( .testTarget( name: "KIFTests", dependencies: ["KIF"], - path: "./KIF Tests", + path: "./Tests", cSettings: [.headerSearchPath("../Sources/KIF/")] // allow to look a "private" headers ), ] diff --git a/README.md b/README.md index e7888f77c..b51821f3c 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ You can easily run a single KIF test with the Test Navigator or kick off nightly See KIF in Action ----------------- -KIF uses techniques described below to validate its internal functionality. You can see a test suite that exercises its entire functionality by simply building and testing the KIF scheme with ⌘U. Look at the tests in the "KIF Tests" group for ideas on how to build your own tests. +KIF uses techniques described below to validate its internal functionality. You can see a test suite that exercises its entire functionality by simply building and testing the KIF scheme with ⌘U. Look at the tests in the "Tests" group for ideas on how to build your own tests. Installation (with CocoaPods) ----------------------------- @@ -113,13 +113,13 @@ Read **Final Test Target Configurations** below for the final details on getting Installing Accessibility Identifier Tests ----------------------------------------- -Normally you identify a UI element via its accessibility label so that KIF simulates the interactions of a real user as closely as possible. In some cases, however, you may have to use accessibility identifiers, which are not exposed to users. If using CocoaPods, install the additional identifier-based KIF tests via the Identifier CocoaPods subspec: +Normally you identify a UI element via its accessibility label so that KIF simulates the interactions of a real user as closely as possible. In some cases, however, you may have to use accessibility identifiers, which are not exposed to users. If using CocoaPods, install the additional identifier-based Tests via the Identifier CocoaPods subspec: ``` pod 'KIF/IdentifierTests' ``` -If not using CocoaPods, the identifier-based KIF tests can be added by including "KIFUITestActor-IdentifierTests.h". +If not using CocoaPods, the identifier-based Tests can be added by including "KIFUITestActor-IdentifierTests.h". Final Test Target Configurations -------------------------------- @@ -221,7 +221,7 @@ Everything should now be configured. When you run the integration tests using th Use with other testing frameworks --------------------------------- -`KIFTestCase` is not necessary for running KIF tests. Tests can run directly in `XCTestCase` or any subclass. The basic requirement is that when you call `tester` or `system`, `self` must be an instance of `XCTestCase` and you must call `KIFEnableAccessibility` in `setUp`. +`KIFTestCase` is not necessary for running Tests. Tests can run directly in `XCTestCase` or any subclass. The basic requirement is that when you call `tester` or `system`, `self` must be an instance of `XCTestCase` and you must call `KIFEnableAccessibility` in `setUp`. For example, the following [Specta](https://github.com/specta/specta) test works without any changes to KIF or Specta: @@ -289,7 +289,7 @@ Troubleshooting ### Simulator launches but app doesn't appear, steps time out after 10 seconds -This issue occurs when XCTest does not have a valid test host. Reread the instructions above with regards to the "Bundle Loader" and "Test Host" settings. You may have missed something. +This issue occurs when XCTest does not have a valid Test Host. Reread the instructions above with regards to the "Bundle Loader" and "Test Host" settings. You may have missed something. ### Step fails because a view cannot be found diff --git a/Sources/KIF/Additions/UIAccessibilityCustomAction+KIFAdditions.m b/Sources/KIF/Additions/UIAccessibilityCustomAction+KIFAdditions.m index 2b6cea0ab..bcec94fea 100644 --- a/Sources/KIF/Additions/UIAccessibilityCustomAction+KIFAdditions.m +++ b/Sources/KIF/Additions/UIAccessibilityCustomAction+KIFAdditions.m @@ -1,6 +1,6 @@ // // UIAccessibilityCustomAction+KIFAdditions.m -// KIF Tests +// KIF // // Created by Alex Odawa on 09/07/2024. // diff --git a/Test Host/en.lproj/InfoPlist.strings b/Test Host/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28ff8..000000000 --- a/Test Host/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/Test Host/AnimationViewController.m b/TestHost/AnimationViewController.m similarity index 100% rename from Test Host/AnimationViewController.m rename to TestHost/AnimationViewController.m diff --git a/Test Host/AppDelegate.m b/TestHost/AppDelegate.m similarity index 100% rename from Test Host/AppDelegate.m rename to TestHost/AppDelegate.m diff --git a/Test Host/BackgroundViewController.m b/TestHost/BackgroundViewController.m similarity index 100% rename from Test Host/BackgroundViewController.m rename to TestHost/BackgroundViewController.m diff --git a/Test Host/Base.lproj/MainStoryboard.storyboard b/TestHost/Base.lproj/MainStoryboard.storyboard similarity index 100% rename from Test Host/Base.lproj/MainStoryboard.storyboard rename to TestHost/Base.lproj/MainStoryboard.storyboard diff --git a/Test Host/CollectionViewController.m b/TestHost/CollectionViewController.m similarity index 100% rename from Test Host/CollectionViewController.m rename to TestHost/CollectionViewController.m diff --git a/Test Host/CustomPickerController.m b/TestHost/CustomPickerController.m similarity index 100% rename from Test Host/CustomPickerController.m rename to TestHost/CustomPickerController.m diff --git a/Test Host/Default-568h@2x.png b/TestHost/Default-568h@2x.png similarity index 100% rename from Test Host/Default-568h@2x.png rename to TestHost/Default-568h@2x.png diff --git a/Test Host/Default.png b/TestHost/Default.png similarity index 100% rename from Test Host/Default.png rename to TestHost/Default.png diff --git a/Test Host/Default@2x.png b/TestHost/Default@2x.png similarity index 100% rename from Test Host/Default@2x.png rename to TestHost/Default@2x.png diff --git a/Test Host/GestureViewController.m b/TestHost/GestureViewController.m similarity index 100% rename from Test Host/GestureViewController.m rename to TestHost/GestureViewController.m diff --git a/Test Host/OffscreenViewController.m b/TestHost/OffscreenViewController.m similarity index 99% rename from Test Host/OffscreenViewController.m rename to TestHost/OffscreenViewController.m index 45aeca1d5..1514c0bc6 100644 --- a/Test Host/OffscreenViewController.m +++ b/TestHost/OffscreenViewController.m @@ -1,6 +1,6 @@ // // OffscreenViewController.m -// Test Host +// TestHost // // Created by Steve Sun on 2023-03-28. // diff --git a/Test Host/PickerController.m b/TestHost/PickerController.m similarity index 100% rename from Test Host/PickerController.m rename to TestHost/PickerController.m diff --git a/Test Host/ScrollViewController.m b/TestHost/ScrollViewController.m similarity index 100% rename from Test Host/ScrollViewController.m rename to TestHost/ScrollViewController.m diff --git a/Test Host/ShowHideViewController.m b/TestHost/ShowHideViewController.m similarity index 100% rename from Test Host/ShowHideViewController.m rename to TestHost/ShowHideViewController.m diff --git a/Test Host/SystemAlertViewController.m b/TestHost/SystemAlertViewController.m similarity index 100% rename from Test Host/SystemAlertViewController.m rename to TestHost/SystemAlertViewController.m diff --git a/Test Host/TableViewController.m b/TestHost/TableViewController.m similarity index 100% rename from Test Host/TableViewController.m rename to TestHost/TableViewController.m diff --git a/Test Host/TapViewController.m b/TestHost/TapViewController.m similarity index 100% rename from Test Host/TapViewController.m rename to TestHost/TapViewController.m diff --git a/Test Host/Test Host-Info.plist b/TestHost/TestHost-Info.plist similarity index 100% rename from Test Host/Test Host-Info.plist rename to TestHost/TestHost-Info.plist diff --git a/Test Host/Test Host-Prefix.pch b/TestHost/TestHost-Prefix.pch similarity index 71% rename from Test Host/Test Host-Prefix.pch rename to TestHost/TestHost-Prefix.pch index 5e01c4e6b..7fb14020c 100644 --- a/Test Host/Test Host-Prefix.pch +++ b/TestHost/TestHost-Prefix.pch @@ -1,5 +1,5 @@ // -// Prefix header for all source files of the 'Test Host' target in the 'Test Host' project +// Prefix header for all source files of the 'TestHost' target in the 'KIF' project // #import diff --git a/Test Host/TestSuiteViewController.m b/TestHost/TestSuiteViewController.m similarity index 100% rename from Test Host/TestSuiteViewController.m rename to TestHost/TestSuiteViewController.m diff --git a/Test Host/WebViewController.m b/TestHost/WebViewController.m similarity index 100% rename from Test Host/WebViewController.m rename to TestHost/WebViewController.m diff --git a/KIF Tests/en.lproj/InfoPlist.strings b/TestHost/en.lproj/InfoPlist.strings similarity index 100% rename from KIF Tests/en.lproj/InfoPlist.strings rename to TestHost/en.lproj/InfoPlist.strings diff --git a/Test Host/index.html b/TestHost/index.html similarity index 100% rename from Test Host/index.html rename to TestHost/index.html diff --git a/Test Host/main.m b/TestHost/main.m similarity index 94% rename from Test Host/main.m rename to TestHost/main.m index 49dde022d..104a43138 100644 --- a/Test Host/main.m +++ b/TestHost/main.m @@ -1,6 +1,6 @@ // // main.m -// Test Host +// TestHost // // Created by Brian Nickel on 6/29/13. // diff --git a/Test Host/page2.html b/TestHost/page2.html similarity index 100% rename from Test Host/page2.html rename to TestHost/page2.html diff --git a/KIF Tests/AccessibilityIdentifierPullToRefreshTests.m b/Tests/AccessibilityIdentifierPullToRefreshTests.m similarity index 100% rename from KIF Tests/AccessibilityIdentifierPullToRefreshTests.m rename to Tests/AccessibilityIdentifierPullToRefreshTests.m diff --git a/KIF Tests/AccessibilityIdentifierTests.m b/Tests/AccessibilityIdentifierTests.m similarity index 100% rename from KIF Tests/AccessibilityIdentifierTests.m rename to Tests/AccessibilityIdentifierTests.m diff --git a/KIF Tests/AccessibilityIdentifierTests_ViewTestActor.m b/Tests/AccessibilityIdentifierTests_ViewTestActor.m similarity index 100% rename from KIF Tests/AccessibilityIdentifierTests_ViewTestActor.m rename to Tests/AccessibilityIdentifierTests_ViewTestActor.m diff --git a/KIF Tests/Additions/UIScreen+KIFAdditionsTests.m b/Tests/Additions/UIScreen+KIFAdditionsTests.m similarity index 100% rename from KIF Tests/Additions/UIScreen+KIFAdditionsTests.m rename to Tests/Additions/UIScreen+KIFAdditionsTests.m diff --git a/KIF Tests/AutocorrectTests.m b/Tests/AutocorrectTests.m similarity index 100% rename from KIF Tests/AutocorrectTests.m rename to Tests/AutocorrectTests.m diff --git a/KIF Tests/AutocorrectTests_ViewTestActor.m b/Tests/AutocorrectTests_ViewTestActor.m similarity index 100% rename from KIF Tests/AutocorrectTests_ViewTestActor.m rename to Tests/AutocorrectTests_ViewTestActor.m diff --git a/KIF Tests/BackgroundTests.m b/Tests/BackgroundTests.m similarity index 100% rename from KIF Tests/BackgroundTests.m rename to Tests/BackgroundTests.m diff --git a/KIF Tests/CascadingFailureTests.m b/Tests/CascadingFailureTests.m similarity index 100% rename from KIF Tests/CascadingFailureTests.m rename to Tests/CascadingFailureTests.m diff --git a/KIF Tests/CollectionViewTests.m b/Tests/CollectionViewTests.m similarity index 100% rename from KIF Tests/CollectionViewTests.m rename to Tests/CollectionViewTests.m diff --git a/KIF Tests/CollectionViewTests_ViewTestActor.m b/Tests/CollectionViewTests_ViewTestActor.m similarity index 100% rename from KIF Tests/CollectionViewTests_ViewTestActor.m rename to Tests/CollectionViewTests_ViewTestActor.m diff --git a/KIF Tests/CompositionTests.m b/Tests/CompositionTests.m similarity index 100% rename from KIF Tests/CompositionTests.m rename to Tests/CompositionTests.m diff --git a/KIF Tests/CompositionTests_ViewTestActor.m b/Tests/CompositionTests_ViewTestActor.m similarity index 100% rename from KIF Tests/CompositionTests_ViewTestActor.m rename to Tests/CompositionTests_ViewTestActor.m diff --git a/KIF Tests/CustomActionTests_ViewTestActor.m b/Tests/CustomActionTests_ViewTestActor.m similarity index 100% rename from KIF Tests/CustomActionTests_ViewTestActor.m rename to Tests/CustomActionTests_ViewTestActor.m diff --git a/KIF Tests/CustomPickerTests.m b/Tests/CustomPickerTests.m similarity index 100% rename from KIF Tests/CustomPickerTests.m rename to Tests/CustomPickerTests.m diff --git a/KIF Tests/CustomPickerTests_ViewTestActor.m b/Tests/CustomPickerTests_ViewTestActor.m similarity index 100% rename from KIF Tests/CustomPickerTests_ViewTestActor.m rename to Tests/CustomPickerTests_ViewTestActor.m diff --git a/KIF Tests/ExistTests.m b/Tests/ExistTests.m similarity index 100% rename from KIF Tests/ExistTests.m rename to Tests/ExistTests.m diff --git a/KIF Tests/ExistTests_ViewTestActor.m b/Tests/ExistTests_ViewTestActor.m similarity index 100% rename from KIF Tests/ExistTests_ViewTestActor.m rename to Tests/ExistTests_ViewTestActor.m diff --git a/KIF Tests/GestureTests.m b/Tests/GestureTests.m similarity index 100% rename from KIF Tests/GestureTests.m rename to Tests/GestureTests.m diff --git a/KIF Tests/GestureTests_ViewTestActor.m b/Tests/GestureTests_ViewTestActor.m similarity index 100% rename from KIF Tests/GestureTests_ViewTestActor.m rename to Tests/GestureTests_ViewTestActor.m diff --git a/KIF Tests/KIF Tests-Info.plist b/Tests/KIFTests-Info.plist similarity index 100% rename from KIF Tests/KIF Tests-Info.plist rename to Tests/KIFTests-Info.plist diff --git a/KIF Tests/LandscapeTests.m b/Tests/LandscapeTests.m similarity index 100% rename from KIF Tests/LandscapeTests.m rename to Tests/LandscapeTests.m diff --git a/KIF Tests/LandscapeTests_ViewTestActor.m b/Tests/LandscapeTests_ViewTestActor.m similarity index 100% rename from KIF Tests/LandscapeTests_ViewTestActor.m rename to Tests/LandscapeTests_ViewTestActor.m diff --git a/KIF Tests/LongPressTests.m b/Tests/LongPressTests.m similarity index 100% rename from KIF Tests/LongPressTests.m rename to Tests/LongPressTests.m diff --git a/KIF Tests/LongPressTests_ViewTestActor.m b/Tests/LongPressTests_ViewTestActor.m similarity index 100% rename from KIF Tests/LongPressTests_ViewTestActor.m rename to Tests/LongPressTests_ViewTestActor.m diff --git a/KIF Tests/ModalViewTests.m b/Tests/ModalViewTests.m similarity index 100% rename from KIF Tests/ModalViewTests.m rename to Tests/ModalViewTests.m diff --git a/KIF Tests/ModalViewTests_ViewTestActor.m b/Tests/ModalViewTests_ViewTestActor.m similarity index 100% rename from KIF Tests/ModalViewTests_ViewTestActor.m rename to Tests/ModalViewTests_ViewTestActor.m diff --git a/KIF Tests/MultiFingerTests_ViewTestActor.m b/Tests/MultiFingerTests_ViewTestActor.m similarity index 100% rename from KIF Tests/MultiFingerTests_ViewTestActor.m rename to Tests/MultiFingerTests_ViewTestActor.m diff --git a/KIF Tests/OffscreenTests.m b/Tests/OffscreenTests.m similarity index 100% rename from KIF Tests/OffscreenTests.m rename to Tests/OffscreenTests.m diff --git a/KIF Tests/OffscreenTests_ViewTestActor.m b/Tests/OffscreenTests_ViewTestActor.m similarity index 100% rename from KIF Tests/OffscreenTests_ViewTestActor.m rename to Tests/OffscreenTests_ViewTestActor.m diff --git a/KIF Tests/PickerTests.m b/Tests/PickerTests.m similarity index 100% rename from KIF Tests/PickerTests.m rename to Tests/PickerTests.m diff --git a/KIF Tests/PickerTests_ViewTestActor.m b/Tests/PickerTests_ViewTestActor.m similarity index 100% rename from KIF Tests/PickerTests_ViewTestActor.m rename to Tests/PickerTests_ViewTestActor.m diff --git a/KIF Tests/PullToRefreshTests.m b/Tests/PullToRefreshTests.m similarity index 100% rename from KIF Tests/PullToRefreshTests.m rename to Tests/PullToRefreshTests.m diff --git a/KIF Tests/PullToRefreshTests_ViewTestActor.m b/Tests/PullToRefreshTests_ViewTestActor.m similarity index 100% rename from KIF Tests/PullToRefreshTests_ViewTestActor.m rename to Tests/PullToRefreshTests_ViewTestActor.m diff --git a/KIF Tests/ScrollViewTests.m b/Tests/ScrollViewTests.m similarity index 100% rename from KIF Tests/ScrollViewTests.m rename to Tests/ScrollViewTests.m diff --git a/KIF Tests/ScrollViewTests_ViewTestActor.m b/Tests/ScrollViewTests_ViewTestActor.m similarity index 100% rename from KIF Tests/ScrollViewTests_ViewTestActor.m rename to Tests/ScrollViewTests_ViewTestActor.m diff --git a/KIF Tests/SearchFieldTests.m b/Tests/SearchFieldTests.m similarity index 100% rename from KIF Tests/SearchFieldTests.m rename to Tests/SearchFieldTests.m diff --git a/KIF Tests/SearchFieldTests_ViewTestActor.m b/Tests/SearchFieldTests_ViewTestActor.m similarity index 100% rename from KIF Tests/SearchFieldTests_ViewTestActor.m rename to Tests/SearchFieldTests_ViewTestActor.m diff --git a/KIF Tests/SpecificControlTests.m b/Tests/SpecificControlTests.m similarity index 100% rename from KIF Tests/SpecificControlTests.m rename to Tests/SpecificControlTests.m diff --git a/KIF Tests/SpecificControlTests_ViewTestActor.m b/Tests/SpecificControlTests_ViewTestActor.m similarity index 100% rename from KIF Tests/SpecificControlTests_ViewTestActor.m rename to Tests/SpecificControlTests_ViewTestActor.m diff --git a/KIF Tests/SystemAlertTests.m b/Tests/SystemAlertTests.m similarity index 100% rename from KIF Tests/SystemAlertTests.m rename to Tests/SystemAlertTests.m diff --git a/KIF Tests/SystemAlertTests_ViewTestActor.m b/Tests/SystemAlertTests_ViewTestActor.m similarity index 100% rename from KIF Tests/SystemAlertTests_ViewTestActor.m rename to Tests/SystemAlertTests_ViewTestActor.m diff --git a/KIF Tests/SystemTests.m b/Tests/SystemTests.m similarity index 100% rename from KIF Tests/SystemTests.m rename to Tests/SystemTests.m diff --git a/KIF Tests/TableViewTests.m b/Tests/TableViewTests.m similarity index 100% rename from KIF Tests/TableViewTests.m rename to Tests/TableViewTests.m diff --git a/KIF Tests/TableViewTests_ViewTestActor.m b/Tests/TableViewTests_ViewTestActor.m similarity index 100% rename from KIF Tests/TableViewTests_ViewTestActor.m rename to Tests/TableViewTests_ViewTestActor.m diff --git a/KIF Tests/TappingTests.m b/Tests/TappingTests.m similarity index 100% rename from KIF Tests/TappingTests.m rename to Tests/TappingTests.m diff --git a/KIF Tests/TappingTests_ViewTestActor.m b/Tests/TappingTests_ViewTestActor.m similarity index 100% rename from KIF Tests/TappingTests_ViewTestActor.m rename to Tests/TappingTests_ViewTestActor.m diff --git a/KIF Tests/TypingTests.m b/Tests/TypingTests.m similarity index 100% rename from KIF Tests/TypingTests.m rename to Tests/TypingTests.m diff --git a/KIF Tests/TypingTests_ViewTestActor.m b/Tests/TypingTests_ViewTestActor.m similarity index 100% rename from KIF Tests/TypingTests_ViewTestActor.m rename to Tests/TypingTests_ViewTestActor.m diff --git a/KIF Tests/UIApplicationKIFAdditionsTests.m b/Tests/UIApplicationKIFAdditionsTests.m similarity index 100% rename from KIF Tests/UIApplicationKIFAdditionsTests.m rename to Tests/UIApplicationKIFAdditionsTests.m diff --git a/KIF Tests/WaitForAbscenceTests.m b/Tests/WaitForAbscenceTests.m similarity index 100% rename from KIF Tests/WaitForAbscenceTests.m rename to Tests/WaitForAbscenceTests.m diff --git a/KIF Tests/WaitForAbscenceTests_ViewTestActor.m b/Tests/WaitForAbscenceTests_ViewTestActor.m similarity index 100% rename from KIF Tests/WaitForAbscenceTests_ViewTestActor.m rename to Tests/WaitForAbscenceTests_ViewTestActor.m diff --git a/KIF Tests/WaitForAnimationTests.m b/Tests/WaitForAnimationTests.m similarity index 100% rename from KIF Tests/WaitForAnimationTests.m rename to Tests/WaitForAnimationTests.m diff --git a/KIF Tests/WaitForAnimationTests_ViewTestActor.m b/Tests/WaitForAnimationTests_ViewTestActor.m similarity index 100% rename from KIF Tests/WaitForAnimationTests_ViewTestActor.m rename to Tests/WaitForAnimationTests_ViewTestActor.m diff --git a/KIF Tests/WaitForTappableViewTests.m b/Tests/WaitForTappableViewTests.m similarity index 100% rename from KIF Tests/WaitForTappableViewTests.m rename to Tests/WaitForTappableViewTests.m diff --git a/KIF Tests/WaitForTappableViewTests_ViewTestActor.m b/Tests/WaitForTappableViewTests_ViewTestActor.m similarity index 100% rename from KIF Tests/WaitForTappableViewTests_ViewTestActor.m rename to Tests/WaitForTappableViewTests_ViewTestActor.m diff --git a/KIF Tests/WaitForViewTests.m b/Tests/WaitForViewTests.m similarity index 100% rename from KIF Tests/WaitForViewTests.m rename to Tests/WaitForViewTests.m diff --git a/KIF Tests/WaitForViewTests_ViewTestActor.m b/Tests/WaitForViewTests_ViewTestActor.m similarity index 100% rename from KIF Tests/WaitForViewTests_ViewTestActor.m rename to Tests/WaitForViewTests_ViewTestActor.m diff --git a/KIF Tests/WebViewTests.m b/Tests/WebViewTests.m similarity index 100% rename from KIF Tests/WebViewTests.m rename to Tests/WebViewTests.m diff --git a/KIF Tests/WebViewTests_ViewTestActor.m b/Tests/WebViewTests_ViewTestActor.m similarity index 100% rename from KIF Tests/WebViewTests_ViewTestActor.m rename to Tests/WebViewTests_ViewTestActor.m