3620: display gear menu to admin users only. update the layout tests accordingly.

[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 99eed01c4c037f91af12e11630a350424ae8bbf8..e3441c4b3de3eef0ce7226c1745ee079dd2c88c1 100644 (file)
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -75,38 +75,22 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
   end
 
   def verify_system_menu user
-    if user && user['is_active']
-      look_for_add_new = nil
+    if user && user['is_admin']
+      assert page.has_link?('system-menu'), 'No link - system menu'
       within('.navbar-fixed-top') do
         page.find("#system-menu").click
-        if user['is_admin']
-          within('.dropdown-menu') do
-            assert page.has_text?('Groups'), 'No text - Groups'
-            assert page.has_link?('Repositories'), 'No link - Repositories'
-            assert page.has_link?('Virtual machines'), 'No link - Virtual machines'
-            assert page.has_link?('SSH keys'), 'No link - SSH keys'
-            assert page.has_link?('API tokens'), 'No link - API tokens'
-            find('a', text: 'Users').click
-            look_for_add_new = 'Add a new user'
-          end
-        else
-          within('.dropdown-menu') do
-            assert page.has_no_text?('Users'), 'Found text - Users'
-            assert page.has_no_link?('Repositories'), 'Found link - Repositories'
-            assert page.has_no_link?('Virtual machines'), 'Found link - Virtual machines'
-            assert page.has_no_link?('SSH keys'), 'Found link - SSH keys'
-            assert page.has_no_link?('API tokens'), 'Found link - API tokens'
-
-            find('a', text: 'Groups').click
-            look_for_add_new = 'Add a new group'
-          end
+        within('.dropdown-menu') do
+          assert page.has_text?('Groups'), 'No text - Groups'
+          assert page.has_link?('Repositories'), 'No link - Repositories'
+          assert page.has_link?('Virtual machines'), 'No link - Virtual machines'
+          assert page.has_link?('SSH keys'), 'No link - SSH keys'
+          assert page.has_link?('API tokens'), 'No link - API tokens'
+          find('a', text: 'Users').click
         end
       end
-      if look_for_add_new
-        assert page.has_text? look_for_add_new
-      end
+      assert page.has_text? 'Add a new user'
     else
-      assert page.has_no_link?('#system-menu'), 'Found link - system menu'
+      assert page.has_no_link?('system-menu'), 'Found link - system menu'
     end
   end