Merge branch 'staging' into captcha_serpro_plugin

* staging: remove tests used for old captcha system limit 200 characters for proposals Update dialoga plugin api: filter archived articles Conflicts: test/unit/api/helpers_test.rb

Merge branch 'staging' into captcha_serpro_plugin
* staging: remove tests used for old captcha system limit 200 characters for proposals Update dialoga plugin api: filter archived articles Conflicts: test/unit/api/helpers_test.rb
Evandro Junior
2 parents 93529247 d9dfa9d5
Showing 4 changed files with 25 additions and 11 deletions Show diff stats
lib/noosfero/api/helpers.rb
plugins/dialoga
test/unit/api/articles_test.rb
test/unit/api/helpers_test.rb
@@ -5,7 +5,7 @@ require &#39;grape&#39;
     module API
       module APIHelpers
       PRIVATE_TOKEN_PARAM = :private_token
-      DEFAULT_ALLOWED_PARAMETERS = [:parent_id, :from, :until, :content_type, :author_id]
+      DEFAULT_ALLOWED_PARAMETERS = [:parent_id, :from, :until, :content_type, :author_id, :archived]
       include SanitizeParams
       include Noosfero::Plugin::HotSpot
-Subproject commit d654ce48f466687dd01ae023b68122b0aaba7d3f
+Subproject commit a068a1a80b97e5c47a48b1385d3917cbf855874d
@@ -656,6 +656,16 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     assert_equal json['articles'].count, 2
   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)
+    params[:archived] = true
+    get "/api/v1/articles/?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_not_includes json["articles"].map { |a| a["id"] }, article1.id
+    assert_includes json["articles"].map { |a| a["id"] }, article2.id
+  end
+
   ARTICLE_ATTRIBUTES = %w(followers_count votes_count comments_count)
   ARTICLE_ATTRIBUTES.map do |attribute|
@@ -139,6 +139,10 @@ 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
@@ -217,15 +221,15 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
 ###### Captcha tests ######
-# def plugins
-#   environment = Environment.default
-#   Noosfero::Plugin::Manager.new(environment, self)
-# end
-#
-# should 'do not test captcha when there is no captcha plugin enabled' do
-#   environment = Environment.new
-#   assert test_captcha("127.0.0.1", {}, environment)
-# end
+ def plugins
+   environment = Environment.default
+   Noosfero::Plugin::Manager.new(environment, self)
+ end
+
+ should 'do not test captcha when there is no captcha plugin enabled' do
+   environment = Environment.new
+   assert test_captcha("127.0.0.1", {}, environment)
+ end
 ###### END Captcha tests ######
	@@ -5,7 +5,7 @@ require 'grape'		@@ -5,7 +5,7 @@ require 'grape'
5	module API	5	module API
6	module APIHelpers	6	module APIHelpers
7	PRIVATE_TOKEN_PARAM = :private_token	7	PRIVATE_TOKEN_PARAM = :private_token
8	- DEFAULT_ALLOWED_PARAMETERS = [:parent_id, :from, :until, :content_type, :author_id]	8	+ DEFAULT_ALLOWED_PARAMETERS = [:parent_id, :from, :until, :content_type, :author_id, :archived]
9		9
10	include SanitizeParams	10	include SanitizeParams
11	include Noosfero::Plugin::HotSpot	11	include Noosfero::Plugin::HotSpot
	@@ -656,6 +656,16 @@ class ArticlesTest < ActiveSupport::TestCase		@@ -656,6 +656,16 @@ class ArticlesTest < ActiveSupport::TestCase
656	assert_equal json['articles'].count, 2	656	assert_equal json['articles'].count, 2
657	end	657	end
658		658
		659	+ should 'find archived articles' do
		660	+ article1 = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")
		661	+ article2 = fast_create(Article, :profile_id => user.person.id, :name => "Some thing", :archived => true)
		662	+ params[:archived] = true
		663	+ get "/api/v1/articles/?#{params.to_query}"
		664	+ json = JSON.parse(last_response.body)
		665	+ assert_not_includes json["articles"].map { \|a\| a["id"] }, article1.id
		666	+ assert_includes json["articles"].map { \|a\| a["id"] }, article2.id
		667	+ end
		668	+
659	ARTICLE_ATTRIBUTES = %w(followers_count votes_count comments_count)	669	ARTICLE_ATTRIBUTES = %w(followers_count votes_count comments_count)
660		670
661	ARTICLE_ATTRIBUTES.map do \|attribute\|	671	ARTICLE_ATTRIBUTES.map do \|attribute\|