projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6652: Added assertion and changed assertion to use assert_text instead
[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 f5ce694fdf9f0ff96737e441f91d3ef7e7353501..ba36220717aab92d0cd879a16fbabd7d2e11f5ce 100644
(file)
--- a/
apps/workbench/test/integration/application_layout_test.rb
+++ b/
apps/workbench/test/integration/application_layout_test.rb
@@
-54,7
+54,6
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
assert_selector "a[href=\"/users/#{user['uuid']}/repositories\"]", text: 'Repositories'
assert_selector "a[href=\"/current_token\"]", text: 'Current token'
assert_selector "a[href=\"/users/#{user['uuid']}/ssh_keys\"]", text: 'SSH keys'
assert_selector "a[href=\"/users/#{user['uuid']}/repositories\"]", text: 'Repositories'
assert_selector "a[href=\"/current_token\"]", text: 'Current token'
assert_selector "a[href=\"/users/#{user['uuid']}/ssh_keys\"]", text: 'SSH keys'
- assert_selector "a[href=\"/users/#{user['uuid']}/manage_account\"]", text: 'Manage account'
if profile_config
assert_selector "a[href=\"/users/#{user['uuid']}/profile\"]", text: 'Manage profile'
if profile_config
assert_selector "a[href=\"/users/#{user['uuid']}/profile\"]", text: 'Manage profile'
@@
-67,7
+66,6
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
assert page.has_no_link?('Repositories'), 'Found link - Repositories'
assert page.has_no_link?('Current token'), 'Found link - Current token'
assert page.has_no_link?('SSH keys'), 'Found link - SSH keys'
assert page.has_no_link?('Repositories'), 'Found link - Repositories'
assert page.has_no_link?('Current token'), 'Found link - Current token'
assert page.has_no_link?('SSH keys'), 'Found link - SSH keys'
- assert page.has_no_link?('Manage account'), 'Found link - Manage account'
assert page.has_no_link?('Manage profile'), 'Found link - Manage profile'
end
assert page.has_link?('Log out'), 'No link - Log out'
assert page.has_no_link?('Manage profile'), 'Found link - Manage profile'
end
assert page.has_link?('Log out'), 'No link - Log out'
@@
-219,9
+217,9
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
end
[
end
[
- ['Repositories',
'repository','Attributes
'],
+ ['Repositories',
nil,'s0uqq
'],
['Virtual machines','virtual machine','current_user_logins'],
['Virtual machines','virtual machine','current_user_logins'],
- ['SSH keys',
'authorized key'
,'public_key'],
+ ['SSH keys',
nil
,'public_key'],
['Links','link','link_class'],
['Groups','group','group_class'],
['Compute nodes','node','info[ping_secret'],
['Links','link','link_class'],
['Groups','group','group_class'],
['Compute nodes','node','info[ping_secret'],
@@
-229,8
+227,6
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
['Keep disks', 'keep disk','bytes_free'],
].each do |page_name, add_button_text, look_for|
test "test system menu #{page_name} link" do
['Keep disks', 'keep disk','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
visit page_with_token('admin')
within('.navbar-fixed-top') do
page.find("#system-menu").click
@@
-240,12
+236,16
@@
class ApplicationLayoutTest < ActionDispatch::IntegrationTest
end
end
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 c
reated objec
t page
- assert
page.has_text?
look_for
+ # look for unique property in the c
urren
t page
+ assert
_text
look_for
end
end
end
end
end
end