From 3063c6106a83102214deb9d86ec621c0bb85d4b7 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 30 Apr 2014 16:09:32 -0400 Subject: [PATCH] Fix tests to work with new css/layout. --- apps/workbench/app/views/folders/show.html.erb | 2 +- .../workbench/app/views/layouts/application.html.erb | 4 +--- apps/workbench/test/integration/smoke_test.rb | 2 +- apps/workbench/test/integration/users_test.rb | 10 +++++----- .../test/integration/virtual_machines_test.rb | 4 ++-- services/api/test/fixtures/specimens.yml | 12 ++++++++++++ 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/apps/workbench/app/views/folders/show.html.erb b/apps/workbench/app/views/folders/show.html.erb index c02c48b921..da848b25f6 100644 --- a/apps/workbench/app/views/folders/show.html.erb +++ b/apps/workbench/app/views/folders/show.html.erb @@ -171,7 +171,7 @@ - <%= raw distance_of_time_in_words(object.modified_at, Time.now).sub('about ','~').sub(' ',' ') + ' ago' %> + <%= raw distance_of_time_in_words(object.modified_at, Time.now).sub('about ','~').sub(' ',' ') + ' ago' rescue object.modified_at %> diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb index a1738b43ac..84579d9eeb 100644 --- a/apps/workbench/app/views/layouts/application.html.erb +++ b/apps/workbench/app/views/layouts/application.html.erb @@ -105,7 +105,7 @@ Repositories
  • - Virtual machines + Virtual machines
    • <% if current_user.andand.is_admin %>
  • @@ -124,8 +124,6 @@ <% end %> - -
      <% if current_user %> <% if content_for?(:breadcrumbs) %> diff --git a/apps/workbench/test/integration/smoke_test.rb b/apps/workbench/test/integration/smoke_test.rb index 700c8e6292..864224b98d 100644 --- a/apps/workbench/test/integration/smoke_test.rb +++ b/apps/workbench/test/integration/smoke_test.rb @@ -23,7 +23,7 @@ class SmokeTest < ActionDispatch::IntegrationTest visit page_with_token('active_trustedclient', '/') assert_visit_success click_link 'user-menu' - urls = [all_links_in('.arvados-nav'), + urls = [all_links_in('nav'), all_links_in('.navbar', /^Manage /)].flatten seen_urls = ['/'] while not (url = urls.shift).nil? diff --git a/apps/workbench/test/integration/users_test.rb b/apps/workbench/test/integration/users_test.rb index df7d2453a7..06d420c569 100644 --- a/apps/workbench/test/integration/users_test.rb +++ b/apps/workbench/test/integration/users_test.rb @@ -31,10 +31,10 @@ class UsersTest < ActionDispatch::IntegrationTest # go to the Attributes tab click_link 'Attributes' assert page.has_text? 'modified_by_user_uuid' - page.within(:xpath, '//a[@data-name="is_active"]') do + page.within(:xpath, '//span[@data-name="is_active"]') do assert_equal "true", text, "Expected user's is_active to be true" end - page.within(:xpath, '//a[@data-name="is_admin"]') do + page.within(:xpath, '//span[@data-name="is_admin"]') do assert_equal "false", text, "Expected user's is_admin to be false" end @@ -82,7 +82,7 @@ class UsersTest < ActionDispatch::IntegrationTest click_link new_user_uuid assert page.has_text? 'modified_by_user_uuid' - page.within(:xpath, '//a[@data-name="is_active"]') do + page.within(:xpath, '//span[@data-name="is_active"]') do assert_equal "false", text, "Expected new user's is_active to be false" end @@ -169,7 +169,7 @@ class UsersTest < ActionDispatch::IntegrationTest # Verify that is_active is set click_link 'Attributes' assert page.has_text? 'modified_by_user_uuid' - page.within(:xpath, '//a[@data-name="is_active"]') do + page.within(:xpath, '//span[@data-name="is_active"]') do assert_equal "true", text, "Expected user's is_active to be true" end @@ -185,7 +185,7 @@ class UsersTest < ActionDispatch::IntegrationTest # Should now be back in the Attributes tab for the user page.driver.browser.switch_to.alert.accept assert page.has_text? 'modified_by_user_uuid' - page.within(:xpath, '//a[@data-name="is_active"]') do + page.within(:xpath, '//span[@data-name="is_active"]') do assert_equal "false", text, "Expected user's is_active to be false after unsetup" end diff --git a/apps/workbench/test/integration/virtual_machines_test.rb b/apps/workbench/test/integration/virtual_machines_test.rb index 541a7aaac2..26da0d0b03 100644 --- a/apps/workbench/test/integration/virtual_machines_test.rb +++ b/apps/workbench/test/integration/virtual_machines_test.rb @@ -7,8 +7,8 @@ class VirtualMachinesTest < ActionDispatch::IntegrationTest click_link 'Virtual machines' assert page.has_text? 'testvm.shell' click_on 'Add a new virtual machine' - assert page.has_text? 'none' - click_link 'none' + find('tr', text: 'hostname'). + find('span', text: 'none').click assert page.has_text? 'Update hostname' fill_in 'editable-text', with: 'testname' click_button 'editable-submit' diff --git a/services/api/test/fixtures/specimens.yml b/services/api/test/fixtures/specimens.yml index 6ad7cfe295..a1fbc3b5b5 100644 --- a/services/api/test/fixtures/specimens.yml +++ b/services/api/test/fixtures/specimens.yml @@ -1,23 +1,35 @@ owned_by_active_user: uuid: zzzzz-2x53u-3zx463qyo0k4xrn owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz + created_at: 2014-04-21 15:37:48 -0400 + modified_at: 2014-04-21 15:37:48 -0400 owned_by_private_group: uuid: zzzzz-2x53u-5m3qwg45g3nlpu6 owner_uuid: zzzzz-j7d0g-rew6elm53kancon + created_at: 2014-04-21 15:37:48 -0400 + modified_at: 2014-04-21 15:37:48 -0400 owned_by_spectator: uuid: zzzzz-2x53u-3b0xxwzlbzxq5yr owner_uuid: zzzzz-tpzed-l1s2piq4t4mps8r + created_at: 2014-04-21 15:37:48 -0400 + modified_at: 2014-04-21 15:37:48 -0400 in_afolder: uuid: zzzzz-2x53u-7r18rnd5nzhg5yk owner_uuid: zzzzz-j7d0g-v955i6s2oi1cbso + created_at: 2014-04-21 15:37:48 -0400 + modified_at: 2014-04-21 15:37:48 -0400 in_asubfolder: uuid: zzzzz-2x53u-c40lddwcqqr1ffs owner_uuid: zzzzz-j7d0g-axqo7eu9pwvna1x + created_at: 2014-04-21 15:37:48 -0400 + modified_at: 2014-04-21 15:37:48 -0400 in_afolder_linked_from_asubfolder: uuid: zzzzz-2x53u-5gid26432uujf79 owner_uuid: zzzzz-j7d0g-v955i6s2oi1cbso + created_at: 2014-04-21 15:37:48 -0400 + modified_at: 2014-04-21 15:37:48 -0400 -- 2.30.2