[ARVADOS] updated: 94e8dd9891a2c163f9d668f251c38e9a0979ef49

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/integration/folders_test.rb | 53 ++++++++++++++-----------
 1 file changed, 29 insertions(+), 24 deletions(-)

       via  94e8dd9891a2c163f9d668f251c38e9a0979ef49 (commit)
      from  b2e29852fcb0aa34b7aeadfbee9db33abad485d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 94e8dd9891a2c163f9d668f251c38e9a0979ef49
Author: radhika <radhika at curoverse.com>
Date:   Thu Jun 5 23:55:17 2014 -0400

    2872: all tests are updated to reflect the new ui.

diff --git a/apps/workbench/test/integration/folders_test.rb b/apps/workbench/test/integration/folders_test.rb
index fc7cd1d..c403c2e 100644
--- a/apps/workbench/test/integration/folders_test.rb
+++ b/apps/workbench/test/integration/folders_test.rb
@@ -9,19 +9,19 @@ class FoldersTest < ActionDispatch::IntegrationTest
 
   test 'Find a folder and edit its description' do
     visit page_with_token 'active', '/'
-    find('nav a', text: 'Folders').click
     find('.arv-folder-list a,button', text: 'A Folder').
       click
-    within('.panel', text: api_fixture('groups')['afolder']['name']) do
+    within('.container-fluid', text: api_fixture('groups')['afolder']['name']) do
       find('span', text: api_fixture('groups')['afolder']['name']).click
-      find('.glyphicon-ok').click
-      find('.btn', text: 'Edit description').click
-      find('.editable-input textarea').set('I just edited this.')
-      find('.editable-submit').click
+      within('.arv-description-as-subtitle') do
+        find('.fa-pencil').click
+        find('.editable-input textarea').set('I just edited this.')
+        find('.editable-submit').click
+      end
       wait_for_ajax
     end
     visit current_path
-    assert(find?('.panel', text: 'I just edited this.'),
+    assert(find?('.container-fluid', text: 'I just edited this.'),
            "Description update did not survive page refresh")
   end
 
@@ -29,18 +29,21 @@ class FoldersTest < ActionDispatch::IntegrationTest
     folder_uuid = api_fixture('groups')['afolder']['uuid']
     specimen_uuid = api_fixture('specimens')['owned_by_afolder_with_no_name_link']['uuid']
     visit page_with_token 'active', '/folders/' + folder_uuid
-    within(".panel tr[data-object-uuid='#{specimen_uuid}']") do
-      find(".editable[data-name='name']").click
-      find('.editable-input input').set('Now I have a name.')
-      find('.glyphicon-ok').click
-      find('.editable', text: 'Now I have a name.').click
-      find('.editable-input input').set('Now I have a new name.')
-      find('.glyphicon-ok').click
+    within(".selection-action-container") do
+      within (first('tr', text: 'Specimen')) do
+        find(".fa-pencil").click
+        find('.editable-input input').set('Now I have a name.')
+        find('.glyphicon-ok').click
+        find('.editable', text: 'Now I have a name.').click
+        find(".fa-pencil").click
+        find('.editable-input input').set('Now I have a new name.')
+        find('.glyphicon-ok').click
+        end
       wait_for_ajax
       find('.editable', text: 'Now I have a new name.')
     end
     visit current_path
-    within '.panel', text: 'Contents' do
+    within '.selection-action-container' do
       find '.editable', text: 'Now I have a new name.'
       page.assert_no_selector '.editable', text: 'Now I have a name.'
     end
@@ -48,34 +51,36 @@ class FoldersTest < ActionDispatch::IntegrationTest
 
   test 'Create a folder and move it into a different folder' do
     visit page_with_token 'active', '/folders'
-    find('input[value="Add a new folder"]').click
+    find('.btn', text: "Add new folder").click
 
-    within('.panel', text: 'New folder') do
-      find('.panel-title span', text: 'New folder').click
+    # within('.editable', text: 'New folder') do
+    within('h2') do
+      find('.fa-pencil').click
       find('.editable-input input').set('Folder 1234')
       find('.glyphicon-ok').click
     end
     wait_for_ajax
 
     visit '/folders'
-    find('input[value="Add a new folder"]').click
-    within('.panel', text: 'New folder') do
-      find('.panel-title span', text: 'New folder').click
+    find('.btn', text: "Add new folder").click
+    within('h2') do
+      find('.fa-pencil').click
       find('.editable-input input').set('Folder 5678')
       find('.glyphicon-ok').click
     end
     wait_for_ajax
 
+    click_link 'Permissions'
     find('input[value="Move to..."]').click
     find('.selectable', text: 'Folder 1234').click
     find('a,button', text: 'Move').click
     wait_for_ajax
 
-    # Wait for the page to refresh and show the new parent folder in
-    # the Permissions panel:
+    # Wait for the page to refresh and show the new parent in Permissions panel
+    click_link 'Permissions'
     find('.panel', text: 'Folder 1234')
 
-    assert(find('.panel', text: 'Permissions inherited from').
+    assert(find('.panel', text: 'Permissions for this folder are inherited by the owner or parent folder').
            all('*', text: 'Folder 1234').any?,
            "Folder 5678 should now be inside folder 1234")
   end

-----------------------------------------------------------------------


hooks/post-receive
--