Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Array containing for events array #458

Merged
merged 7 commits into from
Jun 6, 2024
Merged

Array containing for events array #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f4d1fcb
Wrap batch to be arraycontaining
JamieSinn Jun 3, 2024
c10916e
use jest
JamieSinn Jun 3, 2024
45071f6
Use client uuid too
JamieSinn Jun 3, 2024
dfa3a78
Wrap events array
JamieSinn Jun 3, 2024
7da7221
fix: switch to using expect.toIncludeSameMembers()
jonathannorris Jun 4, 2024
5af18bc
fix: jest-setup.js formatting
jonathannorris Jun 4, 2024
5738afe
Merge branch 'main' into array-containing
JamieSinn Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions harness/helpers/events.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
}
}

expect(body).toEqual({

Check failure on line 98 in harness/helpers/events.ts

View workflow job for this annotation

GitHub Actions / Test Report

harness/features/initialize.local.test.ts ► Initialize Tests - Local ► uses the new config when etag changes, and flushes existing events 

Failed test found in:
  jest-junit.xml
Error:
  Error: expect(received).toEqual(expected) // deep equality
Raw output 
Error: expect(received).toEqual(expected) // deep equality

- Expected  -  1
+ Received  + 32

  Object {
-   "batch": toIncludeSameMembers<[object Object]>,
+   "batch": Array [
+     Object {
+       "events": Array [
+         Object {
+           "clientDate": "2024-06-06T19:17:10.690678275Z",
+           "featureVars": Object {},
+           "metaData": Object {
+             "_feature": "638680d6fcb67b96878d90e6",
+             "_variation": "638680d6fcb67b96878d90ec",
+             "clientUUID": "84bb513c-35da-41ed-9aa9-580eebda2f80",
+             "configEtag": "first-etag",
+             "configLastModified": "Thu, 06 Jun 2024 19:16:58 GMT",
+             "configRayId": "first-ray",
+           },
+           "target": "number-var",
+           "type": "aggVariableEvaluated",
+           "user_id": "8e0cc3c164bd",
+           "value": 1,
+         },
+       ],
+       "user": Object {
+         "createdDate": "2024-06-06T19:17:10.690687672Z",
+         "hostname": "8e0cc3c164bd",
+         "lastSeenDate": "0001-01-01T00:00:00Z",
+         "platform": "Go",
+         "platformVersion": "go1.22.2",
+         "sdkType": "server",
+         "sdkVersion": "2.15.0",
+         "user_id": "8e0cc3c164bd",
+       },
+     },
+   ],
  }
    at expectAggregateEvaluationEvent (/home/runner/work/test-harness/test-harness/harness/helpers/events.ts:98:18)
    at Object.<anonymous> (/home/runner/work/test-harness/test-harness/harness/features/initialize.local.test.ts:473:43)

Check failure on line 98 in harness/helpers/events.ts

View workflow job for this annotation

GitHub Actions / Test Report

harness/features/multithreading.local.test.ts ► Multithreading Tests › Go › initialized client ► should return variable if SDK returns object matching default type 

Failed test found in:
  jest-junit.xml
Error:
  Error: expect(received).toEqual(expected) // deep equality
Raw output 
Error: expect(received).toEqual(expected) // deep equality

- Expected  -  1
+ Received  + 32

  Object {
-   "batch": toIncludeSameMembers<[object Object]>,
+   "batch": Array [
+     Object {
+       "events": Array [
+         Object {
+           "clientDate": "2024-06-06T19:17:23.15960605Z",
+           "featureVars": Object {},
+           "metaData": Object {
+             "_feature": "638680d6fcb67b96878d90e6",
+             "_variation": "638680d6fcb67b96878d90ec",
+             "clientUUID": "496175a7-1cdc-47a4-9809-52ea49461645",
+             "configEtag": "multithreading-etag",
+             "configLastModified": "Thu, 06 Jun 2024 19:17:22 GMT",
+             "configRayId": "multithreading-rayid",
+           },
+           "target": "string-var",
+           "type": "aggVariableEvaluated",
+           "user_id": "8e0cc3c164bd",
+           "value": 1,
+         },
+       ],
+       "user": Object {
+         "createdDate": "2024-06-06T19:17:23.159620727Z",
+         "hostname": "8e0cc3c164bd",
+         "lastSeenDate": "0001-01-01T00:00:00Z",
+         "platform": "Go",
+         "platformVersion": "go1.22.2",
+         "sdkType": "server",
+         "sdkVersion": "2.15.0",
+         "user_id": "8e0cc3c164bd",
+       },
+     },
+   ],
  }
    at expectAggregateEvaluationEvent (/home/runner/work/test-harness/test-harness/harness/helpers/events.ts:98:18)
    at Object.<anonymous> (/home/runner/work/test-harness/test-harness/harness/features/multithreading.local.test.ts:104:47)
batch: [
batch: expect.toIncludeSameMembers([
...optionalSDKConfigNewUser,
{
user: {
Expand All @@ -105,8 +105,7 @@
platform: expectedPlatform,
sdkType: 'server',
},
events: [
...optionalSDKConfigNewEvent,
events: expect.toIncludeSameMembers([
{
...optionalEventFields,
user_id: expect.any(String),
Expand All @@ -118,9 +117,10 @@
value: value !== undefined ? value : 1,
customType: expect.toBeNil(),
},
],
...optionalSDKConfigNewEvent,
]),
},
],
]),
})
}

Expand Down Expand Up @@ -182,7 +182,7 @@
}

expect(body).toEqual({
batch: [
batch: expect.toIncludeSameMembers([
...optionalSDKConfigNewUser,
{
user: {
Expand All @@ -191,7 +191,7 @@
platform: expectedPlatform,
sdkType: 'server',
},
events: [
events: expect.toIncludeSameMembers([
...optionalSDKConfigNewEvent,
{
...optionalEventFields,
Expand All @@ -206,9 +206,9 @@
value: value !== undefined ? value : 1,
customType: expect.toBeNil(),
},
],
]),
},
],
]),
})
}

Expand Down
2 changes: 2 additions & 0 deletions harness/types/capabilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ let sdkCapabilities: { [key: string]: string[] } = {
Capabilities.defaultReason,
Capabilities.etagReporting,
Capabilities.lastModifiedHeader,
Capabilities.sdkConfigEvent,
Capabilities.clientUUID,
],
Ruby: [Capabilities.clientCustomData],
PHP: [Capabilities.cloudProxy],
Expand Down
Loading