Skip to content

Commit fb54847

Browse files
Fix tests case
1 parent 219a715 commit fb54847

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

deps/rabbitmq_auth_backend_oauth2/test/rabbit_oauth2_provider_SUITE.erl

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -154,19 +154,19 @@ init_per_group(with_resource_server_id, Config) ->
154154

155155
init_per_group(oauth_provider_with_proxy, Config) ->
156156
Proxy = [
157-
{proxy_host, "idp"},
158-
{proxy_port, 8080},
159-
{proxy_username, <<"user1">>},
160-
{proxy_password, <<"pwd1">>}
157+
{host, "idp"},
158+
{port, 8080},
159+
{username, <<"user1">>},
160+
{password, <<"pwd1">>}
161161
],
162162
case ?config(oauth_provider_id, Config) of
163163
root ->
164-
KeyConfig = get_env(key_config, []),
165-
set_env(key_config, KeyConfig ++ Proxy);
164+
set_env(proxy, Proxy);
166165
Id ->
167166
OAuthProviders = get_env(oauth_providers, #{}),
168-
OAuthProvider = maps:get(Id, OAuthProviders, []),
169-
set_env(oauth_providers, maps:put(Id, Proxy ++ OAuthProvider, OAuthProviders))
167+
OAuthProvider = maps:get(Id, OAuthProviders, []),
168+
set_env(oauth_providers, maps:put(Id,
169+
[{proxy, Proxy}] ++ OAuthProvider, OAuthProviders))
170170
end,
171171
[{proxy_hostname, "idp"},
172172
{proxy_port, 8080},
@@ -217,15 +217,10 @@ end_per_group(with_rabbitmq_node, Config) ->
217217
end_per_group(oauth_provider_with_proxy, Config) ->
218218
case ?config(oauth_provider_id, Config) of
219219
root ->
220-
KeyConfig = get_env(key_config, []),
221-
KeyConfig0 = proplists:delete(proxy_host, KeyConfig),
222-
KeyConfig1 = proplists:delete(proxy_port, KeyConfig0),
223-
KeyConfig2 = proplists:delete(proxy_username, KeyConfig1),
224-
KeyConfig3 = proplists:delete(proxy_password, KeyConfig2),
225-
set_env(key_config, KeyConfig3);
220+
unset_env(proxy);
226221
Id ->
227222
unset_oauth_provider_properties(Id,
228-
[proxy_host, proxy_port, proxy_username, proxy_password])
223+
[host, port, username, password])
229224
end,
230225
Config;
231226

0 commit comments

Comments
 (0)