Merge branch '5176-escape-filenames'

[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 ed56b62cd9d2efa3c4e05aecb045204ef12bbac8..61b05570850635d9878c42522b728a12f2527476 100644 (file)
--- a/services/api/test/functional/arvados/v1/collections_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/collections_controller_test.rb
@@ -345,14 +345,15 @@ EOS
   end
 
   test "search collections with 'any' operator" do
+    expect_pdh = collections(:docker_image).portable_data_hash
     authorize_with :active
     get :index, {
-      where: { any: ['contains', 'd0bc8c7f34be170a7b7b'] }
+      where: { any: ['contains', expect_pdh[5..25]] }
     }
     assert_response :success
-    found = assigns(:objects).collect(&:portable_data_hash)
+    found = assigns(:objects)
     assert_equal 1, found.count
-    assert_equal true, !!found.index('5bd9c1ad0bc8c7f34be170a7b7b39089+45')
+    assert_equal expect_pdh, found.first.portable_data_hash
   end
 
   [false, true].each do |permit_unsigned|
@@ -677,6 +678,9 @@ EOS
   ].each do |description_size, expected_response|
     test "create collection with description size #{description_size}
           and expect response #{expected_response}" do
+      skip "(Descriptions are not part of search indexes. Skip until full-text search
+            is implemented, at which point replace with a search in description.)"
+
       authorize_with :active
 
       description = 'here is a collection with a very large description'
@@ -692,4 +696,23 @@ EOS
       assert_response expected_response
     end
   end
+
+  [1, 5, nil].each do |ask|
+    test "Set replication_desired=#{ask} using redundancy attr" do
+      # The Python SDK checks the Collection schema in the discovery
+      # doc, then asks for 'redundancy' or 'replication_desired'
+      # accordingly, so it isn't necessary to maintain backward
+      # compatibility here when the attribute changes to
+      # replication_desired.
+      authorize_with :active
+      put :update, {
+        id: collections(:collection_owned_by_active).uuid,
+        collection: {
+          redundancy: ask,
+        },
+      }
+      assert_response :success
+      assert_equal (ask or 2), json_response['replication_desired']
+    end
+  end
 end