Refactor stubbing to be less verbose for keyed responses.

Mobile Buy SDK/Mobile Buy SDK Tests/BUYClientTest_Customer.m

@@ -52,11 +52,7 @@
 
 - (void)testCustomerDuplicateEmail
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testCustomerDuplicateEmail"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testCustomerDuplicateEmail" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	[self.client createCustomerWithCredentials:[self credentialsForCreation] callback:^(BUYCustomer *customer, NSString *token, NSError *error) {
@@ -83,11 +79,7 @@
 
 - (void)testCustomerInvalidEmailPassword
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testCustomerInvalidEmailPassword"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testCustomerInvalidEmailPassword" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	[self.client createCustomerWithCredentials:[self credentialsForFailure] callback:^(BUYCustomer *customer, NSString *token, NSError *error) {
@@ -121,11 +113,7 @@
 
 - (void)testCustomerLogin
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testCustomerLogin"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testCustomerLogin" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	[self.client loginCustomerWithCredentials:[self credentialsForLogin] callback:^(BUYCustomer *customer, NSString *token, NSError *error) {
@@ -144,20 +132,12 @@
 
 - (void)testCustomerLogout
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testCustomerLogin"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testCustomerLogin" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	[self.client loginCustomerWithCredentials:[self credentialsForLogin] callback:^(BUYCustomer *customer, NSString *token, NSError *error) {
 		
-		[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-			return [self shouldUseMocks];
-		} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-			return [OHHTTPStubsResponse responseWithKey:@"testCustomerLogout"];
-		}];
+		[OHHTTPStubs stubUsingResponseWithKey:@"testCustomerLogout" useMocks:[self shouldUseMocks]];
 		
 		[self.client logoutCustomerID:customer.identifier.stringValue callback:^(BUYStatus status, NSError * _Nullable error) {
 			
@@ -175,11 +155,7 @@
 
 - (void)testCustomerUpdate
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testCustomerLogin"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testCustomerLogin" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	
@@ -188,11 +164,7 @@
 	
 	[self.client loginCustomerWithCredentials:[self credentialsForLogin] callback:^(BUYCustomer * _Nullable customer, NSString * _Nullable token, NSError * _Nullable error) {
 		
-		[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-			return [self shouldUseMocks];
-		} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-			return [OHHTTPStubsResponse responseWithKey:@"testCustomerLogin"];
-		}];
+		[OHHTTPStubs stubUsingResponseWithKey:@"testCustomerLogin" useMocks:[self shouldUseMocks]];
 		
 		[self.client updateCustomerWithCredentials:credentials customerID:customer.identifier.stringValue callback:^(BUYCustomer *customer, NSError *error) {
 			

Mobile Buy SDK/Mobile Buy SDK Tests/BUYClientTest_Storefront.m

@@ -65,11 +65,7 @@
 
 - (void)testGetProductList
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testGetProducts_0"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testGetProducts_0" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	[self.client getProductsPage:0 completion:^(NSArray *products, NSUInteger page, BOOL reachedEnd, NSError *error) {
@@ -86,11 +82,7 @@
 
 - (void)testGetShop
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testGetShop_0"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testGetShop_0" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	[self.client getShop:^(BUYShop *shop, NSError *error) {
@@ -107,11 +99,7 @@
 
 - (void)testGetProductById
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testGetProduct_0"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testGetProduct_0" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	[self.client getProductById:self.productIds[0] completion:^(BUYProduct *product, NSError *error) {
@@ -136,11 +124,7 @@
 
 - (void)testGetMultipleProductByIds
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testGetProducts_0"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testGetProducts_0" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 
@@ -171,11 +155,7 @@
 
 - (void)testProductRequestError
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testGetNonexistentProduct_0"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testGetNonexistentProduct_0" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	[self.client getProductById:@"asdfdsasdfdsasdfdsasdfjkllkj" completion:^(BUYProduct *product, NSError *error) {
@@ -191,11 +171,7 @@
 
 - (void)testCollections
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testGetCollection_0"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testGetCollection_0" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	[self.client getCollections:^(NSArray *collections, NSError *error) {
@@ -217,11 +193,7 @@
 
 - (void)testCollectionsFromFirstPage
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testGetCollection_0"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testGetCollection_0" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	[self.client getCollectionsPage:1 completion:^(NSArray<BUYCollection *> *collections, NSUInteger page, BOOL reachedEnd, NSError *error) {
@@ -244,11 +216,7 @@
 
 - (void)testCollectionsFromEmptyPage
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testGetOutOfIndexCollectionPage_0"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testGetOutOfIndexCollectionPage_0" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	[self.client getCollectionsPage:999 completion:^(NSArray<BUYCollection *> *collections, NSUInteger page, BOOL reachedEnd, NSError *error) {
@@ -274,11 +242,7 @@
 	
 	XCTAssertNotNil(self.collection);
 	
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testGetProductsInCollection_0"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testGetProductsInCollection_0" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 
@@ -298,11 +262,7 @@
 
 - (void)testValidTags
 {
-	[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
-		return [self shouldUseMocks];
-	} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
-		return [OHHTTPStubsResponse responseWithKey:@"testGetValidTag_0"];
-	}];
+	[OHHTTPStubs stubUsingResponseWithKey:@"testGetValidTag_0" useMocks:[self shouldUseMocks]];
 	
 	XCTestExpectation *expectation = [self expectationWithDescription:NSStringFromSelector(_cmd)];
 	

Mobile Buy SDK/Mobile Buy SDK Tests/OHHTTPStubsResponse+Helpers.h

@@ -26,8 +26,15 @@
 
 #import <OHHTTPStubs/OHHTTPStubs.h>
 
-@interface OHHTTPStubsResponse (Helpers)
+@interface OHHTTPStubsResponse (Buy)
 
 + (instancetype)responseWithKey:(NSString *)key;
 
 @end
+
+@interface OHHTTPStubs (Buy)
+
++ (void)stubUsingResponseWithKey:(NSString *)key;
++ (void)stubUsingResponseWithKey:(NSString *)key useMocks:(BOOL)useMocks;
+
+@end

Mobile Buy SDK/Mobile Buy SDK Tests/OHHTTPStubsResponse+Helpers.m

@@ -26,28 +26,49 @@
 
 #import "OHHTTPStubsResponse+Helpers.h"
 
-static NSDictionary *JSONMock;
+@implementation OHHTTPStubsResponse (Buy)
 
-@implementation OHHTTPStubsResponse (Helpers)
-
-+ (instancetype)responseWithKey:(NSString *)key
++ (NSDictionary *)mockResponses
 {
+	static NSDictionary *dictionary = nil;
 	static dispatch_once_t onceToken;
 	dispatch_once(&onceToken, ^{
-		
-		NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+		NSBundle *bundle   = [NSBundle bundleForClass:[self class]];
 		NSString *jsonPath = [bundle pathForResource:@"mocked_responses" ofType:@"json"];
-		NSData *jsonData = [NSData dataWithContentsOfFile:jsonPath];
-		JSONMock = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:nil];
+		NSData *jsonData   = [NSData dataWithContentsOfFile:jsonPath];
+		dictionary = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:nil];
 	});
-	
-	
-	NSDictionary *json = JSONMock[key];
-	NSData *data = [json[@"body"] dataUsingEncoding:NSUTF8StringEncoding];
-	int code = [json[@"code"] intValue];
+	return dictionary;
+}
+
++ (instancetype)responseWithKey:(NSString *)key
+{
+	NSDictionary *mocks = [self mockResponses];
+	NSDictionary *json  = mocks[key];
+	NSData *data        = [json[@"body"] dataUsingEncoding:NSUTF8StringEncoding];
+	int code            = [json[@"code"] intValue];
 	
 	return [OHHTTPStubsResponse responseWithData:data statusCode:code headers:nil];
 }
 
+@end
+
+@implementation OHHTTPStubs (Buy)
+
++ (void)stubUsingResponseWithKey:(NSString *)key
+{
+	[self stubUsingResponseWithKey:key useMocks:YES];
+}
+
++ (void)stubUsingResponseWithKey:(NSString *)key useMocks:(BOOL)useMocks
+{
+	if (useMocks) {
+		[OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
+			return YES;
+		} withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
+			return [OHHTTPStubsResponse responseWithKey:key];
+		}];
+	}
+}
 
 @end