projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15803: Tweak text on user admin page
[arvados.git]
/
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 b3f704cdd98feb3be31326b2cbaf6451c5aa7925..e28809e1318ba42c572d9f1a3eca94387d9a39b2 100644
(file)
--- a/
apps/workbench/test/integration/application_layout_test.rb
+++ b/
apps/workbench/test/integration/application_layout_test.rb
@@
-3,6
+3,7
@@
# SPDX-License-Identifier: AGPL-3.0
require 'integration_helper'
# SPDX-License-Identifier: AGPL-3.0
require 'integration_helper'
+require 'config_validators'
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
# These tests don't do state-changing API calls. Save some time by
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
# These tests don't do state-changing API calls. Save some time by
@@
-15,13
+16,13
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
end
def verify_homepage user, invited, has_profile
end
def verify_homepage user, invited, has_profile
- profile_config = Rails.configuration.
user_profile_form_f
ields
+ profile_config = Rails.configuration.
Workbench.UserProfileFormF
ields
if !user
assert page.has_text?('Please log in'), 'Not found text - Please log in'
assert page.has_text?('The "Log in" button below will show you a Google sign-in page'), 'Not found text - google sign in page'
assert page.has_no_text?('My projects'), 'Found text - My projects'
if !user
assert page.has_text?('Please log in'), 'Not found text - Please log in'
assert page.has_text?('The "Log in" button below will show you a Google sign-in page'), 'Not found text - google sign in page'
assert page.has_no_text?('My projects'), 'Found text - My projects'
- assert page.has_link?("Log in to #{Rails.configuration.
site_n
ame}"), 'Not found text - log in to'
+ assert page.has_link?("Log in to #{Rails.configuration.
Workbench.SiteN
ame}"), 'Not found text - log in to'
elsif user['is_active']
if profile_config && !has_profile
assert page.has_text?('Save profile'), 'No text - Save profile'
elsif user['is_active']
if profile_config && !has_profile
assert page.has_text?('Save profile'), 'No text - Save profile'
@@
-41,12
+42,12
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
within('.navbar-fixed-top') do
if !user
within('.navbar-fixed-top') do
if !user
- assert_text Rails.configuration.
site_n
ame.downcase
- assert_no_selector 'a', text: Rails.configuration.
site_n
ame.downcase
+ assert_text Rails.configuration.
Workbench.SiteN
ame.downcase
+ assert_no_selector 'a', text: Rails.configuration.
Workbench.SiteN
ame.downcase
assert page.has_link?('Log in'), 'Not found link - Log in'
else
# my account menu
assert page.has_link?('Log in'), 'Not found link - Log in'
else
# my account menu
- assert_selector 'a', text: Rails.configuration.
site_n
ame.downcase
+ assert_selector 'a', text: Rails.configuration.
Workbench.SiteN
ame.downcase
assert(page.has_link?("notifications-menu"), 'no user menu')
page.find("#notifications-menu").click
within('.dropdown-menu') do
assert(page.has_link?("notifications-menu"), 'no user menu')
page.find("#notifications-menu").click
within('.dropdown-menu') do
@@
-128,6
+129,7
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
].each do |token, user, invited, has_profile|
test "visit home page for user #{token}" do
].each do |token, user, invited, has_profile|
test "visit home page for user #{token}" do
+ Rails.configuration.Users.AnonymousUserToken = ""
if !token
visit ('/')
else
if !token
visit ('/')
else
@@
-141,7
+143,7
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
end
[
end
[
- [
false
, false],
+ [
""
, false],
['http://wb2.example.org//', false],
['ftp://wb2.example.org', false],
['wb2.example.org', false],
['http://wb2.example.org//', false],
['ftp://wb2.example.org', false],
['wb2.example.org', false],
@@
-151,8
+153,13
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
['https://wb2.example.org/', true],
].each do |wb2_url_config, wb2_menu_appear|
test "workbench2_url=#{wb2_url_config} should#{wb2_menu_appear ? '' : ' not'} show WB2 menu" do
['https://wb2.example.org/', true],
].each do |wb2_url_config, wb2_menu_appear|
test "workbench2_url=#{wb2_url_config} should#{wb2_menu_appear ? '' : ' not'} show WB2 menu" do
- Rails.configuration.workbench2_url = wb2_url_config
- assert_equal wb2_menu_appear, ConfigValidators::validate_wb2_url_config()
+ Rails.configuration.Services.Workbench2.ExternalURL = URI(wb2_url_config)
+ if !wb2_menu_appear and !wb2_url_config.empty?
+ assert_raises RuntimeError do
+ ConfigValidators.validate_wb2_url_config()
+ end
+ Rails.configuration.Services.Workbench2.ExternalURL = URI("")
+ end
visit page_with_token('active')
within('.navbar-fixed-top') do
visit page_with_token('active')
within('.navbar-fixed-top') do
@@
-169,7
+176,7
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
['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
['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_p
opup = true
+ Rails.configuration.
Workbench.EnableGettingStartedP
opup = true
visit page_with_token(token)
visit page_with_token(token)
@@
-207,12
+214,12
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
first('button', text: 'x').click
end
first('button', text: 'x').click
end
- assert_text 'Recent p
ipelines and p
rocesses' # seeing dashboard now
+ assert_text 'Recent processes' # seeing dashboard now
end
end
test "test arvados_public_data_doc_url config unset" do
end
end
test "test arvados_public_data_doc_url config unset" do
- Rails.configuration.
arvados_public_data_doc_url = false
+ Rails.configuration.
Workbench.ArvadosPublicDataDocURL = ""
visit page_with_token('active')
within '.navbar-fixed-top' do
visit page_with_token('active')
within '.navbar-fixed-top' do
@@
-230,7
+237,8
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
end
test "no SSH public key notification when shell_in_a_box_url is configured" do
end
test "no SSH public key notification when shell_in_a_box_url is configured" do
- Rails.configuration.shell_in_a_box_url = 'example.com'
+ Rails.configuration.Services.WebShell.ExternalURL = URI('http://example.com')
+ Rails.configuration.Users.AnonymousUserToken = ""
visit page_with_token('job_reader')
click_link 'notifications-menu'
assert_no_selector 'a', text:'Click here to set up an SSH public key for use with Arvados.'
visit page_with_token('job_reader')
click_link 'notifications-menu'
assert_no_selector 'a', text:'Click here to set up an SSH public key for use with Arvados.'
@@
-277,7
+285,7
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
test "visit dashboard as #{token}" do
visit page_with_token(token)
test "visit dashboard as #{token}" do
visit page_with_token(token)
- assert_text 'Recent p
ipelines and p
rocesses' # seeing dashboard now
+ assert_text 'Recent processes' # seeing dashboard now
within('.recent-processes-actions') do
assert page.has_link?('Run a process')
assert page.has_link?('All processes')
within('.recent-processes-actions') do
assert page.has_link?('Run a process')
assert page.has_link?('All processes')
@@
-299,19
+307,6
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
assert page.has_link? 'foo_file'
end
end
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
end
end
end