X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/74eaca91f86f352ddd4ea40ab49a4aaa484e9610..0561bd0c3c07257fd58ded6c7cfa5feeae97af57:/apps/workbench/test/integration/user_profile_test.rb

diff --git a/apps/workbench/test/integration/user_profile_test.rb b/apps/workbench/test/integration/user_profile_test.rb
index 1736ae7af8..e4d9894e5f 100644
--- a/apps/workbench/test/integration/user_profile_test.rb
+++ b/apps/workbench/test/integration/user_profile_test.rb
@@ -1,13 +1,12 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'integration_helper'
-require 'selenium-webdriver'
-require 'headless'
 
 class UserProfileTest < ActionDispatch::IntegrationTest
   setup do
-    headless = Headless.new
-    headless.start
-    Capybara.current_driver = :selenium
-
+    need_javascript
     @user_profile_form_fields = Rails.configuration.user_profile_form_fields
   end
 
@@ -19,21 +18,31 @@ class UserProfileTest < ActionDispatch::IntegrationTest
     profile_config = Rails.configuration.user_profile_form_fields
 
     if !user
-      assert page.has_text?('Please log in'), 'Not found text - Please log in'
+      assert_text('Please log in')
     elsif user['is_active']
       if profile_config && !has_profile
-        assert page.has_text?('Save profile'), 'No text - Save profile'
+        assert_text('Save profile')
         add_profile user
       else
-        assert page.has_text?('Active pipelines'), 'Not found text - Active pipelines'
-        assert page.has_no_text?('Save profile'), 'Found text - Save profile'
+        assert_text('Recent pipelines and processes')
+        assert_no_text('Save profile')
       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 . . .'
-      assert page.has_no_text?('Save profile'), 'Found text - Save profile'
+      assert_text('Please check the box below to indicate that you have read and accepted the user agreement')
+      assert_no_text('Save profile')
     else
-      assert page.has_text?('Your account is inactive'), 'Not found text - Your account is inactive'
-      assert page.has_no_text?('Save profile'), 'Found text - Save profile'
+      assert_text('Your account is inactive')
+      assert_no_text('Save profile')
+    end
+
+    # If the user has not already seen getting_started modal, it will be shown on first visit.
+    if user and user['is_active'] and !user['prefs']['getting_started_shown']
+      within '.modal-content' do
+        assert_text 'Getting Started'
+        assert_selector 'button', text: 'Next'
+        assert_selector 'button', text: 'Prev'
+        first('button', text: 'x').click
+      end
     end
 
     within('.navbar-fixed-top') do
@@ -41,22 +50,25 @@ class UserProfileTest < ActionDispatch::IntegrationTest
         assert page.has_link?('Log in'), 'Not found link - Log in'
       else
         # my account menu
-        assert page.has_link?("#{user['email']}"), 'Not found link - email'
-        find('a', text: "#{user['email']}").click
+        assert_selector("#notifications-menu")
+        page.find("#notifications-menu").click
         within('.dropdown-menu') do
           if user['is_active']
-            assert page.has_no_link?('Not active'), 'Found link - Not active'
-            assert page.has_no_link?('Sign agreements'), 'Found link - Sign agreements'
+            assert_no_selector('a', text: 'Not active')
+            assert_no_selector('a', text: 'Sign agreements')
 
-            assert page.has_link?('Manage account'), 'No link - Manage account'
+            assert_selector('a', text: 'Virtual machines')
+            assert_selector('a', text: 'Repositories')
+            assert_selector('a', text: 'Current token')
+            assert_selector('a', text: 'SSH keys')
 
             if profile_config
-              assert page.has_link?('Manage profile'), 'No link - Manage profile'
+              assert_selector('a', text: 'Manage profile')
             else
-              assert page.has_no_link?('Manage profile'), 'Found link - Manage profile'
+              assert_no_selector('a', text: 'Manage profile')
             end
           end
-          assert page.has_link?('Log out'), 'No link - Log out'
+          assert_selector('a', text: 'Log out')
         end
       end
     end
@@ -64,84 +76,87 @@ class UserProfileTest < ActionDispatch::IntegrationTest
 
   # Check manage profile page and add missing profile to the user
   def add_profile user
-    assert page.has_no_text?('My projects'), 'Found text - My projects'
-    assert page.has_no_text?('Projects shared with me'), 'Found text - Projects shared with me'
+    assert_no_text('My projects')
+    assert_no_text('Projects shared with me')
 
-    assert page.has_text?('Profile'), 'No text - Profile'
-    assert page.has_text?('First Name'), 'No text - First Name'
-    assert page.has_text?('Last Name'), 'No text - Last Name'
-    assert page.has_text?('Identity URL'), 'No text - Identity URL'
-    assert page.has_text?('E-mail'), 'No text - E-mail'
-    assert page.has_text?(user['email']), 'No text - user email'
+    assert_text('Profile')
+    assert_text('First Name')
+    assert_text('Last Name')
+    assert_text('Identity URL')
+    assert_text('E-mail')
+    assert_text(user['email'])
 
     # Using the default profile which has message and one required field
 
     # Save profile without filling in the required field. Expect to be back in this profile page again
     click_button "Save profile"
-    assert page.has_text?('Profile'), 'No text - Profile'
-    assert page.has_text?('First Name'), 'No text - First Name'
-    assert page.has_text?('Last Name'), 'No text - Last Name'
-    assert page.has_text?('Save profile'), 'No text - Save profile'
+    assert_text('Profile')
+    assert_text('First Name')
+    assert_text('Last Name')
+    assert_text('Save profile')
 
     # This time fill in required field and then save. Expect to go to requested page after that.
     profile_message = Rails.configuration.user_profile_form_message
     required_field_title = ''
     required_field_key = ''
     profile_config = Rails.configuration.user_profile_form_fields
-    profile_config.andand.each do |entry|
+    profile_config.each do |entry|
       if entry['required']
         required_field_key = entry['key']
         required_field_title = entry['form_field_title']
+        break
       end
     end
 
     assert page.has_text? profile_message.gsub(/<.*?>/,'')
-    assert page.has_text?(required_field_title), 'No text - configured required field title'
+    assert_text(required_field_title)
 
-    page.find_field('user[prefs][:profile][:'+required_field_key+']').set 'value to fill required field'
+    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'), 'No text - Thank you for filling'
-    click_link 'Back to work!'
+    assert_text('Thank you for filling in your profile')
+    assert_selector('input' +
+                    '[name="user[prefs][profile]['+required_field_key+']"]' +
+                    '[value="value to fill required field"]')
+    if user['prefs']['getting_started_shown']
+      click_link 'Back to work!'
+    else
+      click_link 'Get started'
+    end
 
     # profile saved and in home page now
-    assert page.has_text?('Active pipelines'), 'No text - Active pipelines'
+    assert_text('Recent pipelines and processes')
   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],
-    ['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
-      # Our test config enabled profile by default. So, no need to update config
-      if !token
-        visit ('/')
-      else
-        visit page_with_token(token)
-      end
-
-      verify_homepage_with_profile user, invited, has_profile
-    end
+    [nil, false, false],
+    ['inactive', true, false],
+    ['inactive_uninvited', false, false],
+    ['active', true, true],
+    ['admin', true, true],
+    ['active_no_prefs', true, false],
+    ['active_no_prefs_profile_no_getting_started_shown', true, false],
+    ['active_no_prefs_profile_with_getting_started_shown', true, false],
+  ].each do |token, invited, has_profile|
+    [true, false].each do |profile_required|
+      test "visit #{token} home page when profile is #{'not ' if !profile_required}configured" do
+        if !profile_required
+          Rails.configuration.user_profile_form_fields = false
+        else
+          # Our test config enabled profile by default. So, no need to update config
+        end
+        Rails.configuration.enable_getting_started_popup = true
 
-    test "visit home page when profile not configured for user #{token}" do
-      Rails.configuration.user_profile_form_fields = false
+        if !token
+          visit ('/')
+        else
+          visit page_with_token(token)
+        end
 
-      if !token
-        visit ('/')
-      else
-        visit page_with_token(token)
+        user = token && api_fixture('users')[token]
+        verify_homepage_with_profile user, invited, has_profile
       end
-
-      verify_homepage_with_profile user, invited, has_profile
     end
-
   end
-
 end