Skip to content

Commit 70c81d2

Browse files
committed
Change clear inbox test to use GraphQL
1 parent 2d9bd1e commit 70c81d2

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

big_tests/tests/inbox_SUITE.erl

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ groups() ->
100100
groupchat_markers_all_reset_room_created,
101101
inbox_does_not_trigger_does_user_exist,
102102
remove_muclight_messages_after_the_room_is_deleted_xmpp,
103-
remove_muclight_messages_after_the_room_is_deleted_rest
103+
remove_muclight_messages_after_the_room_is_deleted_graphql
104104
]},
105105
{muclight_config, [sequence],
106106
[
@@ -684,8 +684,8 @@ simple_groupchat_stored_in_all_inbox(Config) ->
684684
remove_muclight_messages_after_the_room_is_deleted_xmpp(Config) ->
685685
remove_muclight_messages_after_the_room_is_deleted(Config, xmpp).
686686

687-
remove_muclight_messages_after_the_room_is_deleted_rest(Config) ->
688-
remove_muclight_messages_after_the_room_is_deleted(Config, rest).
687+
remove_muclight_messages_after_the_room_is_deleted_graphql(Config) ->
688+
remove_muclight_messages_after_the_room_is_deleted(Config, graphql).
689689

690690
remove_muclight_messages_after_the_room_is_deleted(Config, ReqType) ->
691691
escalus:fresh_story(Config, [{alice, 1}, {bob, 1}, {kate, 1}], fun(Alice, Bob, Kate) ->
@@ -710,25 +710,24 @@ remove_muclight_messages_after_the_room_is_deleted(Config, ReqType) ->
710710
check_inbox(Kate, [#conv{unread = 1, from = AliceRoomJid, to = KateJid, content = Msg}]),
711711

712712
%% Remove the room
713-
destroy_room(Alice, Bob, Kate, Room, ReqType),
713+
destroy_room(Config, Alice, Bob, Kate, RoomJid, ReqType),
714714

715715
%% Inbox entries are removed
716716
check_inbox(Alice, []),
717717
check_inbox(Bob, []),
718718
check_inbox(Kate, [])
719719
end).
720720

721-
destroy_room(Alice, Bob, Kate, Room, xmpp) ->
721+
destroy_room(_, Alice, Bob, Kate, RoomJid, xmpp) ->
722722
Stanza = escalus_stanza:to(
723-
escalus_stanza:iq_set(?NS_MUC_LIGHT_DESTROY, []),
724-
room_bin_jid(Room)),
723+
escalus_stanza:iq_set(?NS_MUC_LIGHT_DESTROY, []), RoomJid),
725724
escalus:send(Alice, Stanza),
726725
AffUsersChanges = [{Alice, none}, {Bob, none}, {Kate, none}],
727726
muc_light_helper:verify_aff_bcast([], AffUsersChanges, [?NS_MUC_LIGHT_DESTROY]);
728-
destroy_room(_, _, _, Room, rest) ->
729-
Host = muc_light_helper:muc_host(),
730-
Path = <<"/muc-lights/", Host/binary, "/", Room/binary, "/management">>,
731-
{{<<"204">>, <<"No Content">>}, <<"">>} = rest_helper:delete(admin, Path).
727+
destroy_room(Config, _, _, _, RoomJid, graphql) ->
728+
Vars = #{<<"room">> => RoomJid},
729+
graphql_helper:execute_command(<<"muc_light">>, <<"deleteRoom">>, Vars,
730+
graphql_helper:init_admin_handler(Config)).
732731

733732
advanced_groupchat_stored_in_all_inbox(Config) ->
734733
escalus:fresh_story(Config, [{alice, 1}, {bob, 1}, {kate, 1}], fun(Alice, Bob, Kate) ->

0 commit comments

Comments
 (0)