Merge branch 'release/2.0.4'

Leanplum · Nov 23, 2017 · 616b9a6 · 616b9a6
2 parents 8dc858b + 54c5544
commit 616b9a6
Show file tree

Hide file tree

Showing 27 changed files with 406 additions and 106 deletions.
diff --git a/.slather.yml b/.slather.yml
@@ -4,6 +4,6 @@ workspace: Example/Leanplum-SDK.xcworkspace
 scheme: Leanplum-SDK-Example
 source_directory: Leanplum-SDK/
 output_directory: coverage-report
-binary_file: /DerivedData/Build/Products/Debug-iphonesimulator/Leanplum-SDK_Example.app/PlugIns/Leanplum-SDK_Tests.xctest/Frameworks/Leanplum.framework/Leanplum
+binary_file: DerivedData/Build/Products/Debug-iphonesimulator/Leanplum-SDK_Example.app/PlugIns/Leanplum-SDK_Tests.xctest/Frameworks/Leanplum.framework/Leanplum
 ignore:
   - Leanplum-SDK/Classes/Vendor/**
diff --git a/Example/Leanplum-SDK.xcodeproj/project.pbxproj b/Example/Leanplum-SDK.xcodeproj/project.pbxproj
diff --git a/...andassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/...andassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
@@ -3,10 +3,14 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
diff --git a/...ndassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/...ndassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
@@ -3,10 +3,14 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
diff --git a/...dassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/...dassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
@@ -3,10 +3,14 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
diff --git a/...andassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/...andassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
@@ -3,10 +3,14 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
diff --git a/...ndassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/...ndassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
@@ -3,10 +3,14 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
diff --git a/...dassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/...dassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
@@ -3,10 +3,14 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
diff --git a/...assets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/Contents.json b/...assets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...ts.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json b/...ts.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json
@@ -3,10 +3,14 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
diff --git a/Example/Leanplum-tvOS-SDK_Example/Assets.xcassets/LaunchImage.launchimage/Contents.json b/Example/Leanplum-tvOS-SDK_Example/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -1,5 +1,12 @@
 {
   "images" : [
+    {
+      "orientation" : "landscape",
+      "idiom" : "tv",
+      "extent" : "full-screen",
+      "minimum-system-version" : "11.0",
+      "scale" : "2x"
+    },
     {
       "orientation" : "landscape",
       "idiom" : "tv",
@@ -12,4 +19,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
diff --git a/Example/Podfile b/Example/Podfile
@@ -17,7 +17,7 @@ target 'Leanplum-SDK_Example' do
 end
 
 target 'Leanplum-tvOS-SDK_Example' do
-  platform :tvos, '8.0'
+  platform :tvos, '9.0'
 
-  pod 'Leanplum-tvOS-SDK', :path => '../'
+  pod 'Leanplum-tvOS-SDK-source', :path => '../'
 end
diff --git a/Example/Tests/Classes/MessagesTest.m b/Example/Tests/Classes/MessagesTest.m
@@ -160,7 +160,7 @@ - (void) test_no_priorities
 
     NSDictionary *messageConfigs = [LPJSON JSONFromString:jsonString];
     [self runInAppMessagePrioritizationTest:messageConfigs
-                     withExpectedMessageIds:[NSSet setWithObjects:@"1", @"2", @"3", nil]];
+                     withExpectedMessageIds:[NSSet setWithObjects:@"1", nil]];
 }
 
 - (void) test_different_priorities
@@ -189,14 +189,14 @@ - (void) test_tied_priorities
 
     NSDictionary *messageConfigs = [LPJSON JSONFromString:jsonString];
     [self runInAppMessagePrioritizationTest:messageConfigs
-                     withExpectedMessageIds:[NSSet setWithObjects:@"1", @"3", nil]];
+                     withExpectedMessageIds:[NSSet setWithObjects:@"1", nil]];
 
     // Testing three messages with the same priority.
     jsonString = [LeanplumHelper retrieve_string_from_file:@"TiedPriorities2"
                                                     ofType:@"json"];
     messageConfigs = [LPJSON JSONFromString:jsonString];
     [self runInAppMessagePrioritizationTest:messageConfigs
-                     withExpectedMessageIds:[NSSet setWithObjects:@"1", @"2" ,@"3", nil]];
+                     withExpectedMessageIds:[NSSet setWithObjects:@"1", nil]];
 }
 
 - (void) test_different_priorities_with_missing_values

diff --git a/Example/Tests/Classes/NewsfeedTest.m b/Example/Tests/Classes/NewsfeedTest.m
@@ -374,4 +374,73 @@ - (void)test_disableFetching
     XCTAssertTrue(timedOut == 0);
 }
 
+- (void)test_onForceContentUpdate {
+    XCTAssertTrue([LeanplumHelper start_development_test]);
+
+    // FCU without sync
+    id<OHHTTPStubsDescriptor> stub = [OHHTTPStubs stubRequestsPassingTest:
+                                           ^BOOL(NSURLRequest * _Nonnull request) {
+        return [request.URL.host isEqualToString:API_HOST];
+    } withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest *request) {
+        NSString *response_file = OHPathForFile(@"variables_response.json",
+                                               self.class);
+        return [OHHTTPStubsResponse responseWithFileAtPath:response_file
+                                               statusCode:200
+                                                  headers:@{@"Content-Type":@"application/json"}];
+    }];
+
+    XCTestExpectation *responseExpectation1 = [self expectationWithDescription:@"response1"];
+    [[Leanplum inbox] onForceContentUpdate:^void(BOOL success){
+        XCTAssertTrue(success);
+        [responseExpectation1 fulfill];
+    }];
+
+    [Leanplum forceContentUpdate:nil];
+    [self waitForExpectationsWithTimeout:2 handler:nil];
+    [OHHTTPStubs removeStub:stub];
+    [[Leanplum inbox] reset];
+
+    // FCU with sync
+    stub = [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest * _Nonnull request) {
+                return [request.URL.host isEqualToString:API_HOST];
+    } withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest *request) {
+        NSString *response_file = OHPathForFile(@"variables_with_newsfeed_response.json",
+                                                self.class);
+        return [OHHTTPStubsResponse responseWithFileAtPath:response_file
+                                                statusCode:200
+                                                   headers:@{@"Content-Type":@"application/json"}];
+    }];
+
+    XCTestExpectation *responseExpectation2 = [self expectationWithDescription:@"response2"];
+    [[Leanplum inbox] onForceContentUpdate:^void(BOOL success){
+        XCTAssertTrue(success);
+        [responseExpectation2 fulfill];
+    }];
+
+    [Leanplum forceContentUpdate:nil];
+    [self waitForExpectationsWithTimeout:2 handler:nil];
+    [OHHTTPStubs removeStub:stub];
+    [[Leanplum inbox] reset];
+
+    // FCU without internet connection
+    stub = [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
+        return [request.URL.host isEqualToString:API_HOST];;
+    } withStubResponse:^OHHTTPStubsResponse * _Nonnull(NSURLRequest * _Nonnull request) {
+        NSError *error = [NSError errorWithDomain:NSURLErrorDomain
+                                             code:NSURLErrorBadServerResponse userInfo:nil];
+        return [OHHTTPStubsResponse responseWithError:error];
+    }];
+
+    XCTestExpectation *responseExpectation3 = [self expectationWithDescription:@"response3"];
+    [[Leanplum inbox] onForceContentUpdate:^void(BOOL success){
+        XCTAssertFalse(success);
+        [responseExpectation3 fulfill];
+    }];
+
+    [Leanplum forceContentUpdate:nil];
+    [self waitForExpectationsWithTimeout:2 handler:nil];
+    [OHHTTPStubs removeStub:stub];
+    [[Leanplum inbox] reset];
+}
+
 @end
diff --git a/Example/Tests/Resources/Responses/variables_with_newsfeed_response.json b/Example/Tests/Resources/Responses/variables_with_newsfeed_response.json
@@ -0,0 +1,28 @@
+{
+    "response": [{
+        "success": true
+    }, {
+        "success": true
+    }, {
+        "vars": {
+
+        },
+        "interfaceRules": [
+
+        ],
+        "variants": [
+
+        ],
+        "regions": {
+
+        },
+        "syncNewsfeed": true,
+        "success": true,
+        "messages": {
+
+        },
+        "interfaceEvents": [
+
+        ]
+    }]
+}
diff --git a/Leanplum-SDK/Classes/Constants.h b/Leanplum-SDK/Classes/Constants.h
@@ -45,7 +45,7 @@
 #define IS_NOOP ((!IS_SUPPORTED_IOS_VERSION) || IS_JAILBROKEN || [LPConstantsState sharedState].isTestMode || [LPConstantsState sharedState].isInPermanentFailureState)
 #define RETURN_IF_NOOP if (IS_NOOP) return
 
-#define LEANPLUM_SDK_VERSION @"2.0.3"
+#define LEANPLUM_SDK_VERSION @"2.0.4"
 #define LEANPLUM_CLIENT @"ios"
 
 // Can upload up to 100 files or 50 MB per request.

diff --git a/Leanplum-SDK/Classes/LPInbox.h b/Leanplum-SDK/Classes/LPInbox.h
@@ -96,6 +96,7 @@
  * This block is used when you define a callback.
  */
 typedef void (^LeanplumInboxChangedBlock)(void);
+typedef void (^LeanplumInboxSyncedBlock)(BOOL success);
 
 @interface LPInbox : NSObject
 
@@ -150,6 +151,13 @@ typedef void (^LeanplumInboxChangedBlock)(void);
  */
 - (void)onChanged:(LeanplumInboxChangedBlock)block;
 
+/**
+ * Block to call when forceContentUpdate was called.
+ * Returns true if syncing was successful.
+ * Note: use onChanged: for UI.
+ */
+- (void)onForceContentUpdate:(LeanplumInboxSyncedBlock)block;
+
 /**
  @{
  * Adds a responder to be executed when an event happens.