projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3859-crunch-job-use-lock
[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 7ffb9068895f50b426afdf0631d247da5248ce40..e5b17dd965c534ac536d88af87610d95ad424fcf 100644
(file)
--- a/
services/api/test/functional/arvados/v1/collections_controller_test.rb
+++ b/
services/api/test/functional/arvados/v1/collections_controller_test.rb
@@
-171,24
+171,27
@@
EOS
}
}
assert_response 422
}
}
assert_response 422
+ response_errors = json_response['errors']
+ assert_not_nil response_errors, 'Expected error in response'
+ assert(response_errors.first.include?('duplicate key'),
+ "Expected 'duplicate key' error in #{response_errors.first}")
end
end
- test "create succeeds with
with
duplicate name with ensure_unique_name" do
+ test "create succeeds with duplicate name with ensure_unique_name" do
permit_unsigned_manifests
permit_unsigned_manifests
- authorize_with :a
dmin
+ authorize_with :a
ctive
manifest_text = ". d41d8cd98f00b204e9800998ecf8427e 0:0:foo.txt\n"
post :create, {
collection: {
manifest_text = ". d41d8cd98f00b204e9800998ecf8427e 0:0:foo.txt\n"
post :create, {
collection: {
- owner_uuid:
'zzzzz-tpzed-000000000000000'
,
+ owner_uuid:
users(:active).uuid
,
manifest_text: manifest_text,
portable_data_hash: "d30fe8ae534397864cb96c544f4cf102+47",
manifest_text: manifest_text,
portable_data_hash: "d30fe8ae534397864cb96c544f4cf102+47",
- name: "
foo_fil
e"
+ name: "
owned_by_activ
e"
},
ensure_unique_name: true
}
assert_response :success
},
ensure_unique_name: true
}
assert_response :success
- resp = JSON.parse(@response.body)
- assert_equal 'foo_file (2)', resp['name']
+ assert_equal 'owned_by_active (2)', json_response['name']
end
test "create with owner_uuid set to group i can_manage" do
end
test "create with owner_uuid set to group i can_manage" do