Merge remote-tracking branch 'origin/master' into 15106-trgm-text-search

[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 ed2d2fd7ff1357c1d6a336c42bc600a90d5f8263..86195fba750877af031abc92d451570a567ac096 100644 (file)
--- a/services/api/test/integration/collections_api_test.rb
+++ b/services/api/test/integration/collections_api_test.rb
@@ -276,7 +276,41 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
   end
 
   [
-    ["", false],
+    ["false", false],
+    ["0", false],
+    ["true", true],
+    ["1", true]
+  ].each do |param, truthiness|
+    test "include_trash=#{param.inspect} param JSON-encoded should be interpreted as include_trash=#{truthiness}" do
+      expired_col = collections(:expired_collection)
+      assert expired_col.is_trashed
+      # Try #index first
+      post "/arvados/v1/collections",
+          params: {
+            :_method => 'GET',
+            :include_trash => param,
+            :filters => [['uuid', '=', expired_col.uuid]].to_json
+          },
+          headers: auth(:active)
+      assert_response :success
+      assert_not_nil json_response['items']
+      assert_equal truthiness, json_response['items'].collect {|c| c['uuid']}.include?(expired_col.uuid)
+      # Try #show next
+      post "/arvados/v1/collections/#{expired_col.uuid}",
+        params: {
+          :_method => 'GET',
+          :include_trash => param,
+        },
+        headers: auth(:active)
+      if truthiness
+        assert_response :success
+      else
+        assert_response 404
+      end
+    end
+  end
+
+  [
     ["false", false],
     ["0", false],
     ["true", true],
@@ -285,17 +319,24 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
     test "include_trash=#{param.inspect} param encoding via query string should be interpreted as include_trash=#{truthiness}" do
       expired_col = collections(:expired_collection)
       assert expired_col.is_trashed
-      get("/arvados/v1/collections?include_trash=#{param}",
+      # Try #index first
+      get("/arvados/v1/collections?include_trash=#{param}&filters=#{[['uuid','=',expired_col.uuid]].to_json}",
           headers: auth(:active))
       assert_response :success
       assert_not_nil json_response['items']
-      refute_empty json_response['items']
       assert_equal truthiness, json_response['items'].collect {|c| c['uuid']}.include?(expired_col.uuid)
+      # Try #show next
+      get("/arvados/v1/collections/#{expired_col.uuid}?include_trash=#{param}",
+        headers: auth(:active))
+      if truthiness
+        assert_response :success
+      else
+        assert_response 404
+      end
     end
   end
 
   [
-    ["", false],
     ["false", false],
     ["0", false],
     ["true", true],
@@ -305,18 +346,30 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
       expired_col = collections(:expired_collection)
       assert expired_col.is_trashed
       params = [
+        ['_method', 'GET'],
         ['include_trash', param],
         ['filters', [['uuid','=',expired_col.uuid]].to_json],
       ]
-      get "/arvados/v1/collections",
+      # Try #index first
+      post "/arvados/v1/collections",
         params: URI.encode_www_form(params),
         headers: {
           "Content-type" => "application/x-www-form-urlencoded"
         }.update(auth(:active))
       assert_response :success
       assert_not_nil json_response['items']
-      refute_empty json_response['items']
       assert_equal truthiness, json_response['items'].collect {|c| c['uuid']}.include?(expired_col.uuid)
+      # Try #show next
+      post "/arvados/v1/collections/#{expired_col.uuid}",
+        params: URI.encode_www_form([['_method', 'GET'],['include_trash', param]]),
+        headers: {
+          "Content-type" => "application/x-www-form-urlencoded"
+        }.update(auth(:active))
+      if truthiness
+        assert_response :success
+      else
+        assert_response 404
+      end
     end
   end