From 6e1166023664cc8275c36d4ceb2733e64174f930 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Fri, 18 Jul 2014 16:27:25 -0300 Subject: [PATCH] rails3: fix display_content plugin --- plugins/display_content/lib/display_content_block.rb | 2 +- plugins/display_content/test/unit/display_content_block_test.rb | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/plugins/display_content/lib/display_content_block.rb b/plugins/display_content/lib/display_content_block.rb index 91fc95b..cae91f0 100644 --- a/plugins/display_content/lib/display_content_block.rb +++ b/plugins/display_content/lib/display_content_block.rb @@ -26,7 +26,7 @@ class DisplayContentBlock < Block settings_items :display_folder_children, :type => :boolean, :default => true settings_items :types, :type => Array, :default => ['TextileArticle', 'TinyMceArticle', 'RawHTMLArticle'] - attr_accessible :sections, :checked_nodes, :display_folder_children + attr_accessible :sections, :checked_nodes, :display_folder_children, :types def self.description _('Display your contents') diff --git a/plugins/display_content/test/unit/display_content_block_test.rb b/plugins/display_content/test/unit/display_content_block_test.rb index da37a9b..0bdf70b 100644 --- a/plugins/display_content/test/unit/display_content_block_test.rb +++ b/plugins/display_content/test/unit/display_content_block_test.rb @@ -350,10 +350,11 @@ class DisplayContentBlockTest < ActiveSupport::TestCase should 'list links for all articles title defined in nodes' do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) - a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id) + a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) + a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id) block = DisplayContentBlock.new + block.sections = [{:value => 'title', :checked => true}] block.nodes = [a1.id, a2.id] box = mock() block.stubs(:box).returns(box) @@ -366,8 +367,8 @@ class DisplayContentBlockTest < ActiveSupport::TestCase should 'list content for all articles lead defined in nodes' do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'abstract article 1') - a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :abstract => 'abstract article 2') + a1 = fast_create(TinyMceArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'abstract article 1') + a2 = fast_create(TinyMceArticle, :name => 'test article 2', :profile_id => profile.id, :abstract => 'abstract article 2') block = DisplayContentBlock.new block.sections = [{:value => 'abstract', :checked => true}] @@ -421,7 +422,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase should 'show title if defined by user' do profile = create_user('testuser').person - a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) + a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) block = DisplayContentBlock.new block.nodes = [a.id] @@ -435,7 +436,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase should 'show abstract if defined by user' do profile = create_user('testuser').person - a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'some abstract') + a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'some abstract') block = DisplayContentBlock.new block.nodes = [a.id] @@ -449,7 +450,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase should 'show body if defined by user' do profile = create_user('testuser').person - a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body') + a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body') block = DisplayContentBlock.new block.nodes = [a.id] @@ -577,7 +578,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase block.types = ['TinyMceArticle'] block.types = ['TinyMceArticle', 'Folder'] - assert_equal [TinyMceArticle, Folder, UploadedFile, Event, TextileArticle, RawHTMLArticle, Blog, Forum, Gallery, RssFeed], block.available_content_types + assert_equivalent [TinyMceArticle, Folder, UploadedFile, Event, TextileArticle, RawHTMLArticle, Blog, Forum, Gallery, RssFeed], block.available_content_types end should 'return available content types' do @@ -585,7 +586,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase block = DisplayContentBlock.create! block.types = ['TinyMceArticle'] block.types = [] - assert_equal [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed], block.available_content_types + assert_equivalent [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed], block.available_content_types end should 'return first 2 content types' do @@ -629,7 +630,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new]) block.types = [] - assert_equal [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], block.available_content_types + assert_equivalent [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], block.available_content_types end should 'do not fail if a selected article was removed' do -- libgit2 0.21.2