Merge pull request #260 from wordpress-mobile/release/1.8.16

Release/1.8.16
wordpress-mobile · Mar 23, 2020 · a57ad94 · a57ad94
2 parents cc2fc16 + b99bf12
commit a57ad94
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 4 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.6.4
diff --git a/WordPressShared.podspec b/WordPressShared.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressShared"
-  s.version       = "1.8.15"
+  s.version       = "1.8.16"
   s.summary       = "Shared components used in building the WordPress iOS apps and other library components."
 
   s.description   = <<-DESC

diff --git a/WordPressShared/Core/Analytics/WPAnalytics.h b/WordPressShared/Core/Analytics/WPAnalytics.h
@@ -201,8 +201,6 @@ typedef NS_ENUM(NSUInteger, WPAnalyticsStat) {
     WPAnalyticsStatLoginSocialErrorUnknownUser,
     WPAnalyticsStatLogout,
     WPAnalyticsStatLowMemoryWarning,
-    WPAnalyticsStatMediaEditorShown,
-    WPAnalyticsStatMediaEditorUsed,
     WPAnalyticsStatMediaLibraryDeletedItems,
     WPAnalyticsStatMediaLibraryEditedItemMetadata,
     WPAnalyticsStatMediaLibraryPreviewedItem,
@@ -603,6 +601,8 @@ extern NSString *const WPAnalyticsStatEditorPublishedPostPropertyVideo;
 + (void)endTimerForStat:(WPAnalyticsStat)stat withProperties:(NSDictionary *)properties;
 + (void)track:(WPAnalyticsStat)stat;
 + (void)track:(WPAnalyticsStat)stat withProperties:(NSDictionary *)properties;
++ (void)trackString:(NSString *)event;
++ (void)trackString:(NSString *)event withProperties:(NSDictionary *)properties;
 + (void)endSession;
 + (void)clearQueuedEvents;
 
@@ -612,6 +612,8 @@ extern NSString *const WPAnalyticsStatEditorPublishedPostPropertyVideo;
 
 - (void)track:(WPAnalyticsStat)stat;
 - (void)track:(WPAnalyticsStat)stat withProperties:(NSDictionary *)properties;
+- (void)trackString:(NSString *)event;
+- (void)trackString:(NSString *)event withProperties:(NSDictionary *)properties;
 
 @optional
 - (void)beginSession;

diff --git a/WordPressShared/Core/Analytics/WPAnalytics.m b/WordPressShared/Core/Analytics/WPAnalytics.m
@@ -63,6 +63,21 @@ + (void)track:(WPAnalyticsStat)stat withProperties:(NSDictionary *)properties
     }
 }
 
++ (void)trackString:(NSString *)event
+{
+    for (id<WPAnalyticsTracker> tracker in [self trackers]) {
+        [tracker trackString:event];
+    }
+}
+
++ (void)trackString:(NSString *)event withProperties:(NSDictionary *)properties
+{
+    NSParameterAssert(properties != nil);
+    for (id<WPAnalyticsTracker> tracker in [self trackers]) {
+        [tracker trackString:event withProperties:properties];
+    }
+}
+
 + (void)beginSession
 {
     for (id<WPAnalyticsTracker> tracker in [self trackers]) {

diff --git a/WordPressSharedTests/TestAnalyticsTracker.m b/WordPressSharedTests/TestAnalyticsTracker.m
@@ -27,4 +27,14 @@ - (void)refreshMetadata
     // No-op
 }
 
+- (void)trackString:(NSString *)event {
+    // No-op
+}
+
+
+- (void)trackString:(NSString *)event withProperties:(NSDictionary *)properties {
+    // No-op
+}
+
+
 @end
diff --git a/WordPressSharedTests/WPAnalyticsTests.m b/WordPressSharedTests/WPAnalyticsTests.m
@@ -117,4 +117,27 @@
     itShouldBehaveLike(@"a WPAnalyticsTracker method", @{@"invocation": invocation});
 });
 
-SpecEnd
+describe(@"trackString:", ^{
+    NSMethodSignature *signature = [TestAnalyticsTracker instanceMethodSignatureForSelector:@selector(trackString:)];
+    NSInvocation *invocation  = [NSInvocation invocationWithMethodSignature:signature];
+    [invocation setSelector:@selector(trackString:)];
+    NSString *event = @"my_event";
+    [invocation setArgument:&event atIndex:2];
+
+    itShouldBehaveLike(@"a WPAnalyticsTracker method", @{@"invocation": invocation});
+});
+
+describe(@"trackString:withProperties:", ^{
+    NSMethodSignature *signature = [TestAnalyticsTracker instanceMethodSignatureForSelector:@selector(trackString:withProperties:)];
+    NSInvocation *invocation  = [NSInvocation invocationWithMethodSignature:signature];
+    [invocation setSelector:@selector(trackString:withProperties:)];
+
+    NSString *event = @"my_event";
+    NSDictionary *dict = @{};
+    [invocation setArgument:&event atIndex:2];
+    [invocation setArgument:&dict atIndex:3];
+
+    itShouldBehaveLike(@"a WPAnalyticsTracker method", @{@"invocation": invocation});
+});
+
+SpecEnd