diff --git a/big_tests/tests/graphql_helper.erl b/big_tests/tests/graphql_helper.erl index da3aa2ac9ae..a94ba7abec2 100644 --- a/big_tests/tests/graphql_helper.erl +++ b/big_tests/tests/graphql_helper.erl @@ -58,14 +58,14 @@ init_admin_handler(Config) -> end. get_listener_opts(EpName) -> - #{modules := Modules} = get_listener_config(EpName), + #{handlers := Handlers} = get_listener_config(EpName), [Opts2] = lists:filtermap( fun ({_, _Path, mongoose_graphql_cowboy_handler, Args}) -> {true, Args}; (_) -> false - end, Modules), + end, Handlers), Opts2. -spec get_err_msg(#{errors := [#{message := binary()}]}) -> binary(). @@ -105,10 +105,10 @@ get_value([Field | Fields], Data) -> Data2 = maps:get(BinField, Data), get_value(Fields, Data2). -is_graphql_config(#{module := ejabberd_cowboy, modules := Modules}, EpName) -> +is_graphql_config(#{handlers := Handlers}, EpName) -> lists:any(fun({_, _Path, mongoose_graphql_cowboy_handler, Args}) -> atom_to_binary(EpName) == proplists:get_value(schema_endpoint, Args); (_) -> false - end, Modules); + end, Handlers); is_graphql_config(_, _EpName) -> false. diff --git a/big_tests/tests/rest_helper.erl b/big_tests/tests/rest_helper.erl index 8427a1a9952..9da1e16e1f5 100644 --- a/big_tests/tests/rest_helper.erl +++ b/big_tests/tests/rest_helper.erl @@ -308,7 +308,7 @@ is_roles_config(#{module := ejabberd_cowboy, handlers := Modules}, client) -> (_) -> [] end, Modules), lists:any(fun(["mongoose", "client", "api" | _T]) -> true; (_) -> false end, ModulesTokens); -is_roles_config(#{module := ejabberd_cowboy, modules := Modules}, {graphql, SchemaEndpoint}) -> +is_roles_config(#{module := ejabberd_cowboy, handlers := Modules}, {graphql, SchemaEndpoint}) -> lists:any(fun({_, _Path, Mod, Args}) -> Mod == mongoose_graphql_cowboy_handler andalso SchemaEndpoint == proplists:get_value(schema_endpoint, Args);