Download as
Browse Code »

Commit aeaecfbd06c4e645539a4325fa7bd169ce03fe5e

Authored by Carlos Purificação
Committed by Leandro Santos
1 parent c8eaed18
Exists in send_email_to_admins and in 5 other branches add_member_task_reject_details, fix_sign_up_form, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes

Fixed environment endpoint returned data

Showing 3 changed files with 15 additions and 3 deletions   Show diff stats
lib/noosfero/api/entities.rb
  Diff comments   View file @aeaecfb
@@ -231,6 +231,7 @@ module Noosfero @@ -231,6 +231,7 @@ module Noosfero
231 231
232 class Environment < Entity 232 class Environment < Entity
233 expose :name 233 expose :name
  234 + expose :id
234 end 235 end
235 236
236 class Tag < Entity 237 class Tag < Entity
lib/noosfero/api/v1/environments.rb
  Diff comments   View file @aeaecfb
@@ -11,13 +11,15 @@ module Noosfero @@ -11,13 +11,15 @@ module Noosfero
11 end 11 end
12 12
13 get ':id' do 13 get ':id' do
  14 + resultEnvironment = nil
14 if (params[:id] == "default") 15 if (params[:id] == "default")
15 - present Environment.default 16 + resultEnvironment = Environment.default
16 elsif (params[:id] == "context") 17 elsif (params[:id] == "context")
17 - present environment 18 + resultEnvironment = environment
18 else 19 else
19 - present Environment.find(params[:id]) 20 + resultEnvironment = Environment.find(params[:id])
20 end 21 end
  22 + present resultEnvironment, :with => Entities::Environment
21 end 23 end
22 24
23 end 25 end
test/api/environment_test.rb
  Diff comments   View file @aeaecfb
@@ -14,6 +14,15 @@ class EnvironmentTest &lt; ActiveSupport::TestCase @@ -14,6 +14,15 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
14 assert_equal environment.id, json['id'] 14 assert_equal environment.id, json['id']
15 end 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 should 'return created environment' do 26 should 'return created environment' do
18 environment = fast_create(Environment) 27 environment = fast_create(Environment)
19 default_env = Environment.default 28 default_env = Environment.default