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.

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

Clean up JSON Golden Tests in wire-api, Part #2 #1732

Merged
merged 76 commits into from
Sep 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
c8ed6aa
Limit the export of a golden test module to test objects only
mdimjasevic Aug 31, 2021
75b2b0d
Clean up JSON golden tests for AssetToken
mdimjasevic Aug 31, 2021
33baf6a
Clean up JSON golden tests for NewAssetToken
mdimjasevic Aug 31, 2021
fc2fc1b
Clean up JSON golden tests for AssetRetention
mdimjasevic Aug 31, 2021
a104d97
Clean up JSON golden tests for AssetSettings
mdimjasevic Aug 31, 2021
b4c3318
Clean up JSON golden tests for AssetKey
mdimjasevic Aug 31, 2021
9fd7c4b
Clean up JSON golden tests for ResumableSettings
mdimjasevic Aug 31, 2021
482334a
Clean up JSON golden instances for TotalSize
mdimjasevic Aug 31, 2021
48d2281
Clean up JSON golden tests for ChunkSize
mdimjasevic Aug 31, 2021
f978edd
Clean up JSON golden tests for Offset
mdimjasevic Aug 31, 2021
d9b824d
Clean up JSON golden tests for ResumableAsset
mdimjasevic Aug 31, 2021
e1ffebf
Clean up JOSN golden tests for TurnHost
mdimjasevic Aug 31, 2021
71a8942
Clean up JSON golden tests for Scheme (call configuration)
mdimjasevic Aug 31, 2021
a24054b
Clean up JSON golden tests for Transport
mdimjasevic Aug 31, 2021
1028f32
Clean up JSON golden tests for TurnURI
mdimjasevic Aug 31, 2021
676f787
Reformatting of Golden.Generated for better readability
mdimjasevic Aug 31, 2021
90d91ae
Clean up JSON golden tests for RTCIceServer
mdimjasevic Aug 31, 2021
3356cdc
Clean up JSON golden tests for RTCConfiguration
mdimjasevic Aug 31, 2021
bc4f24e
Clean up JSON golden tests for SFTServer
mdimjasevic Aug 31, 2021
2b3ec76
Clean up JSON golden tests for ConnectionRequest
mdimjasevic Aug 31, 2021
0b6a293
Clean up JSON golden tests for Relation
mdimjasevic Aug 31, 2021
86e757b
Clean up JSON golden tests for Message
mdimjasevic Aug 31, 2021
898b9cd
Clean up JSON golden tests for UserConnection
mdimjasevic Aug 31, 2021
3afc8ca
Clean up JSON golden tests for UserConnectionList
mdimjasevic Aug 31, 2021
c5bff4e
Clean up JSON golden tests for ConnectionUpdate
mdimjasevic Aug 31, 2021
1175a68
Remove redundant brackets in Golden.Generated
mdimjasevic Aug 31, 2021
92cbf7d
Clean up JSON golden tests for Conversation
mdimjasevic Aug 31, 2021
33e48b6
Fix a failing golden test for Conversation
mdimjasevic Aug 31, 2021
8a2e998
Clean up JSON golden tests for NewConvUnmanaged
mdimjasevic Sep 1, 2021
d7402a5
Introduce a FromJSON testing utility for failure cases
mdimjasevic Sep 1, 2021
9abc4ae
Further clean up of JSON golden tests of NewConvUnmanaged
mdimjasevic Sep 1, 2021
07584d8
Clean up JSON golden tests for NewConvManaged
mdimjasevic Sep 1, 2021
fafef87
Clean up JSON golden tests for ConversationList
mdimjasevic Sep 1, 2021
489875a
Clean up JSON golden tests for 'ConversationList Convevrsation'
mdimjasevic Sep 1, 2021
ef41cb2
Clean up JSON golden tests for Access
mdimjasevic Sep 1, 2021
f417b12
Clean up JSON golden tests for AccessRole
mdimjasevic Sep 1, 2021
c761d56
Clean up JSON golden tests for ConvType
mdimjasevic Sep 1, 2021
1bc4655
Clean up JSON golden tests for ReceiptMode
mdimjasevic Sep 1, 2021
e17feea
Clean up JSON golden tests for ConvTeamInfo
mdimjasevic Sep 1, 2021
4335e48
Update the changelog
mdimjasevic Sep 1, 2021
e265460
Merge branch 'mdimjasevic/reduce-golden-tests' of github.com:wireapp/…
mdimjasevic Sep 1, 2021
d32c6d2
Clean up JSON golden tests for Invite
mdimjasevic Sep 1, 2021
3049810
Clean up JSON golden tests for ConversationRename
mdimjasevic Sep 1, 2021
574ad3f
Clean up JSON golden tests for ConversationAccessUpdate
mdimjasevic Sep 1, 2021
95a5894
Clean up JSON golden tests for ConversationReceiptModeUpdate
mdimjasevic Sep 1, 2021
f6387b4
Clean up JSON golden tests for ConversationMessageTimerUpdate
mdimjasevic Sep 1, 2021
fa0a361
Clean up JSON golden tests for AddBot
mdimjasevic Sep 1, 2021
6556420
Clean up JSON golden tests for AddBotResponse
mdimjasevic Sep 1, 2021
3a201c4
Clean up JSON golden tests for RemoveBotResponse
mdimjasevic Sep 1, 2021
375d42a
Clean up JSON golden tests for UpdateBotPrekeys
mdimjasevic Sep 1, 2021
59d8524
Clean up JSON golden tests for ConversationCode
mdimjasevic Sep 1, 2021
e22036b
Clean up JSON golden tests for MemberUpdate
mdimjasevic Sep 1, 2021
9b7f079
Clean up JSON golden tests for MemberUpdate
mdimjasevic Sep 1, 2021
37bfb98
Clean up JSON golden tests for MutedStatus
mdimjasevic Sep 1, 2021
39bc097
Clean up JSON golden tests for OtherMember
mdimjasevic Sep 1, 2021
bf1b374
Clean up JSON golden tests for ConvMembers
mdimjasevic Sep 1, 2021
c4561c2
Clean up JSON golden tests for OtherMemberUpdate
mdimjasevic Sep 1, 2021
1396b8f
Clean up JSON golden tests for RoleName
mdimjasevic Sep 1, 2021
e4a88f9
Clean up JSON golden tests for Action
mdimjasevic Sep 1, 2021
5827387
Clean up JSON golden tests for ConversationRole
mdimjasevic Sep 1, 2021
68358aa
Clean up JSON golden tests for ConversationRoleList
mdimjasevic Sep 1, 2021
255c534
Clean up JSON golden tests for TypingStatus
mdimjasevic Sep 1, 2021
7e95dfc
Clean up JSON golden tests for TypingData
mdimjasevic Sep 1, 2021
b9aa1c4
Leaving JSON golden tests for CustomBackend
mdimjasevic Sep 1, 2021
5718c9c
Clean up JSON golden tests for EventType
mdimjasevic Sep 1, 2021
1d1671e
Remove redundant JSON golden tests for conversation 'Event's
mdimjasevic Sep 1, 2021
d5b40cd
Rename objects in JSON golden tests for conversation 'Event's
mdimjasevic Sep 1, 2021
a065ea7
Rename more objects in JSON golden tests for conversation 'Event's
mdimjasevic Sep 1, 2021
c4491a5
Add JSON golden tests for missing conversation event types
mdimjasevic Sep 1, 2021
884a88e
Merge branch 'develop' of github.com:wireapp/wire-server into mdimjas…
mdimjasevic Sep 1, 2021
c25b755
Update the changelog
mdimjasevic Sep 1, 2021
ec6d028
Merge branch 'develop' of github.com:wireapp/wire-server into mdimjas…
mdimjasevic Sep 2, 2021
358ed43
Merge branch 'mdimjasevic/reduce-golden-tests' of github.com:wireapp/…
mdimjasevic Sep 2, 2021
74cc135
Remove unused imports in generated JSON golden tests
mdimjasevic Sep 2, 2021
ceef3a4
Merge branch 'develop' of github.com:wireapp/wire-server into mdimjas…
mdimjasevic Sep 2, 2021
f84fb43
Resolve a merge conflict
mdimjasevic Sep 7, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion CHANGELOG-draft.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ THIS FILE ACCUMULATES THE RELEASE NOTES FOR THE UPCOMING RELEASE.
* Make mapping between (team) permissions and roles more lenient (#1711)
* The `DELETE /conversations/:cnv/members/:usr` endpoint rewritten to Servant (#1697)
* Remove leftover auto-connect internal endpoint and code (#1716)
* Clean up JSON golden tests (#1729)
* Clean up JSON golden tests (#1729, #1732)
* Make regenerated JSON output deterministic (#1734)
* Import fix for snappy linker issue (#1736)

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"users": [
"00000002-0000-0058-0000-003c00000079"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"team": {
"managed": true,
"managed": false,
"teamid": "00000002-0000-0002-0000-000200000002"
},
"users": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
"teamid": "00000000-0000-0001-0000-000000000000"
},
"receipt_mode": 1,
"message_timer": 3320987366258987
}
"message_timer": 3320987366258987,
"qualified_users": []
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"access": [],
"access_role": "private",
"conversation_role": "vmao7psxph3fenvbpsu1u57fns5pfo53d67k98om378rnxr0crcpak_mpspn8q_3m1b02n2n133s1d7q5w3qgmt_5e_dgtvzon8an7dtauiecd32",
"message_timer": 2406292360203739,
"name": "😏􃉷",
Expand All @@ -12,7 +11,7 @@
],
"receipt_mode": -1,
"team": {
"managed": false,
"managed": true,
"teamid": "00000000-0000-0001-0000-000000000001"
},
"users": []
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_10.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_11.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_12.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_13.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_14.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_15.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_16.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_17.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_18.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_19.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_20.json

This file was deleted.

2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_4.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"code"
"invite"
1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_5.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_6.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_7.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_8.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Access_user_9.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Action_user_10.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Action_user_11.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Action_user_12.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Action_user_13.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Action_user_14.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Action_user_15.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Action_user_16.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Action_user_17.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Action_user_18.json

This file was deleted.

1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Action_user_19.json

This file was deleted.

2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Action_user_2.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"modify_conversation_receipt_mode"
"remove_conversation_member"
1 change: 0 additions & 1 deletion libs/wire-api/test/golden/testObject_Action_user_20.json

This file was deleted.

2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Action_user_3.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"add_conversation_member"
"modify_conversation_name"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Action_user_4.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"modify_conversation_name"
"modify_conversation_message_timer"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Action_user_5.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"modify_conversation_access"
"modify_conversation_receipt_mode"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Action_user_6.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"leave_conversation"
"modify_conversation_access"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Action_user_7.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"modify_conversation_access"
"modify_other_conversation_member"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Action_user_8.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"modify_conversation_access"
"leave_conversation"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Action_user_9.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"leave_conversation"
"delete_conversation"
31 changes: 0 additions & 31 deletions libs/wire-api/test/golden/testObject_AddBotResponse_user_10.json

This file was deleted.

27 changes: 0 additions & 27 deletions libs/wire-api/test/golden/testObject_AddBotResponse_user_11.json

This file was deleted.

33 changes: 0 additions & 33 deletions libs/wire-api/test/golden/testObject_AddBotResponse_user_12.json

This file was deleted.

50 changes: 0 additions & 50 deletions libs/wire-api/test/golden/testObject_AddBotResponse_user_13.json

This file was deleted.

30 changes: 0 additions & 30 deletions libs/wire-api/test/golden/testObject_AddBotResponse_user_14.json

This file was deleted.

Loading