X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/816683553b8353f18c92f32a6ee9ea1868630067..0561bd0c3c07257fd58ded6c7cfa5feeae97af57:/apps/workbench/test/helpers/share_object_helper.rb diff --git a/apps/workbench/test/helpers/share_object_helper.rb b/apps/workbench/test/helpers/share_object_helper.rb index 9d8f8d0325..454cb2c368 100644 --- a/apps/workbench/test/helpers/share_object_helper.rb +++ b/apps/workbench/test/helpers/share_object_helper.rb @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + module ShareObjectHelper def show_object_using(auth_key, type, key, expect) obj_uuid = api_fixture(type)[key]['uuid'] @@ -31,9 +35,10 @@ module ShareObjectHelper end click_on "Add" end - using_wait_time(Capybara.default_wait_time * 3) do + # Admin case takes many times longer than normal user, but not sure why + using_wait_time(30) do assert(page.has_link?(name), - "new share was not added to sharing table") + "new share #{name} was not added to sharing table") assert_equal(start_share_count + 1, share_rows.size, "new share did not add row to sharing table") end @@ -41,7 +46,8 @@ module ShareObjectHelper def modify_share_and_check(name) start_rows = share_rows - link_row = start_rows.select { |row| row.has_text?(name) } + # We assume rows have already been rendered and can be checked quickly + link_row = start_rows.select { |row| row.has_text?(name, wait:(0.1) ) } assert_equal(1, link_row.size, "row with new permission not found") within(link_row.first) do click_on("Read") @@ -57,7 +63,7 @@ module ShareObjectHelper end end # Ensure revoked permission disappears from page. - using_wait_time(Capybara.default_wait_time * 3) do + using_wait_time(Capybara.default_max_wait_time * 3) do assert_no_text name assert_equal(start_rows.size - 1, share_rows.size, "revoking share did not remove row from sharing table")