projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17668: Merge branch 'master' into 17668-doc-container-shell-access
[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 4ca146e680dee9b3d9ff1a2d3887ab0ae2670cca..7d34c43deb5103d72ac986f90a49dd24c48a5e73 100644
(file)
--- a/
apps/workbench/test/integration/application_layout_test.rb
+++ b/
apps/workbench/test/integration/application_layout_test.rb
@@
-20,9
+20,9
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
if !user
assert page.has_text?('Please log in'), 'Not found text - Please log in'
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_text?('
If you have never used Arvados Workbench before'), 'Not found text - If you have never
'
assert page.has_no_text?('My projects'), 'Found text - My projects'
assert page.has_no_text?('My projects'), 'Found text - My projects'
- assert page.has_link?("Log in
to #{Rails.configuration.Workbench.SiteName}"), 'Not found text - log in to
'
+ assert page.has_link?("Log in
"), 'Not found text - Log in
'
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'
@@
-129,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
@@
-153,7
+154,12
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
].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.Services.Workbench2.ExternalURL = URI(wb2_url_config)
].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.Services.Workbench2.ExternalURL = URI(wb2_url_config)
- assert_equal wb2_menu_appear, ConfigValidators.validate_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
@@
-208,7
+214,7
@@
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
end
end
@@
-232,6
+238,7
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
test "no SSH public key notification when shell_in_a_box_url is configured" do
Rails.configuration.Services.WebShell.ExternalURL = URI('http://example.com')
test "no SSH public key notification when shell_in_a_box_url is configured" do
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.'
@@
-278,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')
@@
-300,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