fix merge conflit

Leandro Santos
1 parent 02cbe113
Showing 3 changed files with 4 additions and 15 deletions Show diff stats
lib/noosfero/api/entities.rb
test/api/articles_test.rb
test/api/helpers_test.rb
@@ -205,14 +205,15 @@ module Noosfero
       class User < Entity
         root 'users', 'user'
-        attrs = [:id,:login,:email]
+        attrs = [:id,:login,:email,:activated?]
+        aliases = {:activated? => :activated}
         attrs.each do |attribute|
-          expose attribute, :if => lambda{|user,options| Entities.can_display?(user.person, options, attribute)}
+          name = aliases.has_key?(attribute) ? aliases[attribute] : attribute
+          expose attribute, :as => name, :if => lambda{|user,options| Entities.can_display?(user.person, options, attribute)}
         end
         expose :person, :using => Person
-        expose :activated?, as: :activated
         expose :permissions, :if => lambda{|user,options| Entities.can_display?(user.person, options, :permissions, :self)} do |user, options|
           output = {}
           user.person.role_assignments.map do |role_assigment|
@@ -207,14 +207,6 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     end
   end
-  should 'not update hit attribute of a specific child if a article is archived' do
-    folder = fast_create(Folder, :profile_id => user.person.id, :archived => true)
-    article = fast_create(Article, :parent_id => folder.id, :profile_id => user.person.id)
-    get "/api/v1/articles/#{folder.id}/children/#{article.id}?#{params.to_query}"
-    json = JSON.parse(last_response.body)
-    assert_equal 0, json['article']['hits']
-  end
-
   should 'find archived articles' do
     article1 = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")
     article2 = fast_create(Article, :profile_id => user.person.id, :name => "Some thing", :archived => true)
@@ -140,10 +140,6 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
     assert_not_nil make_conditions_with_parameter('until' => '2010-10-10')[:created_at]
   end
-  should 'make_conditions_with_parameter return archived parameter if archived was defined' do
-    assert_not_nil make_conditions_with_parameter('archived' => true)[:archived]
-  end
-
   should 'make_conditions_with_parameter return created_at as the first existent date as parameter if only until is defined' do
     assert_equal Time.at(0).to_datetime, make_conditions_with_parameter(:until => '2010-10-10')[:created_at].min
   end
	@@ -207,14 +207,6 @@ class ArticlesTest < ActiveSupport::TestCase		@@ -207,14 +207,6 @@ class ArticlesTest < ActiveSupport::TestCase
207	end	207	end
208	end	208	end
209		209
210	- should 'not update hit attribute of a specific child if a article is archived' do
211	- folder = fast_create(Folder, :profile_id => user.person.id, :archived => true)
212	- article = fast_create(Article, :parent_id => folder.id, :profile_id => user.person.id)
213	- get "/api/v1/articles/#{folder.id}/children/#{article.id}?#{params.to_query}"
214	- json = JSON.parse(last_response.body)
215	- assert_equal 0, json['article']['hits']
216	- end
217	-
218	should 'find archived articles' do	210	should 'find archived articles' do
219	article1 = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")	211	article1 = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")
220	article2 = fast_create(Article, :profile_id => user.person.id, :name => "Some thing", :archived => true)	212	article2 = fast_create(Article, :profile_id => user.person.id, :name => "Some thing", :archived => true)