X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/29d73c8ab33b0d9c34074cd09e581cd7584da31e..4218f74266f3fee7c618c887bea6a804005c89b9:/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 a8932d76ce..b49cbf91c7 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -24,9 +24,10 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       else
         assert page.has_link?("Projects"), 'Not found link - Projects'
         page.find("#projects-menu").click
-        assert_selector 'a', text: 'Add a new project'
+        assert_selector 'a', text: 'Search all projects'
         assert_no_selector 'a', text: 'Browse public projects'
-        assert page.has_text?('Projects shared with me'), 'Not found text - Project shared with me'
+        assert_selector 'a', text: 'Add a new project'
+        assert_selector 'li[class="dropdown-header"]', text: 'My projects'
       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 . . .'
@@ -79,7 +80,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
     within('.navbar-fixed-top') do
       page.find("#arv-help").click
       within('.dropdown-menu') do
-        assert_selector 'a', text:'Getting Started ...'
+        assert_no_selector 'a', text:'Getting Started ...'
         assert_selector 'a', text:'Public Pipelines and Data sets'
         assert page.has_link?('Tutorials and User guide'), 'No link - Tutorials and User guide'
         assert page.has_link?('API Reference'), 'No link - API Reference'
@@ -129,65 +130,57 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
         visit page_with_token(token)
       end
 
-      verify_homepage user, invited, has_profile
-    end
-
-    test "check help for user #{token}" do
-      if !token
-        visit ('/')
-      else
-        visit page_with_token(token)
-      end
-
       check_help_menu
-    end
-
-    test "test system menu for user #{token}" do
-      if !token
-        visit ('/')
-      else
-        visit page_with_token(token)
-      end
-
+      verify_homepage user, invited, has_profile
       verify_system_menu user
     end
   end
 
-  test "test getting started help menu item" do
-    visit page_with_token('active')
-    within '.navbar-fixed-top' do
-      find('.help-menu > a').click
-      find('.help-menu .dropdown-menu a', text: 'Getting Started ...').click
-    end
+  [
+    ['active', true],
+    ['active_with_prefs_profile_no_getting_started_shown', false],
+  ].each do |token, getting_started_shown|
+    test "getting started help menu item #{getting_started_shown}" do
+      Rails.configuration.enable_getting_started_popup = true
+
+      visit page_with_token(token)
 
-    within '.modal-content' do
-      assert_text 'Getting Started'
-      assert_selector 'button:not([disabled])', text: 'Next'
-      assert_no_selector 'button:not([disabled])', text: 'Prev'
+      if getting_started_shown
+        within '.navbar-fixed-top' do
+          find('.help-menu > a').click
+          find('.help-menu .dropdown-menu a', text: 'Getting Started ...').click
+        end
+      end
 
-      # Use Next button to enable Prev button
-      click_button 'Next'
-      assert_selector 'button:not([disabled])', text: 'Prev'  # Prev button is now enabled
-      click_button 'Prev'
-      assert_no_selector 'button:not([disabled])', text: 'Prev'  # Prev button is again disabled
+      within '.modal-content' do
+        assert_text 'Getting Started'
+        assert_selector 'button:not([disabled])', text: 'Next'
+        assert_no_selector 'button:not([disabled])', text: 'Prev'
 
-      # Click Next until last page is reached and verify that it is disabled
-      (0..20).each do |i|   # currently we only have 4 pages, and don't expect to have more than 20 in future
+        # Use Next button to enable Prev button
         click_button 'Next'
-        begin
-          find('button:not([disabled])', text: 'Next')
-        rescue => e
-          break
+        assert_selector 'button:not([disabled])', text: 'Prev'  # Prev button is now enabled
+        click_button 'Prev'
+        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
+        (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
+            break
+          end
         end
-      end
-      assert_no_selector 'button:not([disabled])', text: 'Next'  # Next button is disabled
-      assert_selector 'button:not([disabled])', text: 'Prev'     # Prev button is enabled
-      click_button 'Prev'
-      assert_selector 'button:not([disabled])', text: 'Next'     # Next button is now enabled
+        assert_no_selector 'button:not([disabled])', text: 'Next'  # Next button is disabled
+        assert_selector 'button:not([disabled])', text: 'Prev'     # Prev button is enabled
+        click_button 'Prev'
+        assert_selector 'button:not([disabled])', text: 'Next'     # Next button is now enabled
 
-      first('button', text: 'x').click
+        first('button', text: 'x').click
+      end
+      assert_text 'Recent pipelines and processes' # seeing dashboard now
     end
-    assert_text 'Active pipelines' # seeing dashboard now
   end
 
   test "test arvados_public_data_doc_url config unset" do
@@ -198,8 +191,8 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       find('.help-menu > a').click
 
       assert_no_selector 'a', text:'Public Pipelines and Data sets'
+      assert_no_selector 'a', text:'Getting Started ...'
 
-      assert_selector 'a', text:'Getting Started ...'
       assert page.has_link?('Tutorials and User guide'), 'No link - Tutorials and User guide'
       assert page.has_link?('API Reference'), 'No link - API Reference'
       assert page.has_link?('SDK Reference'), 'No link - SDK Reference'
@@ -217,18 +210,16 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
   end
 
    [
-    ['Repositories','repository','Attributes'],
-    ['Virtual machines','virtual machine','current_user_logins'],
-    ['SSH keys','authorized key','public_key'],
-    ['Links','link','link_class'],
-    ['Groups','group','group_class'],
-    ['Compute nodes','node','info[ping_secret'],
-    ['Keep services','keep service','service_ssl_flag'],
-    ['Keep disks', 'keep disk','bytes_free'],
+    ['Repositories', nil, 's0uqq'],
+    ['Virtual machines', nil, 'testvm.shell'],
+    ['SSH keys', nil, 'public_key'],
+    ['Links', nil, 'link_class'],
+    ['Groups', nil, 'All users'],
+    ['Compute nodes', nil, 'ping_secret'],
+    ['Keep services', nil, 'service_ssl_flag'],
+    ['Keep disks', nil, 'bytes_free'],
   ].each do |page_name, add_button_text, look_for|
     test "test system menu #{page_name} link" do
-      skip 'Skip repositories test until #6652 is fixed.' if page_name == 'Repositories'
-
       visit page_with_token('admin')
       within('.navbar-fixed-top') do
         page.find("#system-menu").click
@@ -238,12 +229,62 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
         end
       end
 
-      # click the add button
-      assert_selector 'button', text: "Add a new #{add_button_text}"
-      find('button', text: "Add a new #{add_button_text}").click
+      # click the add button if it exists
+      if add_button_text
+        assert_selector 'button', text: "Add a new #{add_button_text}"
+        find('button', text: "Add a new #{add_button_text}").click
+      else
+        assert_no_selector 'button', text:"Add a new"
+      end
+
+      # look for unique property in the current page
+      assert_text look_for
+    end
+  end
 
-      # look for unique property in the created object page
-      assert page.has_text? look_for
+  [
+    ['active', false],
+    ['admin', true],
+  ].each do |token, is_admin|
+    test "visit dashboard as #{token}" do
+      visit page_with_token(token)
+
+      assert_text 'Recent pipelines and processes' # seeing dashboard now
+      within('.recent-processes-actions') do
+        assert page.has_link?('Run a process')
+        assert page.has_link?('All processes')
+      end
+
+      within('.recent-processes') do
+        assert_text 'running'
+
+        within('.row-zzzzz-xvhdp-cr4runningcntnr') do
+          assert_text 'requester_for_running_cr'
+        end
+
+        assert_text 'zzzzz-d1hrv-twodonepipeline'
+        within('.row-zzzzz-d1hrv-twodonepipeline')do
+          assert_text 'No output'
+        end
+
+        assert_text 'completed container request'
+        within('.row-zzzzz-xvhdp-cr4completedctr')do
+          assert page.has_link? 'foo_file'
+        end
+      end
+
+      within('.compute-node-actions') do
+        if is_admin
+          assert page.has_link?('All nodes')
+        else
+          assert page.has_no_link?('All nodes')
+        end
+      end
+
+      within('.compute-node-summary-pane') do
+        click_link 'Details'
+        assert_text 'compute0'
+      end
     end
   end
 end