X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c803bd3b08fb2a981bb02f99d2be6d10bc37d341..2024ca087c3b9c99ebb792011b60fecdf1486467:/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 21406b03b1..8a0ebc3c29 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -45,36 +45,22 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
         assert page.has_link? "#{user['email']}"
         find('a', text: "#{user['email']}").click
         within('.dropdown-menu') do
-          if !invited
-            page.has_no_link? ('Not active')
-          else
-            page.has_no_link? ('Sign agreements')
-            page.has_link? ('Manage account')
+          if user['is_active']
+            assert page.has_no_link? ('Not active')
+            assert page.has_no_link? ('Sign agreements')
+
+            assert page.has_link? ('Manage account')
 
             if profile_config
-              page.has_link? ('Manage profile')
+              assert page.has_link? ('Manage profile')
             else
-              page.has_no_link? ('Manage profile')
+              assert page.has_no_link? ('Manage profile')
             end
           end
-          page.has_link? ('Log out')
+          assert page.has_link? ('Log out')
         end
       end
     end
-
-    # check help menu
-    check_help_menu
-
-    if user && user['is_active']
-      # check system menu
-      check_system_menu user
-
-      # test manage account page
-      check_manage_account_page user
-
-      # check search box
-      check_search_box user
-    end
   end
 
   # test the help menu
@@ -89,8 +75,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
     end
   end
 
-  # test the system menu
-  def check_system_menu user
+  def verify_system_menu user
     if user && user['is_active']
       look_for_add_new = nil
       within('.navbar-fixed-top') do
@@ -127,47 +112,49 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
   end
 
   # test manage_account page
-  def check_manage_account_page user
-    within('.navbar-fixed-top') do
-      find('a', text: "#{user['email']}").click
-      within('.dropdown-menu') do
-        find('a', text: 'Manage account').click
+  def verify_manage_account user
+    if user && user['is_active']
+      within('.navbar-fixed-top') do
+        find('a', text: "#{user['email']}").click
+        within('.dropdown-menu') do
+          find('a', text: 'Manage account').click
+        end
       end
-    end
-
-    # now in manage account page
-    assert page.has_text? 'Virtual Machines'
-    assert page.has_text? 'Repositories'
-    assert page.has_text? 'SSH Keys'
-    assert page.has_text? 'Current Token'
-
-    assert page.has_text? 'The Arvados API token is a secret key that enables the Arvados SDKs to access Arvados'
 
-    click_link 'Add new SSH key'
+      # now in manage account page
+      assert page.has_text? 'Virtual Machines'
+      assert page.has_text? 'Repositories'
+      assert page.has_text? 'SSH Keys'
+      assert page.has_text? 'Current Token'
 
-    within '.modal-content' do
-      assert page.has_text? 'Public Key'
-      assert page.has_button? 'Cancel'
-      assert page.has_button? 'Submit'
+      assert page.has_text? 'The Arvados API token is a secret key that enables the Arvados SDKs to access Arvados'
 
-      page.find_field('public_key').set 'first test with an incorrect ssh key value'
-      click_button 'Submit'
-      assert page.has_text? 'Public key does not appear to be a valid ssh-rsa or dsa public key'
+      click_link 'Add new SSH key'
 
-      public_key_str = api_fixture('authorized_keys')['active']['public_key']
-      page.find_field('public_key').set public_key_str
-      page.find_field('name').set 'added_in_test'
-      click_button 'Submit'
-      assert page.has_text? 'Public key already exists in the database, use a different key.'
+      within '.modal-content' do
+        assert page.has_text? 'Public Key'
+        assert page.has_button? 'Cancel'
+        assert page.has_button? 'Submit'
+
+        page.find_field('public_key').set 'first test with an incorrect ssh key value'
+        click_button 'Submit'
+        assert page.has_text? 'Public key does not appear to be a valid ssh-rsa or dsa public key'
+
+        public_key_str = api_fixture('authorized_keys')['active']['public_key']
+        page.find_field('public_key').set public_key_str
+        page.find_field('name').set 'added_in_test'
+        click_button 'Submit'
+        assert page.has_text? 'Public key already exists in the database, use a different key.'
+
+        new_key = SSHKey.generate
+        page.find_field('public_key').set new_key.ssh_public_key
+        page.find_field('name').set 'added_in_test'
+        click_button 'Submit'
+      end
 
-      new_key = SSHKey.generate
-      page.find_field('public_key').set new_key.ssh_public_key
-      page.find_field('name').set 'added_in_test'
-      click_button 'Submit'
+      # key must be added. look for it in the refreshed page
+      assert page.has_text? 'added_in_test'
     end
-
-    # key must be added. look for it in the refreshed page
-    assert page.has_text? 'added_in_test'
   end
 
   # Check manage profile page and add missing profile to the user
@@ -192,29 +179,25 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
     assert page.has_text? 'Save profile'
 
     # This time fill in required field and then save. Expect to go to requested page after that.
-    profile_config = Rails.configuration.user_profile_form_fields
-    profile_message = ''
+    profile_message = Rails.configuration.user_profile_form_message
     required_field_title = ''
     required_field_key = ''
-    profile_config.andand.each do |entry| 
-      if entry['message']
-        profile_message = entry['message']
-      else
-        if entry['required']
-          required_field_key = entry['key']
-          required_field_title = entry['form_field_title']
-        end
+    profile_config = Rails.configuration.user_profile_form_fields
+    profile_config.andand.each do |entry|
+      if entry['required']
+        required_field_key = entry['key']
+        required_field_title = entry['form_field_title']
       end
     end
 
-    assert page.has_text? profile_message
+    assert page.has_text? profile_message[0,25]
     assert page.has_text? required_field_title
     page.find_field('user[prefs][:profile][:'+required_field_key+']').set 'value to fill required field'
 
     click_button "Save profile"
     # profile saved and in profile page now with success
     assert page.has_text? 'Thank you for filling in your profile'
-    click_button 'Take me to my page'
+    click_button 'Access Arvados Workbench'
 
     # profile saved and in home page now
     assert page.has_text? 'My projects'
@@ -222,8 +205,8 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
   end
 
   # test the search box
-  def check_search_box user
-    if user
+  def verify_search_box user
+    if user && user['is_active']
       # let's search for a valid uuid
       within('.navbar-fixed-top') do
         page.find_field('search').set user['uuid']
@@ -276,8 +259,9 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
     ['active', api_fixture('users')['active'], true, true],
     ['admin', api_fixture('users')['admin'], true, true],
     ['active_no_prefs', api_fixture('users')['active_no_prefs'], true, false],
+    ['active_no_prefs_profile', api_fixture('users')['active_no_prefs_profile'], true, false],
   ].each do |token, user, invited, has_profile|
-      test "visit home page when profile is configured for user #{token}" do
+    test "visit home page when profile is configured for user #{token}" do
       # Our test config enabled profile by default. So, no need to update config
       if !token
         visit ('/')
@@ -287,16 +271,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
 
       verify_homepage_with_profile user, invited, has_profile
     end
-  end
 
-  [
-    [nil, nil, false, false],
-    ['inactive', api_fixture('users')['inactive'], true, false],
-    ['inactive_uninvited', api_fixture('users')['inactive_uninvited'], false, false],
-    ['active', api_fixture('users')['active'], true, true],
-    ['admin', api_fixture('users')['admin'], true, true],
-    ['active_no_prefs', api_fixture('users')['active_no_prefs'], true, false],
-  ].each do |token, user, invited, has_profile|
     test "visit home page when profile not configured for user #{token}" do
       Rails.configuration.user_profile_form_fields = false
 
@@ -308,6 +283,35 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
 
       verify_homepage_with_profile user, invited, has_profile
     end
+
+    test "check help for user #{token}" do
+      if !token
+        visit ('/')
+      else
+        visit page_with_token(token)
+      end
+
+      check_help_menu
+    end
   end
 
+  [
+    ['active', api_fixture('users')['active'], true, true],
+    ['admin', api_fixture('users')['admin'], true, true],
+  ].each do |token, user|
+    test "test system menu for user #{token}" do
+      visit page_with_token(token)
+      verify_system_menu user
+    end
+
+    test "test manage account for user #{token}" do
+      visit page_with_token(token)
+      verify_manage_account user
+    end
+
+    test "test search for user #{token}" do
+      visit page_with_token(token)
+      verify_search_box user
+    end
+  end
 end