X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4dbe0b01c464d4f6c29e215afb394fd7e842a1cc..55be42bcb7ede4e83fddefe3894828151e504c3e:/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 e3441c4b3d..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
@@ -94,52 +101,6 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
     end
   end
 
-  # test manage_account page
-  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
-
-      # now in manage account page
-      assert page.has_text?('Virtual Machines'), 'No text - Virtual Machines'
-      assert page.has_text?('Repositories'), 'No text - Repositories'
-      assert page.has_text?('SSH Keys'), 'No text - SSH Keys'
-      assert page.has_text?('Current Token'), 'No text - Current Token'
-
-      assert page.has_text?('The Arvados API token is a secret key that enables the Arvados SDKs to access Arvados'), 'No text - Arvados API token'
-
-      click_link 'Add new SSH key'
-
-      within '.modal-content' do
-        assert page.has_text?('Public Key'), 'No text - Public Key'
-        assert page.has_button?('Cancel'), 'No button - Cancel'
-        assert page.has_button?('Submit'), 'No 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'), 'No text - Public key does not appear to be a valid'
-
-        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.'), 'No text - Public key already exists'
-
-        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
-
-      # key must be added. look for it in the refreshed page
-      assert page.has_text?('added_in_test'), 'No text - added_in_test'
-    end
-  end
-
   [
     [nil, nil, false, false],
     ['inactive', api_fixture('users')['inactive'], true, false],
@@ -169,21 +130,15 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
 
       check_help_menu
     end
-  end
-
-  [
-    ['active', api_fixture('users')['active']],
-    ['admin', api_fixture('users')['admin']],
-  ].each do |token, user|
 
     test "test system menu for user #{token}" do
-      visit page_with_token(token)
-      verify_system_menu user
-    end
+      if !token
+        visit ('/')
+      else
+        visit page_with_token(token)
+      end
 
-    test "test manage account for user #{token}" do
-      visit page_with_token(token)
-      verify_manage_account user
+      verify_system_menu user
     end
   end
 end