Merge branch 'master' into 7454-azure-custom-data

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

diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index f5ce694fdf9f0ff96737e441f91d3ef7e7353501..db072e496be7affdddec7d2f8cf2a164ed67bc5b 100644 (file)
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -24,9 +24,10 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       else
         assert page.has_link?("Projects"), 'Not found link - Projects'
         page.find("#projects-menu").click
-        assert_selector 'a', text: 'Add a new project'
+        assert_selector 'a', text: 'Search all projects'
         assert_no_selector 'a', text: 'Browse public projects'
-        assert page.has_text?('Projects shared with me'), 'Not found text - Project shared with me'
+        assert_selector 'a', text: 'Add a new project'
+        assert_selector 'li[class="dropdown-header"]', text: 'My projects'
       end
     elsif invited
       assert page.has_text?('Please check the box below to indicate that you have read and accepted the user agreement'), 'Not found text - Please check the box below . . .'
@@ -54,7 +55,6 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
             assert_selector "a[href=\"/users/#{user['uuid']}/repositories\"]", text: 'Repositories'
             assert_selector "a[href=\"/current_token\"]", text: 'Current token'
             assert_selector "a[href=\"/users/#{user['uuid']}/ssh_keys\"]", text: 'SSH keys'
-            assert_selector "a[href=\"/users/#{user['uuid']}/manage_account\"]", text: 'Manage account'
 
             if profile_config
               assert_selector "a[href=\"/users/#{user['uuid']}/profile\"]", text: 'Manage profile'
@@ -67,7 +67,6 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
             assert page.has_no_link?('Repositories'), 'Found link - Repositories'
             assert page.has_no_link?('Current token'), 'Found link - Current token'
             assert page.has_no_link?('SSH keys'), 'Found link - SSH keys'
-            assert page.has_no_link?('Manage account'), 'Found link - Manage account'
             assert page.has_no_link?('Manage profile'), 'Found link - Manage profile'
           end
           assert page.has_link?('Log out'), 'No link - Log out'
@@ -219,18 +218,16 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
   end
 
    [
-    ['Repositories','repository','Attributes'],
-    ['Virtual machines','virtual machine','current_user_logins'],
-    ['SSH keys','authorized key','public_key'],
-    ['Links','link','link_class'],
-    ['Groups','group','group_class'],
-    ['Compute nodes','node','info[ping_secret'],
-    ['Keep services','keep service','service_ssl_flag'],
-    ['Keep disks', 'keep disk','bytes_free'],
+    ['Repositories', nil, 's0uqq'],
+    ['Virtual machines', nil, 'testvm.shell'],
+    ['SSH keys', nil, 'public_key'],
+    ['Links', nil, 'link_class'],
+    ['Groups', nil, 'All users'],
+    ['Compute nodes', nil, 'ping_secret'],
+    ['Keep services', nil, 'service_ssl_flag'],
+    ['Keep disks', nil, 'bytes_free'],
   ].each do |page_name, add_button_text, look_for|
     test "test system menu #{page_name} link" do
-      skip 'Skip repositories test until #6652 is fixed.' if page_name == 'Repositories'
-
       visit page_with_token('admin')
       within('.navbar-fixed-top') do
         page.find("#system-menu").click
@@ -240,12 +237,16 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
         end
       end
 
-      # click the add button
-      assert_selector 'button', text: "Add a new #{add_button_text}"
-      find('button', text: "Add a new #{add_button_text}").click
+      # click the add button if it exists
+      if add_button_text
+        assert_selector 'button', text: "Add a new #{add_button_text}"
+        find('button', text: "Add a new #{add_button_text}").click
+      else
+        assert_no_selector 'button', text:"Add a new"
+      end
 
-      # look for unique property in the created object page
-      assert page.has_text? look_for
+      # look for unique property in the current page
+      assert_text look_for
     end
   end
 end