X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f3e3a6cc4b72120f856e14f3039b1c0c1f0326bd..69c08bb019277b158fc2f568b7de7483caa2875d:/services/api/test/unit/api_client_test.rb diff --git a/services/api/test/unit/api_client_test.rb b/services/api/test/unit/api_client_test.rb index 93e4c51abf..a0eacfd13b 100644 --- a/services/api/test/unit/api_client_test.rb +++ b/services/api/test/unit/api_client_test.rb @@ -10,8 +10,11 @@ class ApiClientTest < ActiveSupport::TestCase [true, false].each do |token_lifetime_enabled| test "configured workbench is trusted when token lifetime is#{token_lifetime_enabled ? '': ' not'} enabled" do Rails.configuration.Login.TokenLifetime = token_lifetime_enabled ? 8.hours : 0 + Rails.configuration.Login.IssueTrustedTokens = !token_lifetime_enabled; Rails.configuration.Services.Workbench1.ExternalURL = URI("http://wb1.example.com") Rails.configuration.Services.Workbench2.ExternalURL = URI("https://wb2.example.com:443") + Rails.configuration.Login.TrustedClients = ActiveSupport::OrderedOptions.new + Rails.configuration.Login.TrustedClients[:"https://wb3.example.com"] = ActiveSupport::OrderedOptions.new act_as_system_user do [["http://wb0.example.com", false], @@ -19,6 +22,8 @@ class ApiClientTest < ActiveSupport::TestCase ["http://wb2.example.com", false], ["https://wb2.example.com", true], ["https://wb2.example.com/", true], + ["https://wb3.example.com/", true], + ["https://wb4.example.com/", false], ].each do |pfx, result| a = ApiClient.create(url_prefix: pfx, is_trusted: false) if token_lifetime_enabled