X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3c12b6126b87af781058b159332446ee458635af..cd1f6c0fd2f9a91b88659b90a6fd9faee576a557:/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 6ec535b7b6..a5789acae3 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -1,12 +1,13 @@
 require 'integration_helper'
-require 'selenium-webdriver'
-require 'headless'
 
 class ApplicationLayoutTest < ActionDispatch::IntegrationTest
+  # These tests don't do state-changing API calls. Save some time by
+  # skipping the database reset.
+  reset_api_fixtures :after_each_test, false
+  reset_api_fixtures :after_suite, true
+
   setup do
-    headless = Headless.new
-    headless.start
-    Capybara.current_driver = :selenium
+    need_javascript
   end
 
   def verify_homepage user, invited, has_profile
@@ -21,7 +22,8 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       if profile_config && !has_profile
         assert page.has_text?('Save profile'), 'No text - Save profile'
       else
-        assert page.has_text?('My projects'), 'Not found text - My projects'
+        assert page.has_link?("Projects"), 'Not found link - Projects'
+        page.find("#projects-menu").click
         assert page.has_text?('Projects shared with me'), 'Not found text - Project shared with me'
       end
     elsif invited
@@ -32,9 +34,12 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
 
     within('.navbar-fixed-top') do
       if !user
+        assert_text Rails.configuration.site_name.downcase
+        assert_no_selector 'a', text: Rails.configuration.site_name.downcase
         assert page.has_link?('Log in'), 'Not found link - Log in'
       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
         within('.dropdown-menu') do
@@ -42,6 +47,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
             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
@@ -50,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