X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/32e4350b4ea4c111ae95d9a99712fb86bf0ecb86..b0a3771f2110b691882226c559eab736ab9aa34d:/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 edee064017..3d17fd2796 100644 --- a/apps/workbench/test/integration/user_profile_test.rb +++ b/apps/workbench/test/integration/user_profile_test.rb @@ -1,13 +1,8 @@ require 'integration_helper' -require 'selenium-webdriver' -require 'headless' -class ApplicationLayoutTest < ActionDispatch::IntegrationTest +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 @@ -15,7 +10,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest Rails.configuration.user_profile_form_fields = @user_profile_form_fields end - def verify_homepage_with_profile user, invited, has_profile + def verify_homepage_with_profile user, invited, has_profile, getting_started_shown=false profile_config = Rails.configuration.user_profile_form_fields if !user @@ -23,19 +18,30 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest elsif user['is_active'] if profile_config && !has_profile assert page.has_text?('Save profile'), 'No text - Save profile' - add_profile user + add_profile user, invited, has_profile, getting_started_shown else - assert page.has_text?('My projects'), 'Not found text - My projects' + assert page.has_text?('Active pipelines'), 'Not found text - Active pipelines' assert page.has_no_text?('Save profile'), 'Found 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_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' 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' 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 if !user assert page.has_link?('Log in'), 'Not found link - Log in' @@ -63,15 +69,15 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest end # Check manage profile page and add missing profile to the user - def add_profile user + def add_profile user, invited, has_profile, getting_started_shown 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 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?('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?('Email'), 'No text - Email' + assert page.has_text?('E-mail'), 'No text - E-mail' assert page.has_text?(user['email']), 'No text - user email' # Using the default profile which has message and one required field @@ -79,8 +85,8 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest # 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?('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' # This time fill in required field and then save. Expect to go to requested page after that. @@ -103,11 +109,14 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest 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!' + if 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?('My projects'), 'No text - My projects' - assert page.has_text?('Projects shared with me'), 'No text - Projects shared with me' + assert page.has_text?('Active pipelines'), 'No text - Active pipelines' end [ @@ -117,7 +126,10 @@ 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], + ['active_no_prefs_profile_no_getting_started_shown', + api_fixture('users')['active_no_prefs_profile_no_getting_started_shown'], true, false], + ['active_no_prefs_profile_with_getting_started_shown', + api_fixture('users')['active_no_prefs_profile_with_getting_started_shown'], true, false, true], ].each do |token, user, invited, has_profile| test "visit home page when profile is configured for user #{token}" do