X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c3b26754a231ec909506f2ff28af1af9f2e27f2b..35ba053c83b7ad18e1a336d50d3a8d5a53adce9f:/apps/workbench/test/integration_helper.rb diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb index 85c929fdba..0c66e59c8c 100644 --- a/apps/workbench/test/integration_helper.rb +++ b/apps/workbench/test/integration_helper.rb @@ -156,19 +156,6 @@ module HeadlessHelper end end -module KeepWebConfig - def getport service - File.read(File.expand_path("../../../../tmp/#{service}.port", __FILE__)) - end - - def use_keep_web_config - @kwport = getport 'keep-web-ssl' - @kwdport = getport 'keep-web-dl-ssl' - Rails.configuration.keep_web_url = "https://localhost:#{@kwport}/c=%{uuid_or_pdh}" - Rails.configuration.keep_web_download_url = "https://localhost:#{@kwdport}/c=%{uuid_or_pdh}" - end -end - class ActionDispatch::IntegrationTest # Make the Capybara DSL available in all integration tests include Capybara::DSL @@ -197,9 +184,9 @@ class ActionDispatch::IntegrationTest # exception if not found. Use this with assertions to explain that # the error signifies a failed test rather than an unexpected error # during a testing procedure. - def find? *args + def find?(*args) begin - find *args + find(*args) rescue Capybara::ElementNotFound false end