Fixed Optimizely test after event dispatcher merge.

Author: alda-optimizely

OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDispatcher.m

@@ -19,6 +19,9 @@
 #import "OPTLYEventDispatcher.h"
 #import "OPTLYErrorHandler.h"
 
+static NSString * const kEventDispatcherImpressionEventURL   = @"https://logx.optimizely.com/log/decision";
+static NSString * const kEventDispatcherConversionEventURL   = @"https://logx.optimizely.com/log/event";
+
 static NSString * const kHTTPRequestMethodPost = @"POST";
 static NSString * const kHTTPHeaderFieldContentType = @"Content-Type";
 static NSString * const kHTTPHeaderFieldValueApplicationJSON = @"application/json";
@@ -39,15 +42,24 @@ + (BOOL)conformsToOPTLYEventDispatcherProtocol:(Class)instanceClass
 
 @end
 
-static NSString * const kHTTPRequestMethodPost = @"POST";
-static NSString * const kHTTPHeaderFieldContentType = @"Content-Type";
-static NSString * const kHTTPHeaderFieldValueApplicationJSON = @"application/json";
-
 @implementation OPTLYEventDispatcherBasic
 
+- (void)dispatchImpressionEvent:(nonnull NSDictionary *)params
+                       callback:(nullable void(^)(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error))callback {
+    NSURL *url = [NSURL URLWithString:kEventDispatcherImpressionEventURL];
+    [self dispatchEvent:params toURL:url completionHandler:callback];
+}
+
+- (void)dispatchConversionEvent:(nonnull NSDictionary *)params
+                       callback:(nullable void(^)(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error))callback {
+    
+    NSURL *url = [NSURL URLWithString:kEventDispatcherConversionEventURL];
+    [self dispatchEvent:params toURL:url completionHandler:callback];
+}
+
 - (void)dispatchEvent:(NSDictionary *)params
                 toURL:(NSURL *)url
-    completionHandler:(void(^)(NSURLResponse *response, NSError *error))completion
+    completionHandler:(void(^)(NSData *data, NSURLResponse *response, NSError *error))completion
 {
     NSURLSession *ephemeralSession = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration ephemeralSessionConfiguration]];
     NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:url];
@@ -65,14 +77,16 @@ - (void)dispatchEvent:(NSDictionary *)params
                                                                             fromData:data
                                                                    completionHandler:^(NSData *data,NSURLResponse *response,NSError *error) {
                                                                        if (completion) {
-                                                                           completion(response, error);
+                                                                           completion(data, response, error);
                                                                        }
                                                                    }];
 
         [uploadTask resume];
     }
 }
 
+
+
 @end
 
 @implementation OPTLYEventDispatcherNoOp

OptimizelySDKCore/OptimizelySDKCore/Optimizely.m

@@ -373,6 +373,7 @@ - (double)getVariableFloat:(nonnull NSString *)variableKey
     }
 
     return 0;
+}
 
 // log and propagate error for a track failure
 - (void)handleErrorLogsForTrackEvent:(NSString *)eventKey
@@ -414,7 +415,6 @@ - (void)handleErrorLogsForActivateUser:(NSString *)userId
         [self.errorHandler handleError:error];
         [self.logger logMessage:logMessage withLevel:OptimizelyLogLevelError];
     }
->>>>>>> alda/eventDispatcher
 }
 
 @end

OptimizelySDKCore/OptimizelySDKCoreTests/OptimizelyTest.m

@@ -116,7 +116,7 @@ - (void)stubSuccessResponseForEventRequest {
     __weak XCTestExpectation *expectation = [self expectationWithDescription:@"testGetVariableString"];
 
     [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) {
-        return [request.URL.host isEqualToString:@"p13nlog.dz.optimizely.com"];
+        return [request.URL.host isEqualToString:@"logx.optimizely.com"];
     } withStubResponse:^OHHTTPStubsResponse*(NSURLRequest *request) {
         [expectation fulfill];
         return [OHHTTPStubsResponse responseWithData:[[NSData alloc] init]