Move to specta/specta, specta/expecta, and XCTest

il3n · Jun 27, 2014 · dcfa7ba · dcfa7ba
1 parent 8a757d5
commit dcfa7ba
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 42 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "external/specta"]
 	path = external/specta
-	url = git://github.com/github/specta.git
+	url = https://github.com/specta/specta.git
 [submodule "external/expecta"]
 	path = external/expecta
-	url = git://github.com/github/expecta.git
+	url = https://github.com/specta/expecta.git
 [submodule "external/xcconfigs"]
 	path = external/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
diff --git a/ReactiveCocoaFramework/ReactiveCocoa.xcodeproj/project.pbxproj b/ReactiveCocoaFramework/ReactiveCocoa.xcodeproj/project.pbxproj
diff --git a/...eCocoaFramework/ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa-iOS.xcscheme b/...eCocoaFramework/ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa-iOS.xcscheme
@@ -29,7 +29,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "5FAF5222174D4C2000CAC810"
-               BuildableName = "ReactiveCocoaTests-iOS.octest"
+               BuildableName = "ReactiveCocoaTests-iOS.xctest"
                BlueprintName = "ReactiveCocoaTests-iOS"
                ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
             </BuildableReference>
@@ -47,7 +47,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "5FAF5222174D4C2000CAC810"
-               BuildableName = "ReactiveCocoaTests-iOS.octest"
+               BuildableName = "ReactiveCocoaTests-iOS.xctest"
                BlueprintName = "ReactiveCocoaTests-iOS"
                ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
             </BuildableReference>

diff --git a/ReactiveCocoaFramework/ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa.xcscheme b/ReactiveCocoaFramework/ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa.xcscheme
@@ -29,7 +29,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "88CDF7DB15000FCF00163A9F"
-               BuildableName = "ReactiveCocoaTests.octest"
+               BuildableName = "ReactiveCocoaTests.xctest"
                BlueprintName = "ReactiveCocoaTests"
                ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
             </BuildableReference>
@@ -47,7 +47,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "88CDF7DB15000FCF00163A9F"
-               BuildableName = "ReactiveCocoaTests.octest"
+               BuildableName = "ReactiveCocoaTests.xctest"
                BlueprintName = "ReactiveCocoaTests"
                ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
             </BuildableReference>

diff --git a/ReactiveCocoaFramework/ReactiveCocoaTests/NSObjectRACPropertySubscribingExamples.m b/ReactiveCocoaFramework/ReactiveCocoaTests/NSObjectRACPropertySubscribingExamples.m
@@ -194,7 +194,7 @@
 				CFRelease(object);
 
 				// expect() is a bit finicky on background threads.
-				STAssertTrue(deallocated, @"Object did not deallocate after being released");
+				XCTAssertTrue(deallocated, @"Object did not deallocate after being released");
 			});
 
 			unsigned afterCount = arc4random_uniform(20);

diff --git a/ReactiveCocoaFramework/ReactiveCocoaTests/ReactiveCocoaTests-Prefix.pch b/ReactiveCocoaFramework/ReactiveCocoaTests/ReactiveCocoaTests-Prefix.pch
@@ -12,3 +12,6 @@
 #define EXP_SHORTHAND
 #import "Specta.h"
 #import "Expecta.h"
+
+// Expecta #defines startWith as beginWith, which messes up -startWith: :-(
+#undef startWith
diff --git a/external/expecta b/external/expecta
diff --git a/external/specta b/external/specta
+4 −0		.gitignore
+3 −0		.travis.yml
+6 −0		CHANGELOG.md
+7 −4		Expecta.podspec
+374 −32		Expecta.xcodeproj/project.pbxproj
+69 −0		Expecta.xcodeproj/xcshareddata/xcschemes/Expecta-iOS.xcscheme
+107 −0		Expecta.xcodeproj/xcshareddata/xcschemes/Expecta.xcscheme
+49 −27		README.md
+0 −5		products/.gitignore
+1 −1		src/Expecta.h
+1 −1		src/Expecta.m
+8 −0		src/ExpectaSupport.h
+14 −0		src/ExpectaSupport.m
+9 −0		src/NSObject+Expecta.h
+1 −1		src/matchers/EXPMatchers+beCloseTo.m
+1 −1		src/matchers/EXPMatchers+beGreaterThan.m
+1 −1		src/matchers/EXPMatchers+beGreaterThanOrEqualTo.m
+1 −0		src/matchers/EXPMatchers+beIdenticalTo.h
+1 −1		src/matchers/EXPMatchers+beInTheRangeOf.m
+1 −1		src/matchers/EXPMatchers+beLessThan.m
+1 −1		src/matchers/EXPMatchers+beLessThanOrEqualTo.m
+4 −0		src/matchers/EXPMatchers+beSupersetOf.h
+51 −0		src/matchers/EXPMatchers+beSupersetOf.m
+5 −0		src/matchers/EXPMatchers+beginWith.h
+49 −0		src/matchers/EXPMatchers+beginWith.m
+4 −29		src/matchers/EXPMatchers+contain.m
+3 −0		src/matchers/EXPMatchers+endWith.h
+49 −0		src/matchers/EXPMatchers+endWith.m
+1 −1		src/matchers/EXPMatchers+equal.h
+5 −4		src/matchers/EXPMatchers+haveCountOf.m
+4 −0		src/matchers/EXPMatchers+notify.h
+63 −0		src/matchers/EXPMatchers+notify.m
+3 −0		src/matchers/EXPMatchers+respondTo.h
+28 −0		src/matchers/EXPMatchers+respondTo.m
+5 −0		src/matchers/EXPMatchers.h
+1 −1		test/AsynchronousTestingTest.m
+1 −1		test/CustomMatcherImplementationsTest.m
+1 −1		test/DynamicPredicateMatcherTest.m
+33 −0		test/EXPFailTest.h
+41 −13		test/EXPFailTest.m
+1 −1		test/ExpectationTest.m
+1 −1		test/MiscTest.m
+1 −1		test/NSValue+ExpectaTest.m
+7 −0		test/helpers/FakeTestCase.h
+11 −0		test/helpers/FakeTestCase.m
+8 −2		test/helpers/Fixtures.h
+8 −2		test/helpers/Fixtures.m
+24 −0		test/helpers/TestHelper.h
+1 −1		test/matchers/EXPMatchers+beCloseToTest.m
+1 −1		test/matchers/EXPMatchers+beFalsyTest.m
+1 −1		test/matchers/EXPMatchers+beGreaterThanOrEqualToTest.m
+1 −1		test/matchers/EXPMatchers+beGreaterThanTest.m
+1 −1		test/matchers/EXPMatchers+beIdenticalToTest.m
+1 −1		test/matchers/EXPMatchers+beInTheRangeOfTest.m
+1 −1		test/matchers/EXPMatchers+beInstanceOfTest.m
+1 −1		test/matchers/EXPMatchers+beKindOfTest.m
+1 −1		test/matchers/EXPMatchers+beLessThanOrEqualToTest.m
+1 −1		test/matchers/EXPMatchers+beLessThanTest.m
+1 −1		test/matchers/EXPMatchers+beNilTest.m
+1 −1		test/matchers/EXPMatchers+beSubclassOfTest.m
+74 −0		test/matchers/EXPMatchers+beSupersetOfTest.m
+1 −1		test/matchers/EXPMatchers+beTruthyTest.m
+108 −0		test/matchers/EXPMatchers+beginWithTest.m
+1 −23		test/matchers/EXPMatchers+containTest.m
+108 −0		test/matchers/EXPMatchers+endWithTest.m
+2 −1		test/matchers/EXPMatchers+equalTest.m
+9 −3		test/matchers/EXPMatchers+haveCountOfTest.m
+124 −0		test/matchers/EXPMatchers+notifyTest.m
+1 −1		test/matchers/EXPMatchers+raiseTest.m
+1 −1		test/matchers/EXPMatchers+raiseWithReasonTest.m
+39 −0		test/matchers/EXPMatchers+respondToTest.m
+22 −0		test/support/Test-XCTest-Info.plist
+18 −0		test/support/objc-build-scripts/LICENSE.md
+82 −0		test/support/objc-build-scripts/README.md
+80 −0		test/support/objc-build-scripts/bootstrap
+142 −0		test/support/objc-build-scripts/cibuild
+12 −0		test/support/objc-build-scripts/schemes.awk
+25 −0		test/support/objc-build-scripts/xctool.awk