Merge branch 'staging' into production

Victor Costa
2 parents a150ee74 5d2a4bc5
Showing 2 changed files with 11 additions and 2 deletions Show diff stats
lib/noosfero/api/helpers.rb
test/unit/api/helpers_test.rb
@@ -57,7 +57,9 @@ require_relative &#39;../../find_by_contents&#39;
               options.merge!(fields.symbolize_keys.slice(:only, :except))
             end
           rescue
-            options[:only] = Array.wrap(params[:fields])
+            fields = params[:fields]
+            fields = fields.split(',') if fields.kind_of?(String)
+            options[:only] = Array.wrap(fields)
           end
         end
         present model, options
@@ -226,11 +226,18 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
   should 'fallback to array when fields parameter is not a json when calling present partial' do
     model = mock
-    params[:fields] = 'name'
+    params[:fields] = ['name']
     expects(:present).with(model, {:only => ['name']})
     present_partial(model, {})
   end
+  should 'fallback to comma separated string when fields parameter is not an array when calling present partial' do
+    model = mock
+    params[:fields] = 'name,description'
+    expects(:present).with(model, {:only => ['name', 'description']})
+    present_partial(model, {})
+  end
+
   should 'accept json as fields parameter when calling present partial' do
     model = mock
     params[:fields] = {only: [:name, {user: [:login]}]}.to_json