projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15851: Merge branch 'master' into 15851-empty-items-array
[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 7bbae6e350d1febb29149d089f2e247d6243a48c..86195fba750877af031abc92d451570a567ac096 100644
(file)
--- a/
services/api/test/integration/collections_api_test.rb
+++ b/
services/api/test/integration/collections_api_test.rb
@@
-285,8
+285,9
@@
class CollectionsApiTest < ActionDispatch::IntegrationTest
expired_col = collections(:expired_collection)
assert expired_col.is_trashed
# Try #index first
expired_col = collections(:expired_collection)
assert expired_col.is_trashed
# Try #index first
-
ge
t "/arvados/v1/collections",
+
pos
t "/arvados/v1/collections",
params: {
params: {
+ :_method => 'GET',
:include_trash => param,
:filters => [['uuid', '=', expired_col.uuid]].to_json
},
:include_trash => param,
:filters => [['uuid', '=', expired_col.uuid]].to_json
},
@@
-295,9
+296,9
@@
class CollectionsApiTest < ActionDispatch::IntegrationTest
assert_not_nil json_response['items']
assert_equal truthiness, json_response['items'].collect {|c| c['uuid']}.include?(expired_col.uuid)
# Try #show next
assert_not_nil json_response['items']
assert_equal truthiness, json_response['items'].collect {|c| c['uuid']}.include?(expired_col.uuid)
# Try #show next
-
ge
t "/arvados/v1/collections/#{expired_col.uuid}",
+
pos
t "/arvados/v1/collections/#{expired_col.uuid}",
params: {
params: {
- :
format => :json
,
+ :
_method => 'GET'
,
:include_trash => param,
},
headers: auth(:active)
:include_trash => param,
},
headers: auth(:active)
@@
-345,11
+346,12
@@
class CollectionsApiTest < ActionDispatch::IntegrationTest
expired_col = collections(:expired_collection)
assert expired_col.is_trashed
params = [
expired_col = collections(:expired_collection)
assert expired_col.is_trashed
params = [
+ ['_method', 'GET'],
['include_trash', param],
['filters', [['uuid','=',expired_col.uuid]].to_json],
]
# Try #index first
['include_trash', param],
['filters', [['uuid','=',expired_col.uuid]].to_json],
]
# Try #index first
-
ge
t "/arvados/v1/collections",
+
pos
t "/arvados/v1/collections",
params: URI.encode_www_form(params),
headers: {
"Content-type" => "application/x-www-form-urlencoded"
params: URI.encode_www_form(params),
headers: {
"Content-type" => "application/x-www-form-urlencoded"
@@
-358,8
+360,8
@@
class CollectionsApiTest < ActionDispatch::IntegrationTest
assert_not_nil json_response['items']
assert_equal truthiness, json_response['items'].collect {|c| c['uuid']}.include?(expired_col.uuid)
# Try #show next
assert_not_nil json_response['items']
assert_equal truthiness, json_response['items'].collect {|c| c['uuid']}.include?(expired_col.uuid)
# Try #show next
-
ge
t "/arvados/v1/collections/#{expired_col.uuid}",
- params: URI.encode_www_form([['include_trash', param]]),
+
pos
t "/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))
headers: {
"Content-type" => "application/x-www-form-urlencoded"
}.update(auth(:active))