From 2f906584cfe1a12930cc24589381f767dbf1df9a Mon Sep 17 00:00:00 2001
From: Rune Madsen <runemadsen@mac.com>
Date: Fri, 8 Jan 2016 10:03:43 -0500
Subject: [PATCH] Remove shippingRateId on checkout. No longer needed.
---
Mobile Buy SDK/Mobile Buy SDK Tests/BUYCheckoutTest.m | 13 -------------
Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.h | 5 -----
Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.m | 9 ---------
3 files changed, 27 deletions(-)
diff --git a/Mobile Buy SDK/Mobile Buy SDK Tests/BUYCheckoutTest.m b/Mobile Buy SDK/Mobile Buy SDK Tests/BUYCheckoutTest.m
index e993df0..dc97580 100644
--- a/Mobile Buy SDK/Mobile Buy SDK Tests/BUYCheckoutTest.m
+++ b/Mobile Buy SDK/Mobile Buy SDK Tests/BUYCheckoutTest.m
@@ -73,17 +73,6 @@
XCTAssertTrue([checkout isDirty]);
}
-- (void)testSettingAShippingRateMarksShippingRateIdAsDirty
-{
- BUYShippingRate *shippingRate = [[BUYShippingRate alloc] initWithDictionary:@{ @"id" : @"banana" }];
- XCTAssertNil(_checkout.shippingRate);
- XCTAssertNil(_checkout.shippingRateId);
- _checkout.shippingRate = shippingRate;
- XCTAssertEqualObjects(@"banana", _checkout.shippingRateId);
-
- XCTAssertTrue([[_checkout dirtyProperties] containsObject:@"shippingRateId"]);
-}
-
- (void)testDirtyPropertiesAreReturnedInJSON
{
BUYShippingRate *shippingRate = [[BUYShippingRate alloc] initWithDictionary:@{ @"id" : @"banana" }];
@@ -93,12 +82,10 @@
_checkout.currency = @"BANANA";
NSSet *dirtyProperties = [_checkout dirtyProperties];
XCTAssertTrue([dirtyProperties containsObject:@"currency"]);
- XCTAssertTrue([dirtyProperties containsObject:@"shippingRateId"]);
XCTAssertTrue([dirtyProperties containsObject:@"shippingRate"]);
NSDictionary *json = [_checkout jsonDictionaryForCheckout];
XCTAssertEqualObjects(json[@"checkout"][@"currency"], @"BANANA");
- XCTAssertEqualObjects(json[@"checkout"][@"shipping_rate_id"], @"banana");
}
- (void)testRequiresShippingAndIncludesTaxesSerialization
diff --git a/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.h b/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.h
index 0fda646..5b66f7f 100644
--- a/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.h
+++ b/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.h
@@ -149,11 +149,6 @@
@property (nonatomic, strong) BUYShippingRate *shippingRate;
/**
- * Shipping rate identifier
- */
-@property (nonatomic, readonly) NSString *shippingRateId;
-
-/**
* A discount added to the checkout
* Only one discount can be added to a checkout. Call `updateCheckout:completion:`
* after adding a discount to apply the discount code to the checkout.
diff --git a/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.m b/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.m
index 97e1d3f..d78a6c1 100644
--- a/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Models/BUYCheckout.m
@@ -71,20 +71,11 @@
return self;
}
-- (void)setShippingRateId:(NSString *)shippingRateIdentifier
-{
- [self willChangeValueForKey:@"shippingRateId"];
- _shippingRateId = shippingRateIdentifier;
- [self didChangeValueForKey:@"shippingRateId"];
-}
-
- (void)setShippingRate:(BUYShippingRate *)shippingRate
{
[self willChangeValueForKey:@"shippingRate"];
_shippingRate = shippingRate;
[self didChangeValueForKey:@"shippingRate"];
-
- [self setShippingRateId:shippingRate.shippingRateIdentifier];
}
+ (NSString *)jsonKeyForProperty:(NSString *)property
--
libgit2 0.26.0