Merge branch 'master' into ab/CHNL-6170/remove-opened-push-event-from…

…-public-api
klaviyo · Sep 4, 2024 · 6f4068c · 6f4068c
2 parents 41fbf80 + bf0effc
commit 6f4068c
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 12 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,4 +1,4 @@
-exclude: Tests/KlaviyoSwiftTests/__Snapshots__
+exclude: Tests/.*/__Snapshots__
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.3.0

diff --git a/Tests/KlaviyoCoreTests/EncodableTests.swift b/Tests/KlaviyoCoreTests/EncodableTests.swift
@@ -22,8 +22,9 @@ final class EncodableTests: XCTestCase {
         assertSnapshot(matching: payload, as: .json(KlaviyoEnvironment.encoder))
     }
 
-    func testEventPayloadWithoutMetadata() throws {
-        let createEventPayload = CreateEventPayload(data: CreateEventPayload.Event(name: "test", anonymousId: "anon-id"))
+    func testEventPayload() throws {
+        let payloadData = CreateEventPayload.Event(name: "test", properties: SAMPLE_PROPERTIES, anonymousId: "anon-id")
+        let createEventPayload = CreateEventPayload(data: payloadData)
         assertSnapshot(matching: createEventPayload, as: .json(KlaviyoEnvironment.encoder))
     }
 

diff --git a/Tests/KlaviyoCoreTests/KlaviyoAPITests.swift b/Tests/KlaviyoCoreTests/KlaviyoAPITests.swift
@@ -12,8 +12,6 @@ import XCTest
 @MainActor
 final class KlaviyoAPITests: XCTestCase {
     override func setUpWithError() throws {
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-
         environment = KlaviyoEnvironment.test()
     }
 

diff --git a/Tests/KlaviyoCoreTests/TestUtils.swift b/Tests/KlaviyoCoreTests/TestUtils.swift
@@ -61,6 +61,14 @@ let TEST_FAILURE_JSON_INVALID_EMAIL = """
 }
 """
 
+let SAMPLE_PROPERTIES = [
+    "blob": "blob",
+    "stuff": 2,
+    "hello": [
+        "sub": "dict"
+    ]
+] as [String: Any]
+
 extension ArchiverClient {
     static let test = ArchiverClient(
         archivedData: { _, _ in ARCHIVED_RETURNED_DATA },

diff --git a/...ts/testEventPayloadWithoutMetadata.1.json → ...__/EncodableTests/testEventPayload.1.json b/...ts/testEventPayloadWithoutMetadata.1.json → ...__/EncodableTests/testEventPayload.1.json
@@ -21,11 +21,27 @@
         }
       },
       "properties" : {
-
+        "App Build" : "1",
+        "App ID" : "com.klaviyo.fooapp",
+        "App Name" : "FooApp",
+        "App Version" : "1.2.3",
+        "blob" : "blob",
+        "Device ID" : "fe-fi-fo-fum",
+        "Device Manufacturer" : "Orange",
+        "Device Model" : "jPhone 1,1",
+        "hello" : {
+          "sub" : "dict"
+        },
+        "OS Name" : "iOS",
+        "OS Version" : "1.1.1",
+        "Push Token" : "",
+        "SDK Name" : "swift",
+        "SDK Version" : "3.2.0",
+        "stuff" : 2
       },
       "time" : "2009-02-13T23:31:30Z",
       "unique_id" : "00000000-0000-0000-0000-000000000001"
     },
     "type" : "event"
   }
-}
+}
diff --git a/Tests/KlaviyoCoreTests/__Snapshots__/EncodableTests/testKlaviyoRequest.1.json b/Tests/KlaviyoCoreTests/__Snapshots__/EncodableTests/testKlaviyoRequest.1.json
@@ -44,4 +44,4 @@
     }
   },
   "uuid" : "00000000-0000-0000-0000-000000000001"
-}
+}
diff --git a/Tests/KlaviyoCoreTests/__Snapshots__/EncodableTests/testProfilePayload.1.json b/Tests/KlaviyoCoreTests/__Snapshots__/EncodableTests/testProfilePayload.1.json
@@ -27,4 +27,4 @@
     },
     "type" : "profile"
   }
-}
+}
diff --git a/Tests/KlaviyoCoreTests/__Snapshots__/EncodableTests/testTokenPayload.1.json b/Tests/KlaviyoCoreTests/__Snapshots__/EncodableTests/testTokenPayload.1.json
@@ -36,4 +36,4 @@
     },
     "type" : "push-token"
   }
-}
+}
diff --git a/Tests/KlaviyoCoreTests/__Snapshots__/EncodableTests/testUnregisterTokenPayload.1.json b/Tests/KlaviyoCoreTests/__Snapshots__/EncodableTests/testUnregisterTokenPayload.1.json
@@ -20,4 +20,4 @@
     },
     "type" : "push-token-unregister"
   }
-}
+}
diff --git a/Tests/KlaviyoCoreTests/__Snapshots__/KlaviyoAPITests/testInvalidURL.1.txt b/Tests/KlaviyoCoreTests/__Snapshots__/KlaviyoAPITests/testInvalidURL.1.txt
@@ -1 +1 @@
-internalRequestError(KlaviyoCore.KlaviyoAPIError.internalError("Invalid url string. API URL: "))
+internalRequestError(KlaviyoCore.KlaviyoAPIError.internalError("Invalid url string. API URL: "))
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,4 +44,4 @@ @@
         }
       },
       "uuid" : "00000000-0000-0000-0000-000000000001"
-    }
+    }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		internalRequestError(KlaviyoCore.KlaviyoAPIError.internalError("Invalid url string. API URL: "))
		internalRequestError(KlaviyoCore.KlaviyoAPIError.internalError("Invalid url string. API URL: "))