[Git][noosfero/noosfero][stable-2.0] Merge branch 'custom-forms-plugin-extra-blocks' into 'master'
Rodrigo Souto
gitlab at mg.gitlab.com
Thu Apr 19 15:34:18 BRT 2018
Rodrigo Souto pushed to branch stable-2.0 at Noosfero / noosfero
Commits:
3744164b by Rodrigo Souto at 2018-04-19T18:33:54Z
Merge branch 'custom-forms-plugin-extra-blocks' into 'master'
Custom_forms blocks should not be available for Environment
See merge request noosfero/noosfero!1436
(cherry picked from commit 268400f2a8dd9fa760364006051e0428de034c94)
84878116 Custom_forms blocks should not be available Environment
- - - - -
2 changed files:
- plugins/custom_forms/lib/custom_forms_plugin.rb
- + plugins/custom_forms/test/unit/custom_forms_plugin_test.rb
Changes:
=====================================
plugins/custom_forms/lib/custom_forms_plugin.rb
=====================================
--- a/plugins/custom_forms/lib/custom_forms_plugin.rb
+++ b/plugins/custom_forms/lib/custom_forms_plugin.rb
@@ -18,8 +18,8 @@ class CustomFormsPlugin < Noosfero::Plugin
def self.extra_blocks
{
- CustomFormsPlugin::SurveyBlock => { },
- CustomFormsPlugin::PollsBlock => { }
+ CustomFormsPlugin::SurveyBlock => {:type => [Person, Community, Enterprise]},
+ CustomFormsPlugin::PollsBlock => {:type => [Person, Community, Enterprise]},
}
end
=====================================
plugins/custom_forms/test/unit/custom_forms_plugin_test.rb
=====================================
--- /dev/null
+++ b/plugins/custom_forms/test/unit/custom_forms_plugin_test.rb
@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class CustomFormsPluginTest < ActiveSupport::TestCase
+
+ def setup
+ Environment.default.enable_plugin('CustomFormsPlugin')
+ @community = fast_create Community
+ @person = fast_create Person
+ @enterprise = fast_create Enterprise
+ end
+ attr_reader :community, :person, :enterprise
+
+ should 'extra blocks not available for environment' do
+ assert_not_includes Environment.default.available_blocks(person), CustomFormsPlugin::PollsBlock
+ assert_not_includes Environment.default.available_blocks(person), CustomFormsPlugin::SurveyBlock
+ end
+
+ should 'plugin extra block available for communities, person and enterprise' do
+ CustomFormsPlugin.extra_blocks.each do |block|
+ assert_equal block[1][:type][0].to_s, "Person"
+ assert_equal block[1][:type][1].to_s, "Community"
+ assert_equal block[1][:type][2].to_s, "Enterprise"
+ end
+ end
+
+ should 'extra blocks available for communities, person and enterprise' do
+ assert_includes community.available_blocks(person), CustomFormsPlugin::PollsBlock
+ assert_includes community.available_blocks(person), CustomFormsPlugin::SurveyBlock
+
+ assert_includes person.available_blocks(person), CustomFormsPlugin::PollsBlock
+ assert_includes person.available_blocks(person), CustomFormsPlugin::SurveyBlock
+
+ assert_includes enterprise.available_blocks(person), CustomFormsPlugin::PollsBlock
+ assert_includes enterprise.available_blocks(person), CustomFormsPlugin::SurveyBlock
+ end
+
+end
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/3744164b6b51abd988296ad74bd4f26c5b06ec42
---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/3744164b6b51abd988296ad74bd4f26c5b06ec42
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180419/5e34e2c8/attachment-0001.html>
More information about the Noosfero-dev
mailing list