Commit 65f467ce by Brent Gulanowski Committed by GitHub

Merge pull request #233 from Shopify/task/fixes

Two model-level fixes
parents 4e1a542e 506c6637
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
[operation cancel]; [operation cancel];
}]; }];
[self waitForExpectationsWithTimeout:4.0 handler:^(NSError *error) {}]; [self waitForExpectationsWithTimeout:5.0 handler:^(NSError *error) {}];
} }
- (void)testCancellationWithoutQueue - (void)testCancellationWithoutQueue
......
...@@ -550,7 +550,7 @@ ...@@ -550,7 +550,7 @@
<entry key="documentation" value="Inverse of Checkout.lineItem."/> <entry key="documentation" value="Inverse of Checkout.lineItem."/>
</userInfo> </userInfo>
</relationship> </relationship>
<relationship name="order" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Order" inverseName="lineItems" inverseEntity="Order" syncable="YES"/> <relationship name="order" optional="YES" maxCount="1" deletionRule="Deny" destinationEntity="Order" inverseName="lineItems" inverseEntity="Order" syncable="YES"/>
<userInfo> <userInfo>
<entry key="documentation" value="This represents a BUYLineItem on a BUYCart or on a BUYCheckout."/> <entry key="documentation" value="This represents a BUYLineItem on a BUYCart or on a BUYCheckout."/>
</userInfo> </userInfo>
...@@ -665,7 +665,7 @@ ...@@ -665,7 +665,7 @@
<entry key="documentation" value="Inverse of Checkout.order."/> <entry key="documentation" value="Inverse of Checkout.order."/>
</userInfo> </userInfo>
</relationship> </relationship>
<relationship name="lineItems" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="LineItem" inverseName="order" inverseEntity="LineItem" syncable="YES"/> <relationship name="lineItems" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="LineItem" inverseName="order" inverseEntity="LineItem" syncable="YES"/>
<userInfo> <userInfo>
<entry key="attributeValueClassName" value="URL"/> <entry key="attributeValueClassName" value="URL"/>
<entry key="documentation" value="URL for the website showing the order status, doesn't require a customer token."/> <entry key="documentation" value="URL for the website showing the order status, doesn't require a customer token."/>
......
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
@implementation BUYCustomer @implementation BUYCustomer
@synthesize addresses=_addresses;
- (NSString *)fullName - (NSString *)fullName
{ {
if (self.firstName.length > 0 || self.lastName.length > 0) { if (self.firstName.length > 0 || self.lastName.length > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment