Skip to content
This repository was archived by the owner on Dec 5, 2019. It is now read-only.

Commit c949819

Browse files
joshaberjoshaber
committed
Merge pull request #26 from ReactiveCocoa/xctest
++RAC and move to XCTest
2 parents f891c97 + c6e0430 commit c949819

File tree

5 files changed

+51
-30
lines changed

5 files changed

+51
-30
lines changed

‎External/ReactiveCocoa‎

‎ReactiveViewModel.xcodeproj/project.pbxproj‎

Lines changed: 43 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
BEB7DA4419634C4700F69C4F /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEB7DA4219634B5A00F69C4F /* XCTest.framework */; };
11+
BEB7DA491963536900F69C4F /* libSpecta-OSX.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEB7DA481963536900F69C4F /* libSpecta-OSX.a */; };
1012
D0948A49178159AD00BA8F23 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D0948A47178159AD00BA8F23 /* InfoPlist.strings */; };
1113
D0948A59178159AD00BA8F23 /* ReactiveViewModel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0948A3B178159AD00BA8F23 /* ReactiveViewModel.framework */; };
1214
D0948A5F178159AD00BA8F23 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D0948A5D178159AD00BA8F23 /* InfoPlist.strings */; };
@@ -17,8 +19,6 @@
1719
D0948AB817815ACD00BA8F23 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0948AB617815AC700BA8F23 /* Foundation.framework */; };
1820
D0948ABA17815AF100BA8F23 /* ReactiveViewModel.h in Headers */ = {isa = PBXBuildFile; fileRef = D0948A4B178159AD00BA8F23 /* ReactiveViewModel.h */; settings = {ATTRIBUTES = (Public, ); }; };
1921
D0948ABB17815AF100BA8F23 /* ReactiveViewModel.h in Headers */ = {isa = PBXBuildFile; fileRef = D0948A4B178159AD00BA8F23 /* ReactiveViewModel.h */; settings = {ATTRIBUTES = (Public, ); }; };
20-
D0948B3C17815E7300BA8F23 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0948B3B17815E7300BA8F23 /* SenTestingKit.framework */; };
21-
D0948B3D17815E7800BA8F23 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0948B3B17815E7300BA8F23 /* SenTestingKit.framework */; };
2222
D0948B3F17815E9700BA8F23 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0948B3E17815E9700BA8F23 /* UIKit.framework */; };
2323
D0948B551781610600BA8F23 /* RVMViewModel.h in Headers */ = {isa = PBXBuildFile; fileRef = D0948B531781610600BA8F23 /* RVMViewModel.h */; settings = {ATTRIBUTES = (Public, ); }; };
2424
D0948B561781610600BA8F23 /* RVMViewModel.h in Headers */ = {isa = PBXBuildFile; fileRef = D0948B531781610600BA8F23 /* RVMViewModel.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -32,7 +32,6 @@
3232
D4ACA4D418DB97A600EBD899 /* libReactiveCocoa-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ACA4D318DB97A600EBD899 /* libReactiveCocoa-iOS.a */; };
3333
D4ACA4D618DB97B500EBD899 /* libExpecta.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ACA4D518DB97B500EBD899 /* libExpecta.a */; };
3434
D4ACA4D818DB97BA00EBD899 /* libSpecta-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ACA4D718DB97BA00EBD899 /* libSpecta-iOS.a */; };
35-
D4ACA4DA18DB97D000EBD899 /* libSpecta.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ACA4D918DB97D000EBD899 /* libSpecta.a */; };
3635
D4ACA4DE18DB97DC00EBD899 /* libExpecta-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ACA4DD18DB97DC00EBD899 /* libExpecta-iOS.a */; };
3736
D4ACA4DF18DB980500EBD899 /* ReactiveCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ACA4D118DB97A000EBD899 /* ReactiveCocoa.framework */; };
3837
/* End PBXBuildFile section */
@@ -55,12 +54,14 @@
5554
/* End PBXContainerItemProxy section */
5655

5756
/* Begin PBXFileReference section */
57+
BEB7DA4219634B5A00F69C4F /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
58+
BEB7DA481963536900F69C4F /* libSpecta-OSX.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libSpecta-OSX.a"; path = "External/ReactiveCocoa/external/specta/build/Debug/libSpecta-OSX.a"; sourceTree = "<group>"; };
5859
D0948A3B178159AD00BA8F23 /* ReactiveViewModel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReactiveViewModel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5960
D0948A46178159AD00BA8F23 /* ReactiveViewModel-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ReactiveViewModel-Info.plist"; sourceTree = "<group>"; };
6061
D0948A48178159AD00BA8F23 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
6162
D0948A4A178159AD00BA8F23 /* ReactiveViewModel-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ReactiveViewModel-Prefix.pch"; sourceTree = "<group>"; };
6263
D0948A4B178159AD00BA8F23 /* ReactiveViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReactiveViewModel.h; sourceTree = "<group>"; };
63-
D0948A53178159AD00BA8F23 /* ReactiveViewModel Mac Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ReactiveViewModel Mac Tests.octest"; sourceTree = BUILT_PRODUCTS_DIR; };
64+
D0948A53178159AD00BA8F23 /* ReactiveViewModel Mac Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = "ReactiveViewModel Mac Tests.octest"; path = "ReactiveViewModel Mac Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
6465
D0948A5C178159AD00BA8F23 /* ReactiveViewModelTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ReactiveViewModelTests-Info.plist"; sourceTree = "<group>"; };
6566
D0948A5E178159AD00BA8F23 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
6667
D0948A75178159DA00BA8F23 /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = "<group>"; };
@@ -80,11 +81,10 @@
8081
D0948A87178159DA00BA8F23 /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
8182
D0948A88178159DA00BA8F23 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
8283
D0948A8D178159F900BA8F23 /* libReactiveViewModel.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReactiveViewModel.a; sourceTree = BUILT_PRODUCTS_DIR; };
83-
D0948A9C178159F900BA8F23 /* ReactiveViewModel iOS Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ReactiveViewModel iOS Tests.octest"; sourceTree = BUILT_PRODUCTS_DIR; };
84+
D0948A9C178159F900BA8F23 /* ReactiveViewModel iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ReactiveViewModel iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
8485
D0948AB317815ABD00BA8F23 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
8586
D0948AB617815AC700BA8F23 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
8687
D0948ABC17815B1800BA8F23 /* ReactiveViewModelTests-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ReactiveViewModelTests-Prefix.pch"; sourceTree = "<group>"; };
87-
D0948B3B17815E7300BA8F23 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
8888
D0948B3E17815E9700BA8F23 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
8989
D0948B531781610600BA8F23 /* RVMViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RVMViewModel.h; sourceTree = "<group>"; };
9090
D0948B541781610600BA8F23 /* RVMViewModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RVMViewModel.m; sourceTree = "<group>"; };
@@ -113,12 +113,12 @@
113113
isa = PBXFrameworksBuildPhase;
114114
buildActionMask = 2147483647;
115115
files = (
116-
D0948B3D17815E7800BA8F23 /* SenTestingKit.framework in Frameworks */,
116+
BEB7DA491963536900F69C4F /* libSpecta-OSX.a in Frameworks */,
117+
BEB7DA4419634C4700F69C4F /* XCTest.framework in Frameworks */,
117118
D0948A59178159AD00BA8F23 /* ReactiveViewModel.framework in Frameworks */,
118119
D4ACA4DF18DB980500EBD899 /* ReactiveCocoa.framework in Frameworks */,
119120
D0948AB517815AC200BA8F23 /* Foundation.framework in Frameworks */,
120121
D4ACA4D618DB97B500EBD899 /* libExpecta.a in Frameworks */,
121-
D4ACA4DA18DB97D000EBD899 /* libSpecta.a in Frameworks */,
122122
);
123123
runOnlyForDeploymentPostprocessing = 0;
124124
};
@@ -136,7 +136,6 @@
136136
buildActionMask = 2147483647;
137137
files = (
138138
D0948B3F17815E9700BA8F23 /* UIKit.framework in Frameworks */,
139-
D0948B3C17815E7300BA8F23 /* SenTestingKit.framework in Frameworks */,
140139
D0948AB817815ACD00BA8F23 /* Foundation.framework in Frameworks */,
141140
D0948AA3178159F900BA8F23 /* libReactiveViewModel.a in Frameworks */,
142141
D4ACA4D818DB97BA00EBD899 /* libSpecta-iOS.a in Frameworks */,
@@ -164,14 +163,16 @@
164163
D0948A3B178159AD00BA8F23 /* ReactiveViewModel.framework */,
165164
D0948A53178159AD00BA8F23 /* ReactiveViewModel Mac Tests.octest */,
166165
D0948A8D178159F900BA8F23 /* libReactiveViewModel.a */,
167-
D0948A9C178159F900BA8F23 /* ReactiveViewModel iOS Tests.octest */,
166+
D0948A9C178159F900BA8F23 /* ReactiveViewModel iOS Tests.xctest */,
168167
);
169168
name = Products;
170169
sourceTree = "<group>";
171170
};
172171
D0948A3D178159AD00BA8F23 /* Frameworks */ = {
173172
isa = PBXGroup;
174173
children = (
174+
BEB7DA481963536900F69C4F /* libSpecta-OSX.a */,
175+
BEB7DA4219634B5A00F69C4F /* XCTest.framework */,
175176
D4ACA4D918DB97D000EBD899 /* libSpecta.a */,
176177
D4ACA4D718DB97BA00EBD899 /* libSpecta-iOS.a */,
177178
D4ACA4D518DB97B500EBD899 /* libExpecta.a */,
@@ -180,7 +181,6 @@
180181
D4ACA4D318DB97A600EBD899 /* libReactiveCocoa-iOS.a */,
181182
D0948AB617815AC700BA8F23 /* Foundation.framework */,
182183
D0948AB317815ABD00BA8F23 /* Foundation.framework */,
183-
D0948B3B17815E7300BA8F23 /* SenTestingKit.framework */,
184184
D0948B3E17815E9700BA8F23 /* UIKit.framework */,
185185
);
186186
name = Frameworks;
@@ -366,7 +366,7 @@
366366
name = "ReactiveViewModel Mac Tests";
367367
productName = ReactiveViewModelTests;
368368
productReference = D0948A53178159AD00BA8F23 /* ReactiveViewModel Mac Tests.octest */;
369-
productType = "com.apple.product-type.bundle";
369+
productType = "com.apple.product-type.bundle.unit-test";
370370
};
371371
D0948A8C178159F900BA8F23 /* ReactiveViewModel iOS */ = {
372372
isa = PBXNativeTarget;
@@ -400,7 +400,7 @@
400400
);
401401
name = "ReactiveViewModel iOS Tests";
402402
productName = ReactiveViewModelTests;
403-
productReference = D0948A9C178159F900BA8F23 /* ReactiveViewModel iOS Tests.octest */;
403+
productReference = D0948A9C178159F900BA8F23 /* ReactiveViewModel iOS Tests.xctest */;
404404
productType = "com.apple.product-type.bundle";
405405
};
406406
/* End PBXNativeTarget section */
@@ -409,6 +409,7 @@
409409
D0948A32178159AD00BA8F23 /* Project object */ = {
410410
isa = PBXProject;
411411
attributes = {
412+
LastTestingUpgradeCheck = 0510;
412413
LastUpgradeCheck = 0500;
413414
ORGANIZATIONNAME = GitHub;
414415
};
@@ -580,33 +581,41 @@
580581
isa = XCBuildConfiguration;
581582
baseConfigurationReference = D0948A83178159DA00BA8F23 /* Mac-Application.xcconfig */;
582583
buildSettings = {
583-
FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"";
584+
FRAMEWORK_SEARCH_PATHS = (
585+
"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
586+
"$(inherited)",
587+
"$(DEVELOPER_FRAMEWORKS_DIR)",
588+
);
584589
GCC_PREFIX_HEADER = "ReactiveViewModelTests/ReactiveViewModelTests-Prefix.pch";
585590
HEADER_SEARCH_PATHS = (
586591
External/ReactiveCocoa/external/specta/src,
587592
"External/ReactiveCocoa/external/expecta/src/**",
588593
);
589594
INFOPLIST_FILE = "ReactiveViewModelTests/ReactiveViewModelTests-Info.plist";
595+
LIBRARY_SEARCH_PATHS = "$(inherited)";
590596
OTHER_LDFLAGS = "-all_load";
591597
PRODUCT_NAME = "$(TARGET_NAME)";
592-
WRAPPER_EXTENSION = octest;
593598
};
594599
name = Debug;
595600
};
596601
D0948A6A178159AD00BA8F23 /* Release */ = {
597602
isa = XCBuildConfiguration;
598603
baseConfigurationReference = D0948A83178159DA00BA8F23 /* Mac-Application.xcconfig */;
599604
buildSettings = {
600-
FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"";
605+
FRAMEWORK_SEARCH_PATHS = (
606+
"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
607+
"$(inherited)",
608+
"$(DEVELOPER_FRAMEWORKS_DIR)",
609+
);
601610
GCC_PREFIX_HEADER = "ReactiveViewModelTests/ReactiveViewModelTests-Prefix.pch";
602611
HEADER_SEARCH_PATHS = (
603612
External/ReactiveCocoa/external/specta/src,
604613
"External/ReactiveCocoa/external/expecta/src/**",
605614
);
606615
INFOPLIST_FILE = "ReactiveViewModelTests/ReactiveViewModelTests-Info.plist";
616+
LIBRARY_SEARCH_PATHS = "$(inherited)";
607617
OTHER_LDFLAGS = "-all_load";
608618
PRODUCT_NAME = "$(TARGET_NAME)";
609-
WRAPPER_EXTENSION = octest;
610619
};
611620
name = Release;
612621
};
@@ -649,7 +658,7 @@
649658
INFOPLIST_FILE = "ReactiveViewModelTests/ReactiveViewModelTests-Info.plist";
650659
OTHER_LDFLAGS = "-all_load";
651660
PRODUCT_NAME = "$(TARGET_NAME)";
652-
WRAPPER_EXTENSION = octest;
661+
WRAPPER_EXTENSION = xctest;
653662
};
654663
name = Debug;
655664
};
@@ -670,7 +679,7 @@
670679
INFOPLIST_FILE = "ReactiveViewModelTests/ReactiveViewModelTests-Info.plist";
671680
OTHER_LDFLAGS = "-all_load";
672681
PRODUCT_NAME = "$(TARGET_NAME)";
673-
WRAPPER_EXTENSION = octest;
682+
WRAPPER_EXTENSION = xctest;
674683
};
675684
name = Release;
676685
};
@@ -702,16 +711,20 @@
702711
isa = XCBuildConfiguration;
703712
baseConfigurationReference = D0948A83178159DA00BA8F23 /* Mac-Application.xcconfig */;
704713
buildSettings = {
705-
FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"";
714+
FRAMEWORK_SEARCH_PATHS = (
715+
"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
716+
"$(inherited)",
717+
"$(DEVELOPER_FRAMEWORKS_DIR)",
718+
);
706719
GCC_PREFIX_HEADER = "ReactiveViewModelTests/ReactiveViewModelTests-Prefix.pch";
707720
HEADER_SEARCH_PATHS = (
708721
External/ReactiveCocoa/external/specta/src,
709722
"External/ReactiveCocoa/external/expecta/src/**",
710723
);
711724
INFOPLIST_FILE = "ReactiveViewModelTests/ReactiveViewModelTests-Info.plist";
725+
LIBRARY_SEARCH_PATHS = "$(inherited)";
712726
OTHER_LDFLAGS = "-all_load";
713727
PRODUCT_NAME = "$(TARGET_NAME)";
714-
WRAPPER_EXTENSION = octest;
715728
};
716729
name = Profile;
717730
};
@@ -743,7 +756,7 @@
743756
INFOPLIST_FILE = "ReactiveViewModelTests/ReactiveViewModelTests-Info.plist";
744757
OTHER_LDFLAGS = "-all_load";
745758
PRODUCT_NAME = "$(TARGET_NAME)";
746-
WRAPPER_EXTENSION = octest;
759+
WRAPPER_EXTENSION = xctest;
747760
};
748761
name = Profile;
749762
};
@@ -775,16 +788,20 @@
775788
isa = XCBuildConfiguration;
776789
baseConfigurationReference = D0948A83178159DA00BA8F23 /* Mac-Application.xcconfig */;
777790
buildSettings = {
778-
FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"";
791+
FRAMEWORK_SEARCH_PATHS = (
792+
"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
793+
"$(inherited)",
794+
"$(DEVELOPER_FRAMEWORKS_DIR)",
795+
);
779796
GCC_PREFIX_HEADER = "ReactiveViewModelTests/ReactiveViewModelTests-Prefix.pch";
780797
HEADER_SEARCH_PATHS = (
781798
External/ReactiveCocoa/external/specta/src,
782799
"External/ReactiveCocoa/external/expecta/src/**",
783800
);
784801
INFOPLIST_FILE = "ReactiveViewModelTests/ReactiveViewModelTests-Info.plist";
802+
LIBRARY_SEARCH_PATHS = "$(inherited)";
785803
OTHER_LDFLAGS = "-all_load";
786804
PRODUCT_NAME = "$(TARGET_NAME)";
787-
WRAPPER_EXTENSION = octest;
788805
};
789806
name = Test;
790807
};
@@ -814,9 +831,10 @@
814831
"External/ReactiveCocoa/external/expecta/src/**",
815832
);
816833
INFOPLIST_FILE = "ReactiveViewModelTests/ReactiveViewModelTests-Info.plist";
834+
ONLY_ACTIVE_ARCH = YES;
817835
OTHER_LDFLAGS = "-all_load";
818836
PRODUCT_NAME = "$(TARGET_NAME)";
819-
WRAPPER_EXTENSION = octest;
837+
WRAPPER_EXTENSION = xctest;
820838
};
821839
name = Test;
822840
};

‎ReactiveViewModel.xcodeproj/xcshareddata/xcschemes/ReactiveViewModel Mac.xcscheme‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<BuildableReference
3030
BuildableIdentifier = "primary"
3131
BlueprintIdentifier = "D0948A52178159AD00BA8F23"
32-
BuildableName = "ReactiveViewModel Mac Tests.octest"
32+
BuildableName = "ReactiveViewModel Mac Tests.xctest"
3333
BlueprintName = "ReactiveViewModel Mac Tests"
3434
ReferencedContainer = "container:ReactiveViewModel.xcodeproj">
3535
</BuildableReference>
@@ -47,7 +47,7 @@
4747
<BuildableReference
4848
BuildableIdentifier = "primary"
4949
BlueprintIdentifier = "D0948A52178159AD00BA8F23"
50-
BuildableName = "ReactiveViewModel Mac Tests.octest"
50+
BuildableName = "ReactiveViewModel Mac Tests.xctest"
5151
BlueprintName = "ReactiveViewModel Mac Tests"
5252
ReferencedContainer = "container:ReactiveViewModel.xcodeproj">
5353
</BuildableReference>

‎ReactiveViewModel.xcodeproj/xcshareddata/xcschemes/ReactiveViewModel iOS.xcscheme‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<BuildableReference
3030
BuildableIdentifier = "primary"
3131
BlueprintIdentifier = "D0948A9B178159F900BA8F23"
32-
BuildableName = "ReactiveViewModel iOS Tests.octest"
32+
BuildableName = "ReactiveViewModel iOS Tests.xctest"
3333
BlueprintName = "ReactiveViewModel iOS Tests"
3434
ReferencedContainer = "container:ReactiveViewModel.xcodeproj">
3535
</BuildableReference>
@@ -47,7 +47,7 @@
4747
<BuildableReference
4848
BuildableIdentifier = "primary"
4949
BlueprintIdentifier = "D0948A9B178159F900BA8F23"
50-
BuildableName = "ReactiveViewModel iOS Tests.octest"
50+
BuildableName = "ReactiveViewModel iOS Tests.xctest"
5151
BlueprintName = "ReactiveViewModel iOS Tests"
5252
ReferencedContainer = "container:ReactiveViewModel.xcodeproj">
5353
</BuildableReference>

‎ReactiveViewModelTests/ReactiveViewModelTests-Prefix.pch‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@
66
#define EXP_SHORTHAND
77
#import "Specta.h"
88
#import "Expecta.h"
9+
10+
// Expecta #defines startWith as beginWith, which messes up -startWith: :-(
11+
#undef startWith

0 commit comments

Comments
 (0)