Merge branch 'staging' of gitlab.com:participa/noosfero into staging

Leandro Santos
2 parents d66aa24c e0bc04d3
Showing 6 changed files with 4 additions and 45 deletions Show diff stats
.gitmodules
plugins/serpro_captcha
plugins/serpro_captcha/lib/serpro_captcha_plugin.rb
plugins/serpro_captcha/lib/serpro_captcha_plugin/api.rb
plugins/serpro_captcha/test/test_helper.rb
plugins/serpro_captcha/test/unit/api_test.rb
@@ -34,3 +34,6 @@
 [submodule "rest-clients/proposal-app"]
 	path = rest-clients/proposal-app
 	url = https://gitlab.com/participa/proposal-app.git
+[submodule "plugins/serpro_captcha"]
+	path = plugins/serpro_captcha
+	url = git@gitlab.com:noosfero-plugins/serpro_captcha.git
@@ -0,0 +1 @@
+Subproject commit 34ffd86432be3d660a20cdfaacc860e83a5b6116
@@ -1,15 +0,0 @@
-class SerproCaptchaPlugin < Noosfero::Plugin
-
-  def self.plugin_name
-    _('Serpro captcha plugin')
-  end
-
-  def self.plugin_description
-    _("Provide a plugin to Serpro's captcha infrastructure.")
-  end
-
-  def self.api_mount_points
-    [SerproCaptchaPlugin::API ]
-  end
-
-end
@@ -1,16 +0,0 @@
-class SerproCaptchaPlugin::API < Grape::API
-
-  # resource :dialoga_plugin do
-      # get 'random_topics/:discussion_id' do
-      #     discussion = ProposalsDiscussionPlugin::Discussion.find(params[:discussion_id])
-      #
-      #     # render articles using Entity Article
-      #     present discussion.random_topics_one_by_category, :with => Noosfero::API::Entities::Article, :fields => params[:fields]
-      # end
-
-      get 'test_captcha' do
-        present 'chegou no test_captcha do SerproCaptchaPlugin'
-      end
-  # end
-
-end
@@ -1 +0,0 @@
-require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -1,13 +0,0 @@
-require_relative '../test_helper'
-require_relative '../../../../test/unit/api/test_helper'
-
-class APITest <  ActiveSupport::TestCase
-
-  def setup
-#    login_api
-  end
-
-  should 'return something' do
-  end
-
-end
...	...	@@ -34,3 +34,6 @@
34	34	[submodule "rest-clients/proposal-app"]
35	35	path = rest-clients/proposal-app
36	36	url = https://gitlab.com/participa/proposal-app.git
	37	+[submodule "plugins/serpro_captcha"]
	38	+ path = plugins/serpro_captcha
	39	+ url = git@gitlab.com:noosfero-plugins/serpro_captcha.git
...	...
...	...	@@ -0,0 +1 @@
	1	+Subproject commit 34ffd86432be3d660a20cdfaacc860e83a5b6116
...	...
...	...	@@ -1,15 +0,0 @@
1		-class SerproCaptchaPlugin < Noosfero::Plugin
2		-
3		- def self.plugin_name
4		- _('Serpro captcha plugin')
5		- end
6		-
7		- def self.plugin_description
8		- _("Provide a plugin to Serpro's captcha infrastructure.")
9		- end
10		-
11		- def self.api_mount_points
12		- [SerproCaptchaPlugin::API ]
13		- end
14		-
15		-end
...	...	@@ -1,16 +0,0 @@
1		-class SerproCaptchaPlugin::API < Grape::API
2		-
3		- # resource :dialoga_plugin do
4		- # get 'random_topics/:discussion_id' do
5		- # discussion = ProposalsDiscussionPlugin::Discussion.find(params[:discussion_id])
6		- #
7		- # # render articles using Entity Article
8		- # present discussion.random_topics_one_by_category, :with => Noosfero::API::Entities::Article, :fields => params[:fields]
9		- # end
10		-
11		- get 'test_captcha' do
12		- present 'chegou no test_captcha do SerproCaptchaPlugin'
13		- end
14		- # end
15		-
16		-end
...	...	@@ -1 +0,0 @@
1		-require File.dirname(__FILE__) + '/../../../test/test_helper'
...	...	@@ -1,13 +0,0 @@
1		-require_relative '../test_helper'
2		-require_relative '../../../../test/unit/api/test_helper'
3		-
4		-class APITest < ActiveSupport::TestCase
5		-
6		- def setup
7		-# login_api
8		- end
9		-
10		- should 'return something' do
11		- end
12		-
13		-end