X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1f5a673014724c3444404658e65e32a6f9c562f3..45d885d56aa967e9699f5245fea30e71f1e2c47e:/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 667fd30f46..b6a501f924 100644 --- a/apps/workbench/test/integration/application_layout_test.rb +++ b/apps/workbench/test/integration/application_layout_test.rb @@ -40,13 +40,14 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest else # my account menu assert_selector 'a', text: Rails.configuration.site_name.downcase - assert page.has_link?("#{user['email']}"), 'Not found link - email' - find('a', text: "#{user['email']}").click + assert(page.has_link?("notifications-menu"), 'no user 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_selector "a[href=\"/projects/#{user['uuid']}\"]", text: 'Home project' assert page.has_link?('Manage account'), 'No link - Manage account' if profile_config @@ -55,6 +56,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest assert page.has_no_link?('Manage profile'), 'Found link - Manage profile' end else + assert_no_selector 'a', text: 'Home project' assert page.has_no_link?('Manage account'), 'Found link - Manage account' assert page.has_no_link?('Manage profile'), 'Found link - Manage profile' end @@ -110,8 +112,6 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest ['active_no_prefs', api_fixture('users')['active_no_prefs'], 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], ].each do |token, user, invited, has_profile| test "visit home page for user #{token}" do @@ -164,13 +164,11 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest assert_no_selector 'button:not([disabled])', text: 'Prev' # Prev button is again disabled # Click Next until last page is reached and verify that it is disabled - foundDisabledNext = false (0..20).each do |i| # currently we only have 4 pages, and don't expect to have more than 20 in future click_button 'Next' begin find('button:not([disabled])', text: 'Next') rescue => e - foundDisabledNext = true if e.message.include?('Unable to find') break end end