projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14965-arv-mount-py-three
[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 0909157a9b1cb3f0ef7a2a6546b5d7634b8f5ca2..505767814a3c4612e95578886121bdf5d2c7a457 100644
(file)
--- a/
apps/workbench/test/integration/application_layout_test.rb
+++ b/
apps/workbench/test/integration/application_layout_test.rb
@@
-142,7
+142,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],
@@
-153,7
+153,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
@@
-213,7
+218,7
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
end
test "test arvados_public_data_doc_url config unset" do
end
test "test arvados_public_data_doc_url config unset" do
- Rails.configuration.Workbench.ArvadosPublicDataDocURL =
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