projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not blow up trying to run a job if runtime_constraints is set to nil
[arvados.git]
/
apps
/
workbench
/
test
/
integration
/
users_test.rb
diff --git
a/apps/workbench/test/integration/users_test.rb
b/apps/workbench/test/integration/users_test.rb
index b7bb49abc289118dcf02b21ebf0e3a56cd0e1fd9..dc3957c7b19ece6508334a518002377c3b674d72 100644
(file)
--- a/
apps/workbench/test/integration/users_test.rb
+++ b/
apps/workbench/test/integration/users_test.rb
@@
-25,10
+25,10
@@
class UsersTest < ActionDispatch::IntegrationTest
end
find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz').
end
find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz').
- find('a
[data-original-title=show]
').
+ find('a
', text: 'Show
').
click
assert page.has_text? 'Attributes'
click
assert page.has_text? 'Attributes'
- assert page.has_text? '
Metadata
'
+ assert page.has_text? '
Advanced
'
assert page.has_text? 'Admin'
# go to the Attributes tab
assert page.has_text? 'Admin'
# go to the Attributes tab
@@
-72,15
+72,13
@@
class UsersTest < ActionDispatch::IntegrationTest
# verify that the new user showed up in the users page and find
# the new user's UUID
# verify that the new user showed up in the users page and find
# the new user's UUID
- new_user_uuid =
- find('tr[data-object-uuid]', text: 'foo@example.com').
- find('td', text: '-tpzed-').
- text
+ new_user_uuid =
+ find('tr[data-object-uuid]', text: 'foo@example.com')['data-object-uuid']
assert new_user_uuid, "Expected new user uuid not found"
# go to the new user's page
find('tr', text: new_user_uuid).
assert new_user_uuid, "Expected new user uuid not found"
# go to the new user's page
find('tr', text: new_user_uuid).
- find('a
[data-original-title=show]
').
+ find('a
', text: 'Show
').
click
assert page.has_text? 'modified_by_user_uuid'
click
assert page.has_text? 'modified_by_user_uuid'
@@
-88,9
+86,10
@@
class UsersTest < ActionDispatch::IntegrationTest
assert_equal "false", text, "Expected new user's is_active to be false"
end
assert_equal "false", text, "Expected new user's is_active to be false"
end
+ click_link 'Advanced'
click_link 'Metadata'
click_link 'Metadata'
- assert page.has_text? '
(Repository: test_repo)
'
- assert !(page.has_text? '
(VirtualMachine:)
')
+ assert page.has_text? '
Repository: test_repo
'
+ assert !(page.has_text? '
VirtualMachine:
')
headless.stop
end
headless.stop
end
@@
-107,7
+106,7
@@
class UsersTest < ActionDispatch::IntegrationTest
# click on active user
find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz').
# click on active user
find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz').
- find('a
[data-original-title=show]
').
+ find('a
', text: 'Show
').
click
# Setup user
click
# Setup user
@@
-123,14
+122,14
@@
class UsersTest < ActionDispatch::IntegrationTest
assert has_text? 'Virtual Machine'
fill_in "repo_name", :with => "test_repo"
click_button "Submit"
assert has_text? 'Virtual Machine'
fill_in "repo_name", :with => "test_repo"
click_button "Submit"
- wait_for_ajax
end
assert page.has_text? 'modified_by_client_uuid'
end
assert page.has_text? 'modified_by_client_uuid'
+ click_link 'Advanced'
click_link 'Metadata'
click_link 'Metadata'
- assert page.has_text? '
(Repository: test_repo)
'
- assert !(page.has_text? '
(VirtualMachine:)
')
+ assert page.has_text? '
Repository: test_repo
'
+ assert !(page.has_text? '
VirtualMachine:
')
# Click on Setup button again and this time also choose a VM
click_link 'Admin'
# Click on Setup button again and this time also choose a VM
click_link 'Admin'
@@
-142,14
+141,14
@@
class UsersTest < ActionDispatch::IntegrationTest
fill_in "repo_name", :with => "second_test_repo"
select("testvm.shell", :from => 'vm_uuid')
click_button "Submit"
fill_in "repo_name", :with => "second_test_repo"
select("testvm.shell", :from => 'vm_uuid')
click_button "Submit"
- wait_for_ajax
end
assert page.has_text? 'modified_by_client_uuid'
end
assert page.has_text? 'modified_by_client_uuid'
+ click_link 'Advanced'
click_link 'Metadata'
click_link 'Metadata'
- assert page.has_text? '
(Repository: second_test_repo)
'
- assert page.has_text? '
(VirtualMachine: testvm.shell)
'
+ assert page.has_text? '
Repository: second_test_repo
'
+ assert page.has_text? '
VirtualMachine: testvm.shell
'
headless.stop
end
headless.stop
end
@@
-167,7
+166,7
@@
class UsersTest < ActionDispatch::IntegrationTest
# click on active user
find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz').
# click on active user
find('tr', text: 'zzzzz-tpzed-xurymjxw79nv3jz').
- find('a
[data-original-title=show]
').
+ find('a
', text: 'Show
').
click
# Verify that is_active is set
click
# Verify that is_active is set
@@
-195,9
+194,9
@@
class UsersTest < ActionDispatch::IntegrationTest
click_link 'Advanced'
click_link 'Metadata'
click_link 'Advanced'
click_link 'Metadata'
- assert !(page.has_text? '
(Repository: test_repo)
')
- assert !(page.has_text? '
(Repository: second_test_repo)
')
- assert !(page.has_text? '
(VirtualMachine: testvm.shell)
')
+ assert !(page.has_text? '
Repository: test_repo
')
+ assert !(page.has_text? '
Repository: second_test_repo
')
+ assert !(page.has_text? '
VirtualMachine: testvm.shell
')
# setup user again and verify links present
click_link 'Admin'
# setup user again and verify links present
click_link 'Admin'
@@
-209,15
+208,14
@@
class UsersTest < ActionDispatch::IntegrationTest
fill_in "repo_name", :with => "second_test_repo"
select("testvm.shell", :from => 'vm_uuid')
click_button "Submit"
fill_in "repo_name", :with => "second_test_repo"
select("testvm.shell", :from => 'vm_uuid')
click_button "Submit"
- wait_for_ajax
end
assert page.has_text? 'modified_by_client_uuid'
click_link 'Advanced'
click_link 'Metadata'
end
assert page.has_text? 'modified_by_client_uuid'
click_link 'Advanced'
click_link 'Metadata'
- assert page.has_text? '
(Repository: second_test_repo)
'
- assert page.has_text? '
(VirtualMachine: testvm.shell)
'
+ assert page.has_text? '
Repository: second_test_repo
'
+ assert page.has_text? '
VirtualMachine: testvm.shell
'
headless.stop
end
headless.stop
end