projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11167: Refuse to start when keep-web isn't configured.
[arvados.git]
/
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 9d8f8d03252d036cf9dca696b833a1097f17e46b..454cb2c3689bc33373dc14a4955f2f39ba3c3ab4 100644
(file)
--- 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']
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
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),
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
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
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")
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.
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")
assert_no_text name
assert_equal(start_rows.size - 1, share_rows.size,
"revoking share did not remove row from sharing table")