Skip to content

Commit 15c0baf

Browse files
seratchseratch
authored
Merge pull request #457 from seratch/integration-tests-2020-05-19
Add user.is_invited_user: boolean (detected by integration tests)
2 parents 7913e7b + 45098f0 commit 15c0baf

11 files changed

Lines changed: 292 additions & 11 deletions

File tree

‎json-logs/samples/api/admin.teams.list.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
"team_url": "https://www.example.com/"
1313
}
1414
],
15-
"response_metadata": {
16-
"next_cursor": ""
17-
},
1815
"error": "",
1916
"needed": "",
2017
"provided": ""

‎json-logs/samples/api/admin.teams.settings.info.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"image_102": "https://www.example.com/",
1414
"image_132": "https://www.example.com/",
1515
"image_230": "https://www.example.com/",
16+
"image_default": false,
1617
"image_original": "https://www.example.com/"
1718
},
1819
"enterprise_id": "E00000000",

‎json-logs/samples/api/channels.history.json‎

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,81 @@
520520
"icons": {
521521
"emoji": "",
522522
"image_64": "https://www.example.com/"
523-
}
523+
},
524+
"files": [
525+
{
526+
"id": "F00000000",
527+
"created": 12345,
528+
"timestamp": 12345,
529+
"name": "",
530+
"title": "",
531+
"mimetype": "",
532+
"filetype": "",
533+
"pretty_type": "",
534+
"user": "U00000000",
535+
"editable": false,
536+
"size": 12345,
537+
"mode": "",
538+
"is_external": false,
539+
"external_type": "",
540+
"is_public": false,
541+
"public_url_shared": false,
542+
"display_as_bot": false,
543+
"username": "",
544+
"url_private": "https://www.example.com/",
545+
"url_private_download": "https://www.example.com/",
546+
"thumb_64": "https://www.example.com/",
547+
"thumb_80": "https://www.example.com/",
548+
"thumb_360": "https://www.example.com/",
549+
"thumb_360_w": 12345,
550+
"thumb_360_h": 12345,
551+
"thumb_160": "https://www.example.com/",
552+
"original_w": 12345,
553+
"original_h": 12345,
554+
"thumb_tiny": "",
555+
"permalink": "https://www.example.com/",
556+
"permalink_public": "https://www.example.com/",
557+
"is_starred": false,
558+
"has_rich_preview": false
559+
},
560+
{
561+
"id": "F00000000",
562+
"created": 12345,
563+
"timestamp": 12345,
564+
"name": "",
565+
"title": "",
566+
"mimetype": "",
567+
"filetype": "",
568+
"pretty_type": "",
569+
"user": "U00000000",
570+
"editable": false,
571+
"size": 12345,
572+
"mode": "",
573+
"is_external": false,
574+
"external_type": "",
575+
"is_public": false,
576+
"public_url_shared": false,
577+
"display_as_bot": false,
578+
"username": "",
579+
"url_private": "https://www.example.com/",
580+
"url_private_download": "https://www.example.com/",
581+
"permalink": "https://www.example.com/",
582+
"permalink_public": "https://www.example.com/",
583+
"edit_link": "https://www.example.com/",
584+
"preview": "",
585+
"preview_highlight": "",
586+
"lines": 12345,
587+
"lines_more": 12345,
588+
"preview_is_truncated": false,
589+
"is_starred": false,
590+
"has_rich_preview": false
591+
}
592+
],
593+
"upload": false,
594+
"display_as_bot": false,
595+
"x_files": [
596+
"F00000000"
597+
]
524598
}
525599
],
526600
"has_more": false,

‎json-logs/samples/api/chat.postMessage.json‎

Lines changed: 125 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@
5757
"text": "",
5858
"emoji": false
5959
},
60+
{
61+
"type": "",
62+
"text": "",
63+
"verbatim": false
64+
},
6065
{
6166
"type": "",
6267
"text": {
@@ -199,9 +204,128 @@
199204
"text": "",
200205
"id": 12345,
201206
"fallback": "",
207+
"blocks": [
208+
{
209+
"type": "",
210+
"elements": [
211+
{
212+
"type": "",
213+
"text": {
214+
"type": "",
215+
"text": "",
216+
"emoji": false
217+
},
218+
"action_id": "",
219+
"url": "",
220+
"value": "",
221+
"style": "",
222+
"confirm": {
223+
"title": {
224+
"type": "",
225+
"text": "",
226+
"emoji": false
227+
},
228+
"text": {
229+
"type": "",
230+
"text": "",
231+
"emoji": false
232+
},
233+
"confirm": {
234+
"type": "",
235+
"text": "",
236+
"emoji": false
237+
},
238+
"deny": {
239+
"type": "",
240+
"text": "",
241+
"emoji": false
242+
}
243+
},
244+
"placeholder": {
245+
"type": "",
246+
"text": "",
247+
"emoji": false
248+
},
249+
"initial_channel": "",
250+
"response_url_enabled": false,
251+
"initial_conversation": "",
252+
"filter": {
253+
"exclude_external_shared_channels": false,
254+
"exclude_bot_users": false
255+
},
256+
"initial_date": "",
257+
"initial_option": {
258+
"text": {
259+
"type": "",
260+
"text": "",
261+
"emoji": false
262+
},
263+
"value": "",
264+
"description": {
265+
"type": "",
266+
"text": "",
267+
"emoji": false
268+
},
269+
"url": ""
270+
},
271+
"min_query_length": 12345,
272+
"image_url": "",
273+
"alt_text": "",
274+
"fallback": "",
275+
"image_width": 12345,
276+
"image_height": 12345,
277+
"image_bytes": 12345,
278+
"initial_user": ""
279+
},
280+
{
281+
"type": "",
282+
"image_url": "",
283+
"alt_text": "",
284+
"fallback": "",
285+
"image_width": 12345,
286+
"image_height": 12345,
287+
"image_bytes": 12345
288+
}
289+
],
290+
"block_id": "",
291+
"fallback": "",
292+
"image_url": "",
293+
"image_width": 12345,
294+
"image_height": 12345,
295+
"image_bytes": 12345,
296+
"alt_text": "",
297+
"title": {
298+
"type": "",
299+
"text": "",
300+
"emoji": false
301+
},
302+
"text": {
303+
"type": "",
304+
"text": "",
305+
"emoji": false
306+
},
307+
"fields": [
308+
{
309+
"type": "",
310+
"text": "",
311+
"emoji": false,
312+
"verbatim": false
313+
}
314+
],
315+
"accessory": {
316+
"type": "",
317+
"image_url": "",
318+
"alt_text": "",
319+
"fallback": "",
320+
"image_width": 12345,
321+
"image_height": 12345,
322+
"image_bytes": 12345
323+
}
324+
}
325+
],
326+
"color": "",
202327
"msg_subtype": "",
203328
"callback_id": "",
204-
"color": "",
205329
"pretext": "",
206330
"service_url": "",
207331
"service_name": "",

‎json-logs/samples/api/conversations.history.json‎

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,81 @@
522522
}
523523
],
524524
"topic": "",
525-
"purpose": ""
525+
"purpose": "",
526+
"files": [
527+
{
528+
"id": "F00000000",
529+
"created": 12345,
530+
"timestamp": 12345,
531+
"name": "",
532+
"title": "",
533+
"mimetype": "",
534+
"filetype": "",
535+
"pretty_type": "",
536+
"user": "U00000000",
537+
"editable": false,
538+
"size": 12345,
539+
"mode": "",
540+
"is_external": false,
541+
"external_type": "",
542+
"is_public": false,
543+
"public_url_shared": false,
544+
"display_as_bot": false,
545+
"username": "",
546+
"url_private": "https://www.example.com/",
547+
"url_private_download": "https://www.example.com/",
548+
"thumb_64": "https://www.example.com/",
549+
"thumb_80": "https://www.example.com/",
550+
"thumb_360": "https://www.example.com/",
551+
"thumb_360_w": 12345,
552+
"thumb_360_h": 12345,
553+
"thumb_160": "https://www.example.com/",
554+
"original_w": 12345,
555+
"original_h": 12345,
556+
"thumb_tiny": "",
557+
"permalink": "https://www.example.com/",
558+
"permalink_public": "https://www.example.com/",
559+
"is_starred": false,
560+
"has_rich_preview": false
561+
},
562+
{
563+
"id": "F00000000",
564+
"created": 12345,
565+
"timestamp": 12345,
566+
"name": "",
567+
"title": "",
568+
"mimetype": "",
569+
"filetype": "",
570+
"pretty_type": "",
571+
"user": "U00000000",
572+
"editable": false,
573+
"size": 12345,
574+
"mode": "",
575+
"is_external": false,
576+
"external_type": "",
577+
"is_public": false,
578+
"public_url_shared": false,
579+
"display_as_bot": false,
580+
"username": "",
581+
"url_private": "https://www.example.com/",
582+
"url_private_download": "https://www.example.com/",
583+
"permalink": "https://www.example.com/",
584+
"permalink_public": "https://www.example.com/",
585+
"edit_link": "https://www.example.com/",
586+
"preview": "",
587+
"preview_highlight": "",
588+
"lines": 12345,
589+
"lines_more": 12345,
590+
"preview_is_truncated": false,
591+
"is_starred": false,
592+
"has_rich_preview": false
593+
}
594+
],
595+
"upload": false,
596+
"display_as_bot": false,
597+
"x_files": [
598+
"F00000000"
599+
]
526600
}
527601
],
528602
"has_more": false,

‎json-logs/samples/api/users.list.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
"image_original": "https://www.example.com/",
4343
"is_custom_image": false,
4444
"image_1024": "https://www.example.com/",
45-
"guest_invited_by": "U00000000"
45+
"guest_invited_by": "U00000000",
46+
"guest_expiration_ts": 12345
4647
},
4748
"is_admin": false,
4849
"is_owner": false,
@@ -66,7 +67,8 @@
6667
"tz": "",
6768
"has_2fa": false,
6869
"is_workflow_bot": false,
69-
"locale": ""
70+
"locale": "",
71+
"is_invited_user": false
7072
}
7173
],
7274
"cache_ts": 12345,

‎json-logs/samples/rtm/TeamJoinEvent.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"is_admin": false,
4747
"is_owner": false,
4848
"is_primary_owner": false,
49+
"is_invited_user": false,
4950
"is_restricted": false,
5051
"is_ultra_restricted": false,
5152
"is_bot": false,

‎json-logs/samples/rtm/UserChangeEvent.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"is_admin": false,
4747
"is_owner": false,
4848
"is_primary_owner": false,
49+
"is_invited_user": false,
4950
"is_restricted": false,
5051
"is_ultra_restricted": false,
5152
"is_bot": false,

‎slack-api-client/src/test/java/test_locally/api/methods_admin_api/FieldValidationTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,10 @@ public void adminTeams() throws Exception {
111111
}
112112
{
113113
AdminTeamsListResponse obj = parse(prefix + "list", AdminTeamsListResponse.class);
114-
verifyIfAllGettersReturnNonNull(obj);
115-
verifyIfAllGettersReturnNonNullRecursively(obj.getResponseMetadata(), "getMessages");
114+
verifyIfAllGettersReturnNonNull(obj, "getResponseMetadata", "getWarning");
115+
if (obj.getResponseMetadata() != null) {
116+
verifyIfAllGettersReturnNonNullRecursively(obj.getResponseMetadata(), "getMessages");
117+
}
116118
}
117119
{
118120
AdminTeamsOwnersListResponse obj = parse(prefix + "owners.list", AdminTeamsOwnersListResponse.class);

‎slack-api-client/src/test/java/test_with_remote_apis/methods/files_Test.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,10 @@ public void createImageFileAndComments() throws IOException, SlackApiException {
267267
assertThat(fileObj.getSize(), is(29720));
268268
assertThat(fileObj.isEditable(), is(false));
269269

270-
assertThat(fileObj.getImageExifRotation(), is(1));
270+
if (fileObj.getImageExifRotation() != null) {
271+
// This field is occasionally returned as null
272+
assertThat(fileObj.getImageExifRotation(), is(1));
273+
}
271274
assertThat(fileObj.getPjpeg(), is(nullValue()));
272275
assertThat(fileObj.getOriginalWidth(), is("400"));
273276
assertThat(fileObj.getThumb360Width(), is("360"));

0 commit comments

Comments
 (0)