Merge branch 'master' into 4523-full-text-search

[arvados.git] / apps / workbench / test / integration / projects_test.rb

diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index cb06e19a27c7ec15971f6bd8be93dc984693c633..7f051f673f6f3d87cead8657f35e8d7732b09c34 100644 (file)
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -173,7 +173,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
   end
 
   test "project viewer can't see project sharing tab" do
-    show_project_using("project_viewer")
+    show_object_using('project_viewer', 'groups', 'aproject', 'A Project')
     assert(page.has_no_link?("Sharing"),
            "read-only project user sees sharing tab")
   end
@@ -182,7 +182,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
     add_user = api_fixture('users')['future_project_user']
     new_name = ["first_name", "last_name"].map { |k| add_user[k] }.join(" ")
 
-    show_project_using("active")
+    show_object_using('active', 'groups', 'aproject', 'A Project')
     click_on "Sharing"
     add_share_and_check("users", new_name, add_user)
     modify_share_and_check(new_name)
@@ -191,14 +191,14 @@ class ProjectsTest < ActionDispatch::IntegrationTest
   test "project owner can manage sharing for another group" do
     new_name = api_fixture('groups')['future_project_viewing_group']['name']
 
-    show_project_using("active")
+    show_object_using('active', 'groups', 'aproject', 'A Project')
     click_on "Sharing"
     add_share_and_check("groups", new_name)
     modify_share_and_check(new_name)
   end
 
   test "'share with group' listing does not offer projects" do
-    show_project_using("active")
+    show_object_using('active', 'groups', 'aproject', 'A Project')
     click_on "Sharing"
     click_on "Share with groups"
     good_uuid = api_fixture("groups")["private"]["uuid"]
@@ -239,14 +239,6 @@ class ProjectsTest < ActionDispatch::IntegrationTest
 
       when 'Remove'
         assert page.has_no_text?(my_collection['name']), 'Collection still found in src project after remove'
-        visit page_with_token 'active', '/'
-        find("#projects-menu").click
-        find(".dropdown-menu a", text: "Home").click
-        assert page.has_text?(my_collection['name']), 'Collection not found in home project after remove'
-        if expect_name_change
-          assert page.has_text?(my_collection['name']+' removed from ' + src['name']),
-            'Collection with update name is not found in home project after remove'
-        end
       end
     end
   end