Adding OCMock as gitmodule for building tests. (#1478)

noobs2ninjas · web-flow · commit de12a6f2efc8 · 2020-03-10T09:24:22.000-05:00
*Moved OCMock to .gitmodules to make Carthage users' download more lightweight. *Updated all test targets to build and link OCMock. *Fixed many of the broken tests that have crashed or failed due to OCMock version. *Updated facebook dependency version *Circle and Travis build fixes across all platforms and for nightly build. Co-authored-by: @drdaz
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ aliases:
   - &prepare
     |
       git submodule update --init --recursive
-      gem install bundler
+      sudo gem install bundler
       bundle install
   - &filter-only-master
     branches:
@@ -19,7 +19,6 @@ jobs:
     <<: *defaults
     steps:
       - checkout
-      - run: echo 'chruby ruby-2.6' >> ~/.bash_profile
       - run: *prepare
       - run: bundle exec rake test:ios
       - run: bash <(curl -s https://codecov.io/bash)
@@ -29,7 +28,6 @@ jobs:
     <<: *defaults
     steps:
       - checkout
-      - run: echo 'chruby ruby-2.6' >> ~/.bash_profile
       - run: *prepare
       - run:
           name: "Create and set the default keychain"
@@ -49,7 +47,6 @@ jobs:
     <<: *defaults
     steps:
       - checkout
-      - run: echo 'chruby ruby-2.6' >> ~/.bash_profile
       - run: *prepare
       - run: bundle exec rake test:facebook_utils:ios
       - run: bash <(curl -s https://codecov.io/bash)
@@ -59,7 +56,6 @@ jobs:
     <<: *defaults
     steps:
       - checkout
-      - run: echo 'chruby ruby-2.6' >> ~/.bash_profile
       - run: *prepare
       - run: bundle exec rake test:twitter_utils:ios
       - run: bash <(curl -s https://codecov.io/bash)
@@ -69,7 +65,6 @@ jobs:
     <<: *defaults
     steps:
       - checkout
-      - run: echo 'chruby ruby-2.6' >> ~/.bash_profile
       - run: *prepare
       - run: bundle exec rake test:parseui:all
       - run: bash <(curl -s https://codecov.io/bash)
@@ -87,21 +82,18 @@ jobs:
     <<: *defaults
     steps:
       - checkout
-      - run: echo 'chruby ruby-2.6' >> ~/.bash_profile
       - run: *prepare
       - run: ./Scripts/jazzy.sh
   carthage:
     <<: *defaults
     steps:
       - checkout
-      - run: echo 'chruby ruby-2.6' >> ~/.bash_profile
       - run: *prepare
       - run: bundle exec rake test:carthage
   cocoapods:
     <<: *defaults
     steps:
       - checkout
-      - run: echo 'chruby ruby-2.6' >> ~/.bash_profile
       - run: *prepare
       - run: bundle exec rake test:cocoapods
 
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 ## Build generated
 build/
 DerivedData
+OCMock.framework
 
 ## Various settings
 *.pbxuser
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "Carthage/Checkouts/facebook-objc-sdk"]
 	path = Carthage/Checkouts/facebook-objc-sdk
 	url = https://github.com/facebook/facebook-objc-sdk.git
+[submodule "Carthage/Checkouts/OCMock"]
+	path = Carthage/Checkouts/OCMock
+	url = https://github.com/erikdoe/OCMock.git
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "facebook/facebook-objc-sdk" "v5.13.1"
+github "facebook/facebook-objc-sdk" "v5.15.1"
 github "parse-community/Bolts-ObjC" "1.9.1"
diff --git a/Carthage/Checkouts/OCMock b/Carthage/Checkouts/OCMock
@@ -0,0 +1 @@
+Subproject commit 62fd0b23c6f5be5c4166211f82b4e162af9ad4ce
diff --git a/Carthage/Checkouts/facebook-objc-sdk b/Carthage/Checkouts/facebook-objc-sdk
@@ -1 +1 @@
-Subproject commit 54219ba9f5c7bdaabdd92aeac10023731e09efc8
+Subproject commit 9398d30089c2c14e0f0026e24388ca0829f8f1c5
diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj
diff --git a/Parse/Parse/Internal/PFApplication.m b/Parse/Parse/Internal/PFApplication.m
@@ -39,8 +39,10 @@ - (id)init {
     if (self) {
 #if TARGET_OS_IOS || TARGET_OS_TV
         if (@available(iOS 1.0, tvOS 10.0, *)) {
-            [self.systemApplication addObserver:self forKeyPath:@"applicationIconBadgeNumber" options:NSKeyValueObservingOptionNew context:nil];
-            _iconBadgeNumber = self.systemApplication.applicationIconBadgeNumber;
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self.systemApplication addObserver:self forKeyPath:@"applicationIconBadgeNumber" options:NSKeyValueObservingOptionNew context:nil];
+                self->_iconBadgeNumber = self.systemApplication.applicationIconBadgeNumber;
+            });
         }
 #endif
     }
diff --git a/Parse/Tests/Other/StoreKitMocking/PFTestSKProductsRequest.m b/Parse/Tests/Other/StoreKitMocking/PFTestSKProductsRequest.m
@@ -67,4 +67,4 @@ - (void)start {
 - (void)cancel {
 }
 
-@end
+@end
diff --git a/Parse/Tests/Unit/FileControllerTests.m b/Parse/Tests/Unit/FileControllerTests.m
@@ -340,8 +340,8 @@ - (void)testDownloadStreamSharesOperations {
     BFTaskCompletionSource *taskCompletionSource = [BFTaskCompletionSource taskCompletionSource];
     __block PFProgressBlock progressBlock = nil;
 
-    id mockedCommandRunner = [mockedDataSource commandRunner];
-    OCMStub([mockedCommandRunner runFileDownloadCommandAsyncWithFileURL:tempPath
+    id<PFCommandRunning> commandRunner = [mockedDataSource commandRunner];
+    OCMStub([commandRunner runFileDownloadCommandAsyncWithFileURL:tempPath
                                                          targetFilePath:[OCMArg isNotNil]
                                                       cancellationToken:nil
                                                           progressBlock:[OCMArg checkWithBlock:^BOOL(id obj) {
diff --git a/Parse/Tests/Unit/KeyValueCacheTests.m b/Parse/Tests/Unit/KeyValueCacheTests.m
@@ -54,7 +54,7 @@ - (void)testConstructors {
     XCTAssertEqual(cache.maxDiskCacheRecords, 1000);
     XCTAssertEqual(cache.maxMemoryCacheBytesPerRecord, 1024 * 1024);
 
-    id mockedFileManager = [TestFileManager fileManager];
+    id mockedFileManager = [OCMockObject partialMockForObject:[TestFileManager fileManager]];
     OCMExpect([mockedFileManager createDirectoryAtURL:OCMOCK_ANY withIntermediateDirectories:YES attributes:nil error:NULL]);
 
     NSCache *mockedCache = [TestCache cache];
diff --git a/Parse/Tests/Unit/PinningObjectStoreTests.m b/Parse/Tests/Unit/PinningObjectStoreTests.m
@@ -38,9 +38,8 @@ @implementation PinningObjectStoreTests
 
 - (void)setUp
 {
-    [PFPin registerSubclass];
-
     [super setUp];
+    [PFPin registerSubclass];
 }
 
 - (void)testConstructors {
diff --git a/Parse/Tests/Unit/PurchaseControllerTests.m b/Parse/Tests/Unit/PurchaseControllerTests.m
@@ -187,8 +187,10 @@ - (void)testBuyProductsAsync {
     }];
 
     [self waitForTestExpectations];
-
-    OCMStub([purchaseController canPurchase]).andReturn(YES);
+    
+    id partial = [OCMockObject partialMockForObject:purchaseController];
+    OCMStub([partial canPurchase]).andReturn(YES);
+    
     XCTestExpectation *failInvalidProductExpectation = [self expectationWithDescription:@"Failed Invalid Product"];
 
     [[purchaseController buyProductAsyncWithIdentifier:@"nonexistent"] continueWithBlock:^id(BFTask *task) {
diff --git a/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj b/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj
diff --git a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj
diff --git a/Rakefile b/Rakefile

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-github "facebook/facebook-objc-sdk" "v5.13.1"`
	`1`	`+github "facebook/facebook-objc-sdk" "v5.15.1"`
`2`	`2`	`github "parse-community/Bolts-ObjC" "1.9.1"`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,10 @@ - (id)init {`
`39`	`39`	`if (self) {`
`40`	`40`	`#if TARGET_OS_IOS \|\| TARGET_OS_TV`
`41`	`41`	`if (@available(iOS 1.0, tvOS 10.0, *)) {`
`42`		`- [self.systemApplication addObserver:self forKeyPath:@"applicationIconBadgeNumber" options:NSKeyValueObservingOptionNew context:nil];`
`43`		`- _iconBadgeNumber = self.systemApplication.applicationIconBadgeNumber;`
	`42`	`+ dispatch_async(dispatch_get_main_queue(), ^{`
	`43`	`+ [self.systemApplication addObserver:self forKeyPath:@"applicationIconBadgeNumber" options:NSKeyValueObservingOptionNew context:nil];`
	`44`	`+ self->_iconBadgeNumber = self.systemApplication.applicationIconBadgeNumber;`
	`45`	`+ });`
`44`	`46`	`}`
`45`	`47`	`#endif`
`46`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,4 @@ - (void)start {`
`67`	`67`	`- (void)cancel {`
`68`	`68`	`}`
`69`	`69`
`70`		`-@end`
	`70`	`+@end`