X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1ec89c1c31669eb89bd1997cfa9d3c50f0204dbe..89fccf123374c67e738381ea840e3535b2d1074f:/apps/workbench/test/helpers/share_object_helper.rb?ds=sidebyside

diff --git a/apps/workbench/test/helpers/share_object_helper.rb b/apps/workbench/test/helpers/share_object_helper.rb
index 400fcfb51e..9d8f8d0325 100644
--- a/apps/workbench/test/helpers/share_object_helper.rb
+++ b/apps/workbench/test/helpers/share_object_helper.rb
@@ -1,14 +1,8 @@
 module ShareObjectHelper
-  def show_repository_using(auth_key, repo_key='arvados')
-    repo_uuid = api_fixture('repositories')[repo_key]['uuid']
-    visit(page_with_token(auth_key, "/repositories/#{repo_uuid}"))
-    assert(page.has_text?("push_url"), "not on expected repository page")
-  end
-
-  def show_project_using(auth_key, proj_key='aproject')
-    project_uuid = api_fixture('groups')[proj_key]['uuid']
-    visit(page_with_token(auth_key, "/projects/#{project_uuid}"))
-    assert(page.has_text?("A Project"), "not on expected project page")
+  def show_object_using(auth_key, type, key, expect)
+    obj_uuid = api_fixture(type)[key]['uuid']
+    visit(page_with_token(auth_key, "/#{type}/#{obj_uuid}"))
+    assert(page.has_text?(expect), "expected string not found: #{expect}")
   end
 
   def share_rows
@@ -25,6 +19,7 @@ module ShareObjectHelper
       # Otherwise, the not-included assertions might falsely pass because
       # the modal hasn't loaded yet.
       find(".selectable", text: name).click
+      assert_text "Only #{share_type} you are allowed to access are shown"
       assert(has_no_selector?(".modal-dialog-preview-pane"),
              "preview pane available in sharing dialog")
       if share_type == 'users' and obj and obj['email']
@@ -61,10 +56,9 @@ module ShareObjectHelper
         # poltergeist returns true for confirm(), so we don't need to accept.
       end
     end
-    wait_for_ajax
+    # Ensure revoked permission disappears from page.
     using_wait_time(Capybara.default_wait_time * 3) do
-      assert(page.has_no_text?(name),
-             "new share row still exists after being revoked")
+      assert_no_text name
       assert_equal(start_rows.size - 1, share_rows.size,
                    "revoking share did not remove row from sharing table")
     end