Merge branch 'master' into 3661-copy-move-from-show

[arvados.git] / services / api / test / functional / arvados / v1 / collections_controller_test.rb

diff --git a/services/api/test/functional/arvados/v1/collections_controller_test.rb b/services/api/test/functional/arvados/v1/collections_controller_test.rb
index 81e77cd9f5f68d50921b4137383d63ae0552bee1..f2c15c656b3f2570adf211cd6fdb01222cf3bfb7 100644 (file)
--- a/services/api/test/functional/arvados/v1/collections_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/collections_controller_test.rb
@@ -559,7 +559,7 @@ EOS
     "Collection should not exist in database after failed create"
   end
 
-  test 'Expired collections are not returned' do
+  test 'List expired collection returns empty list' do
     authorize_with :active
     get :index, {
       where: {name: 'expired_collection'},
@@ -567,12 +567,18 @@ EOS
     assert_response :success
     found = assigns(:objects)
     assert_equal 0, found.count
+  end
 
+  test 'Show expired collection returns 404' do
+    authorize_with :active
     get :show, {
       id: 'zzzzz-4zz18-mto52zx1s7sn3ih',
     }
     assert_response 404
+  end
 
+  test 'Update expired collection returns 404' do
+    authorize_with :active
     post :update, {
       id: 'zzzzz-4zz18-mto52zx1s7sn3ih',
       collection: {
@@ -582,25 +588,32 @@ EOS
     assert_response 404
   end
 
-  test 'Collection with future expiration time is returned' do
+  test 'List collection with future expiration time succeeds' do
     authorize_with :active
     get :index, {
       where: {name: 'collection_expires_in_future'},
     }
     found = assigns(:objects)
     assert_equal 1, found.count
+  end
+
 
+  test 'Show collection with future expiration time succeeds' do
+    authorize_with :active
     get :show, {
       id: 'zzzzz-4zz18-padkqo7yb8d9i3j',
     }
-    assert_success
+    assert_response :success
+  end
 
+  test 'Update collection with future expiration time succeeds' do
+    authorize_with :active
     post :update, {
       id: 'zzzzz-4zz18-padkqo7yb8d9i3j',
       collection: {
         name: "still not expired"
       }
     }
-    assert_success
+    assert_response :success
   end
 end