Merge branch '4759-timestamp-precision-TC' closes #4759

[arvados.git] / services / api / test / integration / collections_api_test.rb

diff --git a/services/api/test/integration/collections_api_test.rb b/services/api/test/integration/collections_api_test.rb
index b6cea740243123fb1552728c709d117738e37e75..4251047cea6b74ece4d8e4b1473d554e59daeb7e 100644 (file)
--- a/services/api/test/integration/collections_api_test.rb
+++ b/services/api/test/integration/collections_api_test.rb
@@ -165,6 +165,7 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
     }, auth(:active)
     assert_response :success
     assert_equal true, json_response['manifest_text'].include?('my_test_file.txt')
+    assert_includes json_response['manifest_text'], 'my_test_file.txt'
 
     created = json_response
 
@@ -179,8 +180,8 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
     }, auth(:active)
     assert_response :success
     assert_equal created['uuid'], json_response['uuid']
-    assert_equal true, json_response['manifest_text'].include?('my_updated_test_file.txt')
-    assert_equal false, json_response['manifest_text'].include?('my_test_file.txt')
+    assert_includes json_response['manifest_text'], 'my_updated_test_file.txt'
+    assert_not_includes json_response['manifest_text'], 'my_test_file.txt'
 
     # search using the new filename
     search_using_filter 'my_updated_test_file.txt', 1
@@ -196,10 +197,9 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
     response_items = json_response['items']
     assert_not_nil response_items
     if expected_items == 0
-      assert_equal 0, json_response['items_available']
-      assert_equal 0, response_items.size
+      assert_empty response_items
     else
-      assert_equal expected_items, response_items.size
+      refute_empty response_items
       first_item = response_items.first
       assert_not_nil first_item
     end
@@ -218,14 +218,15 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
     created = json_response
 
     # search using the filename
-    search_using_full_text_search 'subdir2', 1
-    search_using_full_text_search 'subdir2/subdir', 1
+    search_using_full_text_search 'subdir2', 0
+    search_using_full_text_search 'subdir2:*', 1
     search_using_full_text_search 'subdir2/subdir3/subdir4', 1
-    search_using_full_text_search 'file4', 1
-    search_using_full_text_search 'file4_in_subdir', 1
-    search_using_full_text_search 'subdir2 file4', 1      # look for prefixes subdir2 and file4
-    search_using_full_text_search 'subdir2 ile4', 0
+    search_using_full_text_search 'file4:*', 1
+    search_using_full_text_search 'file4_in_subdir4.txt', 1
+    search_using_full_text_search 'subdir2 file4:*', 0      # first word is incomplete
+    search_using_full_text_search 'subdir2/subdir3/subdir4 file4:*', 1
     search_using_full_text_search 'subdir2/subdir3/subdir4 file4_in_subdir4.txt', 1
+    search_using_full_text_search 'ile4', 0                 # not a prefix match
   end
 
   def search_using_full_text_search search_filter, expected_items
@@ -236,12 +237,61 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
     response_items = json_response['items']
     assert_not_nil response_items
     if expected_items == 0
-      assert_equal 0, json_response['items_available']
-      assert_equal 0, response_items.size
+      assert_empty response_items
     else
-      assert_equal expected_items, response_items.size, "Did not find results for #{search_filter}"
+      refute_empty response_items
       first_item = response_items.first
       assert_not_nil first_item
     end
   end
+
+  # search for the filename in the file_names column and expect error
+  test "full text search not supported for individual columns" do
+    get '/arvados/v1/collections', {
+      :filters => [['name', '@@', 'General']].to_json
+    }, auth(:active)
+    assert_response 422
+  end
+
+  [
+    'quick fox',
+    'quick_brown fox',
+    'brown_ fox',
+    'fox dogs',
+  ].each do |search_filter|
+    test "full text search ignores special characters and finds with filter #{search_filter}" do
+      # description: The quick_brown_fox jumps over the lazy_dog
+      # full text search treats '_' as space apparently
+      get '/arvados/v1/collections', {
+        :filters => [['any', '@@', search_filter]].to_json
+      }, auth(:active)
+      assert_response 200
+      response_items = json_response['items']
+      assert_not_nil response_items
+      first_item = response_items.first
+      refute_empty first_item
+      assert_equal first_item['description'], 'The quick_brown_fox jumps over the lazy_dog'
+    end
+  end
+
+  test "create and get collection with properties" do
+    # create collection to be searched for
+    signed_manifest = Collection.sign_manifest(". bad42fa702ae3ea7d888fef11b46f450+44 0:44:my_test_file.txt\n", api_token(:active))
+    post "/arvados/v1/collections", {
+      format: :json,
+      collection: {manifest_text: signed_manifest}.to_json,
+    }, auth(:active)
+    assert_response 200
+    assert_not_nil json_response['uuid']
+    assert_not_nil json_response['properties']
+    assert_empty json_response['properties']
+
+    # update collection's description
+    put "/arvados/v1/collections/#{json_response['uuid']}", {
+      format: :json,
+      collection: { properties: {'property_1' => 'value_1'} }
+    }, auth(:active)
+    assert_response :success
+    assert_equal 'value_1', json_response['properties']['property_1']
+  end
 end