Merge branch 'master' into 9352-many-nodes-make-workbench-faster

[arvados.git] / 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 9321396862340643d36c21a29b4d597ad0794ff3..a98fa3542d859be996225e082db21b38c2a6ece2 100644 (file)
--- a/apps/workbench/test/integration/user_profile_test.rb
+++ b/apps/workbench/test/integration/user_profile_test.rb
@@ -20,7 +20,7 @@ class UserProfileTest < ActionDispatch::IntegrationTest
         assert page.has_text?('Save profile'), 'No text - Save profile'
         add_profile user
       else
-        assert page.has_text?('Active pipelines'), 'Not found text - Active pipelines'
+        assert page.has_text?('Recent pipelines and processes'), 'Not found text - Recent pipelines and processes'
         assert page.has_no_text?('Save profile'), 'Found text - Save profile'
       end
     elsif invited
@@ -54,10 +54,10 @@ class UserProfileTest < 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 page.has_link?('My Virtual Machines'), 'No link - My Virtual Machines'
-            assert page.has_link?('My Repositories'), 'No link - My Repositories'
-            assert page.has_link?('My Current Token'), 'No link - My Current Token'
-            assert page.has_link?('My SSH Keys'), 'No link - My SSH Keys'
+            assert page.has_link?('Virtual machines'), 'No link - Virtual machines'
+            assert page.has_link?('Repositories'), 'No link - Repositories'
+            assert page.has_link?('Current token'), 'No link - Current token'
+            assert page.has_link?('SSH keys'), 'No link - SSH Keys'
 
             if profile_config
               assert page.has_link?('Manage profile'), 'No link - Manage profile'
@@ -119,7 +119,7 @@ class UserProfileTest < ActionDispatch::IntegrationTest
     end
 
     # profile saved and in home page now
-    assert page.has_text?('Active pipelines'), 'No text - Active pipelines'
+    assert page.has_text?('Recent pipelines and processes'), 'No text - Recent pipelines and processes'
   end
 
   [
@@ -137,6 +137,8 @@ class UserProfileTest < ActionDispatch::IntegrationTest
 
     test "visit home page when profile is configured for user #{token}" do
       # Our test config enabled profile by default. So, no need to update config
+      Rails.configuration.enable_getting_started_popup = true
+
       if !token
         visit ('/')
       else
@@ -148,6 +150,7 @@ class UserProfileTest < ActionDispatch::IntegrationTest
 
     test "visit home page when profile not configured for user #{token}" do
       Rails.configuration.user_profile_form_fields = false
+      Rails.configuration.enable_getting_started_popup = true
 
       if !token
         visit ('/')