[ARVADOS] updated: 5e003c8f9cf47a5bb716dcb75b8e6b98e4680a4c

[git at public.curoverse.com]

Summary of changes:
 .../controllers/collections_controller_test.rb     | 33 ++++++++++++++++++++++
 services/api/app/models/collection.rb              |  2 ++
 services/api/test/fixtures/collections.yml         | 27 ++++++++++++++++++
 .../arvados/v1/collections_controller_test.rb      | 23 +++++++++++++++
 .../api/test/integration/collections_api_test.rb   | 21 ++++++++++++++
 services/api/test/unit/collection_test.rb          |  9 ++++++
 services/fuse/arvados_fuse/__init__.py             | 12 ++++----
 7 files changed, 122 insertions(+), 5 deletions(-)

       via  5e003c8f9cf47a5bb716dcb75b8e6b98e4680a4c (commit)
       via  8b90f80efca772efd2697ffc70d7809c32564171 (commit)
       via  ef4e4a34213975ed9c1dcd9d4a2efb26f51d027a (commit)
       via  7b877a2be249c5e4ab9ab5d73cb68906ca3113d8 (commit)
       via  0cefa4c0f3c1b16884b04d6273bd8730166d69ba (commit)
       via  4c5352de29ca583c41d9babf795983ee4ea3b78e (commit)
       via  7ef27804d92e2c38ff6b22aab4b113b3e1817bf5 (commit)
       via  4106786a571e8d919e474d8ae205c3b2c9042b26 (commit)
       via  cc5699578c16dfb96911b8abcd1b35b8ec0ed7c0 (commit)
      from  f842b72b9e2bb50a68ba388922c55f54ad0399ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 5e003c8f9cf47a5bb716dcb75b8e6b98e4680a4c
Merge: f842b72 8b90f80
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Feb 16 12:46:00 2015 -0500

    Merge branch 'master' into 5096-wb-collection-name-or-desc-update
    
    Conflicts:
    	apps/workbench/test/controllers/collections_controller_test.rb

diff --cc apps/workbench/test/controllers/collections_controller_test.rb
index 8518378,0e2606f..dfbe69f
--- a/apps/workbench/test/controllers/collections_controller_test.rb
+++ b/apps/workbench/test/controllers/collections_controller_test.rb
@@@ -356,18 -356,36 +356,51 @@@ class CollectionsControllerTest < Actio
  
    end
  
+   test "view collection with empty properties" do
+     fixture_name = :collection_with_empty_properties
+     show_collection(fixture_name, :active)
+     assert_equal(api_fixture('collections')[fixture_name.to_s]['name'], assigns(:object).name)
+     assert_not_nil(assigns(:object).properties)
+     assert_empty(assigns(:object).properties)
+   end
+ 
+   test "view collection with one property" do
+     fixture_name = :collection_with_one_property
+     show_collection(fixture_name, :active)
+     fixture = api_fixture('collections')[fixture_name.to_s]
+     assert_equal(fixture['name'], assigns(:object).name)
+     assert_equal(fixture['properties'][0], assigns(:object).properties[0])
+   end
+ 
+   test "create collection with properties" do
+     post :create, {
+       collection: {
+         name: 'collection created with properties',
+         manifest_text: '',
+         properties: {
+           property_1: 'value_1'
+         },
+       },
+       format: :json
+     }, session_for(:active)
+     assert_response :success
+     assert_not_nil assigns(:object).uuid
+     assert_equal 'collection created with properties', assigns(:object).name
+     assert_equal 'value_1', assigns(:object).properties[:property_1]
+   end
++
 +  test "update description and check manifest_text is not lost" do
 +    collection = api_fixture("collections")["multilevel_collection_1"]
 +    post :update, {
 +      id: collection["uuid"],
 +      collection: {
 +        description: 'test description update'
 +      },
 +      format: :json
 +    }, session_for(:active)
 +    assert_response :success
 +    assert_not_nil assigns(:object)
 +    assert_equal 'test description update', assigns(:object).description
 +    assert_equal collection['manifest_text'], assigns(:object).manifest_text
 +  end
  end

-----------------------------------------------------------------------


hooks/post-receive
--