Fixed environment endpoint returned data

Carlos Purificação
1 parent fcf8fd0f
Showing 3 changed files with 15 additions and 3 deletions Show diff stats
lib/noosfero/api/entities.rb
lib/noosfero/api/v1/environments.rb
test/api/environment_test.rb
@@ -226,6 +226,7 @@ module Noosfero
  
       class Environment < Entity
         expose :name
+        expose :id
       end
  
       class Tag < Entity
@@ -11,13 +11,15 @@ module Noosfero
           end
  
           get ':id' do
+            resultEnvironment = nil
             if (params[:id] == "default")
-              present Environment.default
+              resultEnvironment = Environment.default
             elsif (params[:id] == "context")
-              present environment
+              resultEnvironment = environment
             else
-              present Environment.find(params[:id])
+              resultEnvironment = Environment.find(params[:id])
             end
+            present resultEnvironment, :with => Entities::Environment
           end
  
         end
@@ -14,6 +14,15 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     assert_equal environment.id, json['id']
   end
  
+  should 'not return the default environment settings' do
+    environment = Environment.default
+    get "/api/v1/environment/default"
+    json = JSON.parse(last_response.body)
+    assert_equal environment.id, json['id']
+    puts "json: #{json}"
+    assert_nil json['settings']
+  end
+
   should 'return created environment' do
     environment = fast_create(Environment)
     default_env = Environment.default
...	...	@@ -226,6 +226,7 @@ module Noosfero
226	226
227	227	class Environment < Entity
228	228	expose :name
	229	+ expose :id
229	230	end
230	231
231	232	class Tag < Entity
...	...
...	...	@@ -11,13 +11,15 @@ module Noosfero
11	11	end
12	12
13	13	get ':id' do
	14	+ resultEnvironment = nil
14	15	if (params[:id] == "default")
15		- present Environment.default
	16	+ resultEnvironment = Environment.default
16	17	elsif (params[:id] == "context")
17		- present environment
	18	+ resultEnvironment = environment
18	19	else
19		- present Environment.find(params[:id])
	20	+ resultEnvironment = Environment.find(params[:id])
20	21	end
	22	+ present resultEnvironment, :with => Entities::Environment
21	23	end
22	24
23	25	end
...	...
...	...	@@ -14,6 +14,15 @@ class EnvironmentTest < ActiveSupport::TestCase
14	14	assert_equal environment.id, json['id']
15	15	end
16	16
	17	+ should 'not return the default environment settings' do
	18	+ environment = Environment.default
	19	+ get "/api/v1/environment/default"
	20	+ json = JSON.parse(last_response.body)
	21	+ assert_equal environment.id, json['id']
	22	+ puts "json: #{json}"
	23	+ assert_nil json['settings']
	24	+ end
	25	+
17	26	should 'return created environment' do
18	27	environment = fast_create(Environment)
19	28	default_env = Environment.default
...	...