diff --git a/lib/noosfero/api/entities.rb b/lib/noosfero/api/entities.rb index 83f602f..88a8fbe 100644 --- a/lib/noosfero/api/entities.rb +++ b/lib/noosfero/api/entities.rb @@ -226,6 +226,7 @@ module Noosfero class Environment < Entity expose :name + expose :id end class Tag < Entity diff --git a/lib/noosfero/api/v1/environments.rb b/lib/noosfero/api/v1/environments.rb index f99f26a..070f095 100644 --- a/lib/noosfero/api/v1/environments.rb +++ b/lib/noosfero/api/v1/environments.rb @@ -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 diff --git a/test/api/environment_test.rb b/test/api/environment_test.rb index 315e9bf..4856925 100644 --- a/test/api/environment_test.rb +++ b/test/api/environment_test.rb @@ -14,6 +14,15 @@ class EnvironmentTest < 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 -- libgit2 0.21.2