Merge pull request #162 from Iterable/tapash/mob-3237-fix-integration-tests

tapashmajumder · web-flow · commit 82a66376be7d · 2021-08-03T23:31:44.000+05:30
[MOB-3237] - Fix integration tests.
diff --git a/integration-testing/ios/example/IterableAPISupport.swift b/integration-testing/ios/example/IterableAPISupport.swift
@@ -53,7 +53,7 @@ struct IterableAPISupport {
                                                                     return SendRequestError.createErroredFuture(reason: "Could not create in-app consume request")
         }
         
-        return NetworkHelper.sendRequest(request, usingSession: urlSession)
+        return RequestSender.sendRequest(request, usingSession: urlSession)
     }
 
     private static let urlSession: URLSession = {
@@ -65,9 +65,9 @@ struct IterableAPISupport {
     private static func getInAppMessages(apiKey: String,
                                          email: String) -> Future<[IterableInAppMessage], SendRequestError> {
         var args: [String: String] = [
-            JsonKey.email.jsonKey: email,
+            JsonKey.email: email,
             JsonKey.InApp.count: maxMessages.description,
-            JsonKey.platform.jsonKey: JsonValue.iOS.rawValue,
+            JsonKey.platform: JsonValue.iOS,
             JsonKey.InApp.sdkVersion: IterableAPI.sdkVersion,
         ]
         
@@ -82,12 +82,12 @@ struct IterableAPISupport {
                                                                     return SendRequestError.createErroredFuture(reason: "could not create get in-app request")
         }
         
-        return NetworkHelper.sendRequest(request, usingSession: urlSession).map { inAppMessages(fromPayload: $0) }
+        return RequestSender.sendRequest(request, usingSession: urlSession).map { inAppMessages(fromPayload: $0) }
     }
     
     private static func createIterableHeaders(apiKey: String) -> [String: String] {
-        let headers = [JsonKey.contentType.jsonKey: JsonValue.applicationJson.jsonStringValue,
-                       JsonKey.Header.sdkPlatform: JsonValue.iOS.jsonStringValue,
+        let headers = [JsonKey.contentType: JsonValue.applicationJson,
+                       JsonKey.Header.sdkPlatform: JsonValue.iOS,
                        JsonKey.Header.sdkVersion: IterableAPI.sdkVersion,
                        JsonKey.Header.apiKey: apiKey]
         
@@ -151,6 +151,6 @@ struct IterableAPISupport {
                                                                     return SendRequestError.createErroredFuture(reason: "Could not create in-app consume request")
         }
         
-        return NetworkHelper.sendRequest(request, usingSession: urlSession)
+        return RequestSender.sendRequest(request, usingSession: urlSession)
     }
 }
diff --git a/integration-testing/package.json b/integration-testing/package.json
@@ -16,7 +16,7 @@
     "@react-navigation/native": "^5.4.0",
     "@react-navigation/stack": "^5.3.7",
     "react": "^17.0.2",
-    "react-native": "^0.64.1",
+    "react-native": "^0.63",
     "react-native-elements": "^1.2.7",
     "react-native-gesture-handler": "^1.6.1",
     "react-native-ionicons": "^5.0.0-rc",
diff --git a/integration-testing/yarn.lock b/integration-testing/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ struct IterableAPISupport {`
`53`	`53`	`return SendRequestError.createErroredFuture(reason: "Could not create in-app consume request")`
`54`	`54`	`}`
`55`	`55`
`56`		`- return NetworkHelper.sendRequest(request, usingSession: urlSession)`
	`56`	`+ return RequestSender.sendRequest(request, usingSession: urlSession)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`private static let urlSession: URLSession = {`
`@@ -65,9 +65,9 @@ struct IterableAPISupport {`
`65`	`65`	`private static func getInAppMessages(apiKey: String,`
`66`	`66`	`email: String) -> Future<[IterableInAppMessage], SendRequestError> {`
`67`	`67`	`var args: [String: String] = [`
`68`		`- JsonKey.email.jsonKey: email,`
	`68`	`+ JsonKey.email: email,`
`69`	`69`	`JsonKey.InApp.count: maxMessages.description,`
`70`		`- JsonKey.platform.jsonKey: JsonValue.iOS.rawValue,`
	`70`	`+ JsonKey.platform: JsonValue.iOS,`
`71`	`71`	`JsonKey.InApp.sdkVersion: IterableAPI.sdkVersion,`
`72`	`72`	`]`
`73`	`73`
`@@ -82,12 +82,12 @@ struct IterableAPISupport {`
`82`	`82`	`return SendRequestError.createErroredFuture(reason: "could not create get in-app request")`
`83`	`83`	`}`
`84`	`84`
`85`		`- return NetworkHelper.sendRequest(request, usingSession: urlSession).map { inAppMessages(fromPayload: $0) }`
	`85`	`+ return RequestSender.sendRequest(request, usingSession: urlSession).map { inAppMessages(fromPayload: $0) }`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`private static func createIterableHeaders(apiKey: String) -> [String: String] {`
`89`		`- let headers = [JsonKey.contentType.jsonKey: JsonValue.applicationJson.jsonStringValue,`
`90`		`- JsonKey.Header.sdkPlatform: JsonValue.iOS.jsonStringValue,`
	`89`	`+ let headers = [JsonKey.contentType: JsonValue.applicationJson,`
	`90`	`+ JsonKey.Header.sdkPlatform: JsonValue.iOS,`
`91`	`91`	`JsonKey.Header.sdkVersion: IterableAPI.sdkVersion,`
`92`	`92`	`JsonKey.Header.apiKey: apiKey]`
`93`	`93`
`@@ -151,6 +151,6 @@ struct IterableAPISupport {`
`151`	`151`	`return SendRequestError.createErroredFuture(reason: "Could not create in-app consume request")`
`152`	`152`	`}`
`153`	`153`
`154`		`- return NetworkHelper.sendRequest(request, usingSession: urlSession)`
	`154`	`+ return RequestSender.sendRequest(request, usingSession: urlSession)`
`155`	`155`	`}`
`156`	`156`	`}`