[ARVADOS] updated: 1.1.0-68-g6e68c94

[Git user]

Summary of changes:
 apps/workbench/app/views/application/404.html.erb |  1 -
 apps/workbench/test/integration/trash_test.rb     | 18 +++++++++---------
 services/api/test/fixtures/groups.yml             |  3 +++
 3 files changed, 12 insertions(+), 10 deletions(-)

       via  6e68c94524cfb19fc0b51591eab7e4a55e485164 (commit)
      from  97ea117aeff5bda8b994825a2ddeabf8196053a6 (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 6e68c94524cfb19fc0b51591eab7e4a55e485164
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Oct 20 16:37:10 2017 -0400

    12125: Update trash tests
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/app/views/application/404.html.erb b/apps/workbench/app/views/application/404.html.erb
index 9750b91..c09e634 100644
--- a/apps/workbench/app/views/application/404.html.erb
+++ b/apps/workbench/app/views/application/404.html.erb
@@ -45,7 +45,6 @@ SPDX-License-Identifier: AGPL-3.0 %>
       <% end %>
     </p>
 
-
     <p>
       It will be permanently deleted at <%= render_localized_date(untrash_object.delete_at) %>.
     </p>
diff --git a/apps/workbench/test/integration/trash_test.rb b/apps/workbench/test/integration/trash_test.rb
index d01f636..22732a3 100644
--- a/apps/workbench/test/integration/trash_test.rb
+++ b/apps/workbench/test/integration/trash_test.rb
@@ -46,7 +46,9 @@ class TrashTest < ActionDispatch::IntegrationTest
 
     wait_for_ajax
 
-    assert_no_text expired1['name']
+    assert_text "The collection with UUID #{expired1['uuid']} is in the trash"
+
+    click_on "Click here to untrash '#{expired1['name']}'"
 
     # verify that the two un-trashed items are now shown in /collections page
     visit page_with_token('active', "/collections")
@@ -76,25 +78,23 @@ class TrashTest < ActionDispatch::IntegrationTest
 
       # Un-trash item
       if method == "button"
-        within('tr', text: deleted['name']) do
+        within('tr', text: deleted['uuid']) do
           first('.fa-recycle').click
         end
+        assert_text "The group with UUID #{deleted['uuid']} is in the trash"
+        click_on "Click here to untrash '#{deleted['name']}'"
       else
-        within('tr', text: deleted['name']) do
+        within('tr', text: deleted['uuid']) do
           first('input').click
         end
         click_button 'Selection...'
         within('.selection-action-container') do
           click_link 'Un-trash selected items'
         end
+        wait_for_ajax
+        assert_no_text deleted['uuid']
       end
 
-      wait_for_ajax
-
-      assert_no_text deleted['name']
-      visit current_path
-      assert_no_text deleted['name']
-
       # check that the un-trashed item are now shown on parent project page
       visit page_with_token('active', "/projects/zzzzz-tpzed-xurymjxw79nv3jz")
       click_on "Subprojects"
diff --git a/services/api/test/fixtures/groups.yml b/services/api/test/fixtures/groups.yml
index 2411831..07d46d8 100644
--- a/services/api/test/fixtures/groups.yml
+++ b/services/api/test/fixtures/groups.yml
@@ -307,6 +307,7 @@ trashed_project:
   trash_at: 2001-01-01T00:00:00Z
   delete_at: 2038-03-01T00:00:00Z
   is_trashed: true
+  modified_at: 2001-01-01T00:00:00Z
 
 trashed_subproject:
   uuid: zzzzz-j7d0g-trashedproject2
@@ -314,6 +315,7 @@ trashed_subproject:
   name: trashed subproject
   group_class: project
   is_trashed: false
+  modified_at: 2001-01-01T00:00:00Z
 
 trashed_subproject3:
   uuid: zzzzz-j7d0g-trashedproject3
@@ -323,3 +325,4 @@ trashed_subproject3:
   trash_at: 2001-01-01T00:00:00Z
   delete_at: 2038-03-01T00:00:00Z
   is_trashed: true
+  modified_at: 2001-01-01T00:00:00Z
\ No newline at end of file

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


hooks/post-receive
--