<%= required f.text_field('name', :size => '64', :maxlength => 150) %>
<%= labelled_form_field(_('Period'), (
@@ -19,4 +17,4 @@
<%= labelled_form_field check_box(:article, :hidden) + _('Hidden Step'), '' %>
-<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Description:'} %>
+<%= render :partial => 'shared/lead_and_body', :locals => {:body_label => 'Description:'} %>
diff --git a/plugins/community_track/views/cms/community_track_plugin/_track.html.erb b/plugins/community_track/views/cms/community_track_plugin/_track.html.erb
index 5d120e9..52f5a27 100644
--- a/plugins/community_track/views/cms/community_track_plugin/_track.html.erb
+++ b/plugins/community_track/views/cms/community_track_plugin/_track.html.erb
@@ -1,13 +1,11 @@
<%= required_fields_message %>
- <%= render :file => 'shared/tiny_mce' %>
-
<%= required labelled_form_field(c_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
- <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Description:'} %>
+ <%= render :partial => 'shared/lead_and_body', :locals => {:body_label => 'Description:'} %>
<%= labelled_form_field(_('Goals:'), text_area(:article, :goals, :rows => 3, :cols => 64)) %>
diff --git a/plugins/context_content/lib/context_content_plugin/context_content_block.rb b/plugins/context_content/lib/context_content_plugin/context_content_block.rb
index 47298e7..850b829 100644
--- a/plugins/context_content/lib/context_content_plugin/context_content_block.rb
+++ b/plugins/context_content/lib/context_content_plugin/context_content_block.rb
@@ -22,7 +22,7 @@ class ContextContentPlugin::ContextContentBlock < Block
end
def available_content_types
- @available_content_types ||= [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed] + plugins.dispatch(:content_types)
+ @available_content_types ||= [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed] + plugins.dispatch(:content_types)
checked_types = types.map {|t| t.constantize}
checked_types + (@available_content_types - checked_types)
end
diff --git a/plugins/context_content/test/functional/content_viewer_controller_test.rb b/plugins/context_content/test/functional/content_viewer_controller_test.rb
index cf86475..450af2b 100644
--- a/plugins/context_content/test/functional/content_viewer_controller_test.rb
+++ b/plugins/context_content/test/functional/content_viewer_controller_test.rb
@@ -8,7 +8,7 @@ class ContentViewerControllerTest < ActionController::TestCase
box = Box.create!(:owner => @profile)
@block = ContextContentPlugin::ContextContentBlock.new(:box_id => box.id)
- @block.types = ['TinyMceArticle']
+ @block.types = ['TextArticle']
@block.limit = 1
@block.title = "New Context Block"
@block.save!
@@ -21,7 +21,7 @@ class ContentViewerControllerTest < ActionController::TestCase
end
should 'display context content block if it has contents' do
- article = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+ article = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
get :view_page, @page.url
assert_tag 'div', :attributes => {:id => "context_content_#{@block.id}", :class => 'contents'}
assert_no_tag 'div', :attributes => {:id => "context_content_more_#{@block.id}", :class => 'more_button'}, :descendant => {:tag => 'a'}
@@ -31,7 +31,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'display context content block title if it is not configured to use_parent_title' do
@block.use_parent_title = false
@block.save
- article = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+ article = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
get :view_page, @page.url
assert_tag 'h3', :attributes => {:class => 'block-title'}, :content => @block.title
assert_no_tag 'h3', :attributes => {:class => 'block-title'}, :content => @page.name
@@ -40,15 +40,15 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'display context content with folder title if it is configured to use_parent_title' do
@block.use_parent_title = true
@block.save
- article = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+ article = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
get :view_page, @page.url
assert_tag 'h3', :attributes => {:class => 'block-title'}, :content => @page.name
assert_no_tag 'h3', :attributes => {:class => 'block-title'}, :content => @block.title
end
should 'display context content block with pagination' do
- article1 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id)
- article2 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id)
+ article1 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id)
+ article2 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id)
get :view_page, @page.url
assert_tag 'div', :attributes => {:id => "context_content_#{@block.id}", :class => 'contents'}
assert_tag 'div', :attributes => {:id => "context_content_more_#{@block.id}", :class => 'more_button'}, :descendant => {:tag => 'a', :attributes => {:class => 'button icon-button icon-left disabled'} }
diff --git a/plugins/context_content/test/functional/context_content_plugin_profile_controller_test.rb b/plugins/context_content/test/functional/context_content_plugin_profile_controller_test.rb
index 05e9e13..5cbc567 100644
--- a/plugins/context_content/test/functional/context_content_plugin_profile_controller_test.rb
+++ b/plugins/context_content/test/functional/context_content_plugin_profile_controller_test.rb
@@ -9,7 +9,7 @@ class ContextContentPluginProfileControllerTest < ActionController::TestCase
box = create(Box, :owner_type => 'Profile', :owner_id => @profile.id)
@block = ContextContentPlugin::ContextContentBlock.new
@block.box = box
- @block.types = ['TinyMceArticle']
+ @block.types = ['TextArticle']
@block.limit = 1
owner = create_user('block-owner').person
@block.box = owner.boxes.last
@@ -23,14 +23,14 @@ class ContextContentPluginProfileControllerTest < ActionController::TestCase
end
should 'render error if page do not exists' do
- article = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id)
+ article = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id)
xhr :get, :view_content, :id => @block.id, :article_id => @page.id, :page => 2, :profile => @profile.identifier
assert_response 500
end
should 'replace div with content for page passed as parameter' do
- article1 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
- article2 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article2')
+ article1 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+ article2 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article2')
xhr :get, :view_content, :id => @block.id, :article_id => @page.id, :page => 2, :profile => @profile.identifier
assert_response :success
assert_match /context_content_#{@block.id}/, @response.body
@@ -39,7 +39,7 @@ class ContextContentPluginProfileControllerTest < ActionController::TestCase
end
should 'do not render pagination buttons if it has only one page' do
- article1 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+ article1 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
xhr :get, :view_content, :id => @block.id, :article_id => @page.id, :page => 2, :profile => @profile.identifier
assert_no_match /context_content_more_#{@block.id}/, @response.body
end
diff --git a/plugins/context_content/test/functional/profile_design_controller_test.rb b/plugins/context_content/test/functional/profile_design_controller_test.rb
index edc3d56..aa2eb88 100644
--- a/plugins/context_content/test/functional/profile_design_controller_test.rb
+++ b/plugins/context_content/test/functional/profile_design_controller_test.rb
@@ -13,7 +13,7 @@ class ProfileDesignControllerTest < ActionController::TestCase
box = Box.create!(:owner => @profile)
@block = ContextContentPlugin::ContextContentBlock.new(:box_id => box.id)
- @block.types = ['TinyMceArticle']
+ @block.types = ['TextArticle']
@block.limit = 1
@block.save!
@@ -38,11 +38,11 @@ class ProfileDesignControllerTest < ActionController::TestCase
@block.show_parent_content = false
@block.save!
get :edit, :id => @block.id, :profile => @profile.identifier
- post :save, :id => @block.id, :block => {:title => 'context', :show_image => '0', :show_name => '0', :show_parent_content => '0', :types => ['TinyMceArticle', '', nil, 'Folder'] }, :profile => @profile.identifier
+ post :save, :id => @block.id, :block => {:title => 'context', :show_image => '0', :show_name => '0', :show_parent_content => '0', :types => ['TextArticle', '', nil, 'Folder'] }, :profile => @profile.identifier
@block.reload
assert_equal 'context', @block.title
refute @block.show_image && !@block.show_name && !@block.show_parent_content
- assert_equal ['TinyMceArticle', 'Folder'], @block.types
+ assert_equal ['TextArticle', 'Folder'], @block.types
end
end
diff --git a/plugins/context_content/test/unit/context_content_block_test.rb b/plugins/context_content/test/unit/context_content_block_test.rb
index e598929..13fa04f 100644
--- a/plugins/context_content/test/unit/context_content_block_test.rb
+++ b/plugins/context_content/test/unit/context_content_block_test.rb
@@ -5,7 +5,7 @@ class ContextContentBlockTest < ActiveSupport::TestCase
def setup
Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
@block = ContextContentPlugin::ContextContentBlock.create!
- @block.types = ['TinyMceArticle']
+ @block.types = ['TextArticle']
end
should 'describe itself' do
@@ -22,13 +22,13 @@ class ContextContentBlockTest < ActiveSupport::TestCase
should 'return children of page' do
folder = fast_create(Folder)
- article = fast_create(TinyMceArticle, :parent_id => folder.id)
+ article = fast_create(TextArticle, :parent_id => folder.id)
assert_equal [article], @block.contents(folder)
end
should 'return parent name of the contents' do
folder = fast_create(Folder, :name => " New Folder")
- article = fast_create(TinyMceArticle, :parent_id => folder.id)
+ article = fast_create(TextArticle, :parent_id => folder.id)
assert_equal folder.name, @block.parent_title([article])
end
@@ -39,40 +39,40 @@ class ContextContentBlockTest < ActiveSupport::TestCase
should 'limit number of children to display' do
@block.limit = 2
folder = fast_create(Folder)
- article1 = fast_create(TinyMceArticle, :parent_id => folder.id)
- article2 = fast_create(TinyMceArticle, :parent_id => folder.id)
- article3 = fast_create(TinyMceArticle, :parent_id => folder.id)
+ article1 = fast_create(TextArticle, :parent_id => folder.id)
+ article2 = fast_create(TextArticle, :parent_id => folder.id)
+ article3 = fast_create(TextArticle, :parent_id => folder.id)
assert_equal 2, @block.contents(folder).length
end
should 'show contents for next page' do
@block.limit = 2
folder = fast_create(Folder)
- article1 = fast_create(TinyMceArticle, :name => 'article 1', :parent_id => folder.id)
- article2 = fast_create(TinyMceArticle, :name => 'article 2', :parent_id => folder.id)
- article3 = fast_create(TinyMceArticle, :name => 'article 3', :parent_id => folder.id)
+ article1 = fast_create(TextArticle, :name => 'article 1', :parent_id => folder.id)
+ article2 = fast_create(TextArticle, :name => 'article 2', :parent_id => folder.id)
+ article3 = fast_create(TextArticle, :name => 'article 3', :parent_id => folder.id)
assert_equal [article3], @block.contents(folder, 2)
end
should 'show parent contents for next page' do
@block.limit = 2
folder = fast_create(Folder)
- article1 = fast_create(TinyMceArticle, :name => 'article 1', :parent_id => folder.id)
- article2 = fast_create(TinyMceArticle, :name => 'article 2', :parent_id => folder.id)
- article3 = fast_create(TinyMceArticle, :name => 'article 3', :parent_id => folder.id)
+ article1 = fast_create(TextArticle, :name => 'article 1', :parent_id => folder.id)
+ article2 = fast_create(TextArticle, :name => 'article 2', :parent_id => folder.id)
+ article3 = fast_create(TextArticle, :name => 'article 3', :parent_id => folder.id)
assert_equal [article3], @block.contents(article1, 2)
end
should 'return parent children if page has no children' do
folder = fast_create(Folder)
- article = fast_create(TinyMceArticle, :parent_id => folder.id)
+ article = fast_create(TextArticle, :parent_id => folder.id)
assert_equal [article], @block.contents(article)
end
should 'do not return parent children if show_parent_content is false' do
@block.show_parent_content = false
folder = fast_create(Folder)
- article = fast_create(TinyMceArticle, :parent_id => folder.id)
+ article = fast_create(TextArticle, :parent_id => folder.id)
assert_equal [], @block.contents(article)
end
@@ -82,13 +82,13 @@ class ContextContentBlockTest < ActiveSupport::TestCase
end
should 'return available content types with checked types first' do
- @block.types = ['TinyMceArticle', 'Folder']
- assert_equal [TinyMceArticle, Folder, UploadedFile, Event, TextileArticle, RawHTMLArticle, Blog, Forum, Gallery, RssFeed], @block.available_content_types
+ @block.types = ['TextArticle', 'Folder']
+ assert_equal [TextArticle, Folder, UploadedFile, Event, Blog, Forum, Gallery, RssFeed], @block.available_content_types
end
should 'return available content types' do
@block.types = []
- assert_equal [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed], @block.available_content_types
+ assert_equal [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed], @block.available_content_types
end
should 'return first 2 content types' do
@@ -120,7 +120,7 @@ class ContextContentBlockTest < 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_equal [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], @block.available_content_types
end
should 'return box owner on profile method call' do
@@ -144,7 +144,7 @@ class ContextContentBlockViewTest < ActionView::TestCase
def setup
Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
@block = ContextContentPlugin::ContextContentBlock.create!
- @block.types = ['TinyMceArticle']
+ @block.types = ['TextArticle']
end
should 'render nothing if it has no content to show' do
@@ -153,7 +153,7 @@ class ContextContentBlockViewTest < ActionView::TestCase
should 'render context content block view' do
@page = fast_create(Folder)
- article = fast_create(TinyMceArticle, :parent_id => @page.id)
+ article = fast_create(TextArticle, :parent_id => @page.id)
contents = [article]
@block.use_parent_title = true
@@ -178,9 +178,9 @@ class ContextContentBlockViewTest < ActionView::TestCase
should 'display pagination links if it has more than one page' do
@block.limit = 2
@page = fast_create(Folder)
- article1 = fast_create(TinyMceArticle, :parent_id => @page.id)
- article2 = fast_create(TinyMceArticle, :parent_id => @page.id)
- article3 = fast_create(TinyMceArticle, :parent_id => @page.id)
+ article1 = fast_create(TextArticle, :parent_id => @page.id)
+ article2 = fast_create(TextArticle, :parent_id => @page.id)
+ article3 = fast_create(TextArticle, :parent_id => @page.id)
contents = [article1, article2, article3]
contents.each do |article|
article.expects(:view_url).returns('http://test.noosfero.plugins')
diff --git a/plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb b/plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb
index dc966ea..799da6d 100644
--- a/plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb
+++ b/plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb
@@ -180,8 +180,9 @@ class CustomFormsPluginMyprofileControllerTest < ActionController::TestCase
form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
get :edit, :profile => profile.identifier, :id => form.id
+ expects(:current_editor).returns(Article::Editor::TINY_MCE)
- assert_tag :tag => 'textarea', :attributes => { :id => 'form_description', :class => 'mceEditor' }
+ assert_tag :tag => 'textarea', :attributes => { :id => 'form_description', :class => /#{current_editor}/ }
end
should 'export submissions as csv' do
diff --git a/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb b/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
index bc6dddd..2d8a86d 100644
--- a/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
+++ b/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
@@ -1,5 +1,4 @@
<% self.extend(CustomFormsPlugin::Helper) %>
-<%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
<%= error_messages_for :form %>
<%= required labelled_form_field _('Name'), f.text_field(:name) %>
@@ -17,7 +16,7 @@
<%= labelled_check_box _('Triggered after membership'), 'form[on_membership]', '1', @form.on_membership %>
<% end %>
-<%= labelled_form_field c_('Description'), f.text_area(:description, :style => 'width: 100%', :class => 'mceEditor') %>
+<%= labelled_form_field c_('Description'), f.text_area(:description, :style => 'width: 100%', :class => current_editor('simple')) %>
', profile: profile)
+ a = TextArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks ', profile: profile)
get :view_page, profile: profile.identifier, page: [ a.name.to_slug ]
assert_tag tag: 'meta', attributes: { name: 'twitter:image', content: /\/images\/x.png/ }
@@ -45,7 +45,7 @@ class ContentViewerControllerTest < ActionController::TestCase
end
should 'escape utf8 characters correctly' do
- a = TinyMceArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks 
', profile: profile)
+ a = TextArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks ', profile: profile)
get :view_page, profile: profile.identifier, page: [ a.name.to_slug ]
assert_tag tag: 'meta', attributes: { property: 'og:image', content: /\/images\/%C3%A7.png/ }
@@ -63,7 +63,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'not expose metadata on private pages' do
profile.update_column :public_profile, false
- a = TinyMceArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks ', profile: profile)
+ a = TextArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks ', profile: profile)
get :view_page, profile: profile.identifier, page: [ a.name.to_slug ]
assert_no_tag tag: 'meta', attributes: { property: 'og:image', content: /\/images\/x.png/ }
diff --git a/plugins/newsletter/test/integration/safe_strings_test.rb b/plugins/newsletter/test/integration/safe_strings_test.rb
index 9d90f6e..11ad3ae 100644
--- a/plugins/newsletter/test/integration/safe_strings_test.rb
+++ b/plugins/newsletter/test/integration/safe_strings_test.rb
@@ -10,7 +10,7 @@ class NewsletterPluginSafeStringsTest < ActionDispatch::IntegrationTest
environment.add_admin(person)
blog = fast_create(Blog, :profile_id => person.id)
- post = fast_create(TextileArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post = fast_create(TextArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
newsletter = NewsletterPlugin::Newsletter.create!(:environment => environment, :person => person, :enabled => true)
newsletter.blog_ids = [blog.id]
newsletter.save!
diff --git a/plugins/newsletter/test/unit/newsletter_plugin_moderate_newsletter_test.rb b/plugins/newsletter/test/unit/newsletter_plugin_moderate_newsletter_test.rb
index 649f55d..6da4c79 100644
--- a/plugins/newsletter/test/unit/newsletter_plugin_moderate_newsletter_test.rb
+++ b/plugins/newsletter/test/unit/newsletter_plugin_moderate_newsletter_test.rb
@@ -28,9 +28,9 @@ class NewsletterPluginModerateNewsletterTest < ActiveSupport::TestCase
should 'set posts for mailing body on perform' do
person = create_user('john').person
blog = fast_create(Blog, profile_id: person.id)
- post_1 = fast_create(TextileArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
- post_2 = fast_create(TextileArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
- post_3 = fast_create(TextileArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_1 = fast_create(TextArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_2 = fast_create(TextArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_3 = fast_create(TextArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
newsletter = NewsletterPlugin::Newsletter.create!(:environment => person.environment, :person => person, :enabled => true)
newsletter.blog_ids = [blog.id]
diff --git a/plugins/newsletter/test/unit/newsletter_plugin_newsletter_test.rb b/plugins/newsletter/test/unit/newsletter_plugin_newsletter_test.rb
index 031c781..3be1b40 100644
--- a/plugins/newsletter/test/unit/newsletter_plugin_newsletter_test.rb
+++ b/plugins/newsletter/test/unit/newsletter_plugin_newsletter_test.rb
@@ -381,9 +381,9 @@ EOS
person = fast_create(Person)
blog = fast_create(Blog, profile_id: person.id)
- post_1 = fast_create(TextileArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
- post_2 = fast_create(TextileArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
- post_3 = fast_create(TextileArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_1 = fast_create(TextArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_2 = fast_create(TextArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_3 = fast_create(TextArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
newsletter = NewsletterPlugin::Newsletter.create!(
:environment => person.environment,
@@ -397,9 +397,9 @@ EOS
person = fast_create(Person)
blog = fast_create(Blog, profile_id: person.id)
- post_1 = fast_create(TextileArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
- post_2 = fast_create(TextileArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
- post_3 = fast_create(TextileArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_1 = fast_create(TextArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_2 = fast_create(TextArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_3 = fast_create(TextArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
newsletter = NewsletterPlugin::Newsletter.create!(
:environment => person.environment,
diff --git a/plugins/newsletter/views/newsletter_plugin_admin/index.html.erb b/plugins/newsletter/views/newsletter_plugin_admin/index.html.erb
index cb756c0..415dded 100644
--- a/plugins/newsletter/views/newsletter_plugin_admin/index.html.erb
+++ b/plugins/newsletter/views/newsletter_plugin_admin/index.html.erb
@@ -1,7 +1,5 @@
right align..." }
- saved = TinyMceArticle.find_by(name: 'image-alignment')
+ post :new, :type => 'TextArticle', :profile => profile.identifier, :article => { :name => 'image-alignment', :body => "the text of the article with image right align..." }
+ saved = TextArticle.find_by(name: 'image-alignment')
assert_match //, saved.body
assert_match //, saved.body
end
should 'be able to add image with alignment when textile' do
- post :new, :type => 'TextileArticle', :profile => profile.identifier, :article => { :name => 'image-alignment', :body => "the text of the article with image right align..." }
- saved = TextileArticle.find_by(name: 'image-alignment')
+ post :new, :type => 'TextArticle', :profile => profile.identifier, :article => { :name => 'image-alignment', :body => "the text of the article with image right align..." }
+ saved = TextArticle.find_by(name: 'image-alignment')
assert_match /align="right"/, saved.body
end
@@ -778,19 +778,19 @@ class CmsControllerTest < ActionController::TestCase
should 'record as coming from public view when creating article' do
@request.expects(:referer).returns('http://colivre.net/testinguser/testingusers-home-page').at_least_once
- get :new, :profile => 'testinguser', :type => 'TextileArticle'
+ get :new, :profile => 'testinguser', :type => 'TextArticle'
assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'back_to', :value => @request.referer }
assert_tag :tag => 'a', :descendant => { :content => 'Cancel' }, :attributes => { :href => 'http://colivre.net/testinguser/testingusers-home-page' }
end
should 'go to public view after creating article coming from there' do
- post :new, :profile => 'testinguser', :type => 'TextileArticle', :back_to => 'public_view', :article => { :name => 'new-article-from-public-view' }
+ post :new, :profile => 'testinguser', :type => 'TextArticle', :back_to => 'public_view', :article => { :name => 'new-article-from-public-view' }
assert_response :redirect
assert_redirected_to @profile.articles.find_by(name: 'new-article-from-public-view').url
end
should 'keep the back_to hint in unsuccessfull saves' do
- post :new, :profile => 'testinguser', :type => 'TextileArticle', :back_to => 'public_view', :article => { }
+ post :new, :profile => 'testinguser', :type => 'TextArticle', :back_to => 'public_view', :article => { }
assert_response :success
assert_tag :tag => "input", :attributes => { :type => 'hidden', :name => 'back_to', :value => 'public_view' }
end
@@ -798,7 +798,7 @@ class CmsControllerTest < ActionController::TestCase
should 'create a private article child of private folder' do
folder = build(Folder, :name => 'my intranet', :published => false); profile.articles << folder; folder.save!
- post :new, :profile => profile.identifier, :type => 'TextileArticle', :parent_id => folder.id, :article => { :name => 'new-private-article'}
+ post :new, :profile => profile.identifier, :type => 'TextArticle', :parent_id => folder.id, :article => { :name => 'new-private-article'}
folder.reload
refute assigns(:article).published?
@@ -1198,7 +1198,7 @@ class CmsControllerTest < ActionController::TestCase
end
end
- should 'display media listing when it is TinyMceArticle and enabled on environment' do
+ should 'display media listing when it is TextArticle and enabled on environment' do
e = Environment.default
e.enable('media_panel')
e.save!
@@ -1209,7 +1209,7 @@ class CmsControllerTest < ActionController::TestCase
image = UploadedFile.create!(:profile => profile, :parent => image_folder, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
file = UploadedFile.create!(:profile => profile, :parent => non_image_folder, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
- get :new, :profile => profile.identifier, :type => 'TinyMceArticle'
+ get :new, :profile => profile.identifier, :type => 'TextArticle'
assert_tag :div, :attributes => { :class => "text-editor-sidebar" }
end
@@ -1225,7 +1225,7 @@ class CmsControllerTest < ActionController::TestCase
end
should "display 'Publish' when profile is a person and is member of communities" do
- a = fast_create(TextileArticle, :profile_id => profile.id, :updated_at => DateTime.now)
+ a = fast_create(TextArticle, :profile_id => profile.id, :updated_at => DateTime.now)
c1 = fast_create(Community)
c2 = fast_create(Community)
c1.add_member(profile)
@@ -1235,7 +1235,7 @@ class CmsControllerTest < ActionController::TestCase
end
should "display 'Publish' when profile is a person and there is a portal community" do
- a = fast_create(TextileArticle, :profile_id => profile.id, :updated_at => DateTime.now)
+ a = fast_create(TextArticle, :profile_id => profile.id, :updated_at => DateTime.now)
environment = profile.environment
environment.portal_community = fast_create(Community)
environment.enable('use_portal_community')
@@ -1247,7 +1247,7 @@ class CmsControllerTest < ActionController::TestCase
should "display 'Publish' when profile is a community" do
community = fast_create(Community)
community.add_admin(profile)
- a = fast_create(TextileArticle, :profile_id => community.id, :updated_at => DateTime.now)
+ a = fast_create(TextArticle, :profile_id => community.id, :updated_at => DateTime.now)
Article.stubs(:short_description).returns('bli')
get :index, :profile => community.identifier
assert_tag :tag => 'a', :attributes => {:href => "/myprofile/#{community.identifier}/cms/publish/#{a.id}"}
@@ -1279,7 +1279,7 @@ class CmsControllerTest < ActionController::TestCase
login_as :test_user
@controller.stubs(:user).returns(u)
- get :new, :profile => c.identifier, :type => 'TinyMceArticle'
+ get :new, :profile => c.identifier, :type => 'TextArticle'
assert_response :success
assert_template 'edit'
end
@@ -1496,12 +1496,14 @@ class CmsControllerTest < ActionController::TestCase
assert_select '#dynamic_recaptcha', 0
end
- should 'render TinyMce Editor on suggestion of article' do
+ should 'render TinyMce Editor on suggestion of article if editor is TinyMCE' do
logout
+ profile.editor = Article::Editor::TINY_MCE
+ profile.save
get :suggest_an_article, :profile => profile.identifier
- assert_tag :tag => 'textarea', :attributes => { :name => /task\[article\]\[abstract\]/, :class => 'mceEditor' }
- assert_tag :tag => 'textarea', :attributes => { :name => /task\[article\]\[body\]/, :class => 'mceEditor' }
+ assert_tag :tag => 'textarea', :attributes => { :name => /task\[article\]\[abstract\]/, :class => Article::Editor::TINY_MCE }
+ assert_tag :tag => 'textarea', :attributes => { :name => /task\[article\]\[body\]/, :class => Article::Editor::TINY_MCE }
end
should 'create a task suggest task to a profile' do
@@ -1537,7 +1539,7 @@ class CmsControllerTest < ActionController::TestCase
e = Environment.default
e.languages = ['ru']
e.save
- textile = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile', :language => 'ru')
+ textile = fast_create(TextArticle, :profile_id => @profile.id, :path => 'textile', :language => 'ru')
get :edit, :profile => @profile.identifier, :id => textile.id
assert_tag :option, :attributes => { :selected => 'selected', :value => 'ru' }, :parent => {
:tag => 'select', :attributes => { :id => 'article_language'} }
@@ -1547,16 +1549,16 @@ class CmsControllerTest < ActionController::TestCase
e = Environment.default
e.languages = ['en', 'pt','fr','hy','de', 'ru', 'es', 'eo', 'it']
e.save
- get :new, :profile => @profile.identifier, :type => 'TextileArticle'
+ get :new, :profile => @profile.identifier, :type => 'TextArticle'
assert_equal Noosfero.locales.invert, assigns(:locales)
assert_tag :option, :attributes => { :value => '' }, :parent => {
:tag => 'select', :attributes => { :id => 'article_language'} }
end
should 'add translation to an article' do
- textile = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile', :language => 'ru')
+ textile = fast_create(TextArticle, :profile_id => @profile.id, :path => 'textile', :language => 'ru')
assert_difference 'Article.count' do
- post :new, :profile => @profile.identifier, :type => 'TextileArticle', :article => { :name => 'english translation', :translation_of_id => textile.id, :language => 'en' }
+ post :new, :profile => @profile.identifier, :type => 'TextArticle', :article => { :name => 'english translation', :translation_of_id => textile.id, :language => 'en' }
end
end
@@ -1616,20 +1618,20 @@ class CmsControllerTest < ActionController::TestCase
should 'display accept comments option when creating forum post' do
profile.articles << f = Forum.new(:name => 'Forum for test')
- get :new, :profile => profile.identifier, :type => 'TinyMceArticle', :parent_id => f.id
+ get :new, :profile => profile.identifier, :type => 'TextArticle', :parent_id => f.id
assert_no_tag :tag => 'input', :attributes => {:name => 'article[accept_comments]', :value => 1, :type => 'hidden'}
assert_tag :tag => 'input', :attributes => {:name => 'article[accept_comments]', :value => 1, :type => 'checkbox'}
end
should 'display accept comments option when creating an article that is not a forum post' do
- get :new, :profile => profile.identifier, :type => 'TinyMceArticle'
+ get :new, :profile => profile.identifier, :type => 'TextArticle'
assert_no_tag :tag => 'input', :attributes => {:name => 'article[accept_comments]', :value => 1, :type => 'hidden'}
assert_tag :tag => 'input', :attributes => {:name => 'article[accept_comments]', :value => 1, :type => 'checkbox'}
end
should 'display accept comments option when editing forum post' do
profile.articles << f = Forum.new(:name => 'Forum for test')
- profile.articles << a = TinyMceArticle.new(:name => 'Forum post for test', :parent => f)
+ profile.articles << a = TextArticle.new(:name => 'Forum post for test', :parent => f)
get :edit, :profile => profile.identifier, :id => a.id
assert_no_tag :tag => 'input', :attributes => {:name => 'article[accept_comments]', :value => 1, :type => 'hidden'}
assert_tag :tag => 'input', :attributes => {:name => 'article[accept_comments]', :value => 1, :type => 'checkbox'}
@@ -1642,7 +1644,7 @@ class CmsControllerTest < ActionController::TestCase
:topic_creation => 'self',
:body => 'Forum Body')
- post :new, :profile => profile.identifier, :type => 'TinyMceArticle',
+ post :new, :profile => profile.identifier, :type => 'TextArticle',
:article => {:name => 'New Topic by linux', :body => 'Article Body',
:parent_id => f.id}
@@ -1657,7 +1659,7 @@ class CmsControllerTest < ActionController::TestCase
:topic_creation => 'related',
:body => 'Forum Body')
- post :new, :profile => profile.identifier, :type => 'TinyMceArticle',
+ post :new, :profile => profile.identifier, :type => 'TextArticle',
:article => {:name => 'New Topic by linux', :body => 'Article Body',
:parent_id => f.id}
@@ -1672,7 +1674,7 @@ class CmsControllerTest < ActionController::TestCase
:topic_creation => 'users',
:body => 'Forum Body')
- post :new, :profile => profile.identifier, :type => 'TinyMceArticle',
+ post :new, :profile => profile.identifier, :type => 'TextArticle',
:article => {:name => 'New Topic by linux', :body => 'Article Body',
:parent_id => f.id}
@@ -1681,13 +1683,13 @@ class CmsControllerTest < ActionController::TestCase
should 'display accept comments option when editing forum post with a different label' do
profile.articles << f = Forum.new(:name => 'Forum for test')
- profile.articles << a = TinyMceArticle.new(:name => 'Forum post for test', :parent => f)
+ profile.articles << a = TextArticle.new(:name => 'Forum post for test', :parent => f)
get :edit, :profile => profile.identifier, :id => a.id
assert_tag :tag => 'label', :attributes => { :for => 'article_accept_comments' }, :content => _('This topic is opened for replies')
end
should 'display correct label for accept comments option for an article that is not a forum post' do
- profile.articles << a = TinyMceArticle.new(:name => 'Forum post for test')
+ profile.articles << a = TextArticle.new(:name => 'Forum post for test')
get :edit, :profile => profile.identifier, :id => a.id
assert_tag :tag => 'label', :attributes => { :for => 'article_accept_comments' }, :content => _('I want to receive comments about this article')
end
@@ -1711,7 +1713,7 @@ class CmsControllerTest < ActionController::TestCase
end
should 'update article and be redirect to view_page' do
- a = fast_create(TextileArticle, :profile_id => @profile.id)
+ a = fast_create(TextArticle, :profile_id => @profile.id)
post :edit, :profile => @profile.identifier, :id => a.id, :article => { }
assert_redirected_to a.view_url
end
@@ -1730,12 +1732,14 @@ class CmsControllerTest < ActionController::TestCase
end
should 'render TinyMce Editor for events' do
+ profile.editor = Article::Editor::TINY_MCE
+ profile.save
get :new, :profile => @profile.identifier, :type => 'Event'
- assert_tag :tag => 'textarea', :attributes => { :class => 'mceEditor' }
+ assert_tag :tag => 'textarea', :attributes => { :class => Article::Editor::TINY_MCE }
end
should 'identify form with classname of edited article' do
- [Blog, TinyMceArticle, Forum].each do |klass|
+ [Blog, TextArticle, Forum].each do |klass|
a = fast_create(klass, :profile_id => profile.id)
get :edit, :profile => profile.identifier, :id => a.id
assert_tag :tag => 'form', :attributes => {:class => "#{a.type} #{a.type.to_css_class}"}
@@ -1771,14 +1775,6 @@ class CmsControllerTest < ActionController::TestCase
assert_response :bad_request
end
- should 'make RawHTMLArticle available only to environment admins' do
- @controller.stubs(:profile).returns(profile)
- @controller.stubs(:user).returns(profile)
- assert_not_includes available_article_types, RawHTMLArticle
- profile.environment.add_admin(profile)
- assert_includes available_article_types, RawHTMLArticle
- end
-
should 'include new contents special types from plugins' do
class TestContentTypesPlugin < Noosfero::Plugin
def content_types
@@ -1810,7 +1806,7 @@ class CmsControllerTest < ActionController::TestCase
License.delete_all
login_as(profile.identifier)
- get :new, :profile => profile.identifier, :type => 'TinyMceArticle'
+ get :new, :profile => profile.identifier, :type => 'TextArticle'
assert_no_tag :tag => 'select', :attributes => {:id => 'article_license_id'}
end
@@ -1843,7 +1839,7 @@ class CmsControllerTest < ActionController::TestCase
should 'set author when creating article' do
login_as(profile.identifier)
- post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'Sample Article', :body => 'content ...' }
+ post :new, :type => 'TextArticle', :profile => profile.identifier, :article => { :name => 'Sample Article', :body => 'content ...' }
a = profile.articles.find_by(path: 'sample-article')
assert_not_nil a
@@ -1869,7 +1865,7 @@ class CmsControllerTest < ActionController::TestCase
folder = fast_create(Folder, :name=>'a', :profile_id => profile.id)
gallery = fast_create(Gallery, :name=>'b', :profile_id => profile.id)
blog = fast_create(Blog, :name=>'c', :profile_id => profile.id)
- article = fast_create(TinyMceArticle, :profile_id => profile.id)
+ article = fast_create(TextArticle, :profile_id => profile.id)
get :edit, :profile => profile.identifier, :id => article.id
assert_template 'edit'
assert_tag :tag => 'select', :attributes => { :name => "parent_id" },
@@ -1897,7 +1893,7 @@ class CmsControllerTest < ActionController::TestCase
end
should 'go back to specified url when saving with success' do
- post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'changed by me', :body => 'content ...' }, :success_back_to => '/'
+ post :new, :type => 'TextArticle', :profile => profile.identifier, :article => { :name => 'changed by me', :body => 'content ...' }, :success_back_to => '/'
assert_redirected_to '/'
end
@@ -1927,7 +1923,7 @@ class CmsControllerTest < ActionController::TestCase
should 'set created_by when creating article' do
login_as(profile.identifier)
- post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'changed by me', :body => 'content ...' }
+ post :new, :type => 'TextArticle', :profile => profile.identifier, :article => { :name => 'changed by me', :body => 'content ...' }
a = profile.articles.find_by(path: 'changed-by-me')
assert_not_nil a
@@ -1973,13 +1969,13 @@ class CmsControllerTest < ActionController::TestCase
profile.articles << f
f.save!
- post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :parent_id => f.id,
+ post :new, :type => 'TextArticle', :profile => profile.identifier, :parent_id => f.id,
:article => { :name => 'Main Article', :body => 'some content' }
main_article = profile.articles.find_by(name: 'Main Article')
assert_not_nil main_article
- post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :parent_id => f.id,
+ post :new, :type => 'TextArticle', :profile => profile.identifier, :parent_id => f.id,
:id => main_article.id, :clone => true
cloned_main_article = profile.articles.find_by(name: 'Main Article')
@@ -1988,7 +1984,7 @@ class CmsControllerTest < ActionController::TestCase
assert_equal main_article.parent_id, cloned_main_article.parent_id
get :new, :profile => profile.identifier, :id => cloned_main_article.id,
- :clone => true, :type => 'TinyMceArticle'
+ :clone => true, :type => 'TextArticle'
assert_match main_article.body, @response.body
end
@@ -2005,7 +2001,7 @@ class CmsControllerTest < ActionController::TestCase
end
end
- [TextileArticle, Event, TinyMceArticle].each do |klass|
+ [TextArticle, Event].each do |klass|
should "set no_design_blocks as true when create #{klass.name}" do
get :new, profile: profile.identifier, type: klass.name
assert assigns(:no_design_blocks)
@@ -2018,7 +2014,7 @@ class CmsControllerTest < ActionController::TestCase
assert !assigns(:no_design_blocks)
end
- [TextileArticle, Event, TinyMceArticle].each do |klass|
+ [TextArticle, Event].each do |klass|
should "set no_design_blocks as true when edit #{klass.name}" do
article = fast_create(klass, profile_id: profile.id)
get :edit, profile: profile.identifier, id: article.id
diff --git a/test/functional/content_viewer_controller_test.rb b/test/functional/content_viewer_controller_test.rb
index 3fbc5e8..86e6ba3 100644
--- a/test/functional/content_viewer_controller_test.rb
+++ b/test/functional/content_viewer_controller_test.rb
@@ -119,7 +119,7 @@ class ContentViewerControllerTest < ActionController::TestCase
end
should "display image label on article image" do
- page = TinyMceArticle.create!(
+ page = TextArticle.create!(
:profile => profile,
:name => 'myarticle',
:image_builder => {
@@ -453,7 +453,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'list unpublished posts to owner with a different class' do
login_as('testinguser')
blog = Blog.create!(:name => 'A blog test', :profile => profile)
- blog.posts << TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
+ blog.posts << TextArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
get :view_page, :profile => profile.identifier, :page => [blog.path]
assert_tag :tag => 'div', :attributes => {:class => /not-published/}
@@ -461,7 +461,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'not list unpublished posts to a not logged person' do
blog = Blog.create!(:name => 'A blog test', :profile => profile)
- blog.posts << TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
+ blog.posts << TextArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
get :view_page, :profile => profile.identifier, :page => [blog.path]
assert_no_tag :tag => 'a', :content => "Post"
@@ -470,7 +470,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'display pagination links of blog' do
blog = Blog.create!(:name => 'A blog test', :profile => profile, :posts_per_page => 5)
for n in 1..10
- blog.posts << TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => blog)
+ blog.posts << TextArticle.create!(:name => "Post #{n}", :profile => profile, :parent => blog)
end
assert_equal 10, blog.posts.size
@@ -481,7 +481,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'display first page of blog posts' do
blog = Blog.create!(:name => 'My blog', :profile => profile, :posts_per_page => 5)
for n in 1..10
- blog.children << TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => blog)
+ blog.children << TextArticle.create!(:name => "Post #{n}", :profile => profile, :parent => blog)
end
assert_equal 10, blog.posts.size
@@ -497,7 +497,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'display others pages of blog posts' do
blog = Blog.create!(:name => 'My blog', :profile => profile, :posts_per_page => 5)
for n in 1..10
- blog.children << TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => blog)
+ blog.children << TextArticle.create!(:name => "Post #{n}", :profile => profile, :parent => blog)
end
assert_equal 10, blog.posts.size
@@ -514,8 +514,8 @@ class ContentViewerControllerTest < ActionController::TestCase
blog = Blog.create!(:name => "blog", :profile => profile)
profile.articles << blog
- past_post = create(TextileArticle, :name => "past post", :profile => profile, :parent => blog, :published_at => blog.created_at - 1.year)
- current_post = TextileArticle.create!(:name => "current post", :profile => profile, :parent => blog)
+ past_post = create(TextArticle, :name => "past post", :profile => profile, :parent => blog, :published_at => blog.created_at - 1.year)
+ current_post = TextArticle.create!(:name => "current post", :profile => profile, :parent => blog)
blog.children << past_post
blog.children << current_post
@@ -530,7 +530,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'give link to create new article inside folder when view child of folder' do
login_as('testinguser')
folder = Folder.create!(:name => 'myfolder', :profile => @profile)
- folder.children << TextileArticle.new(:name => 'children-article', :profile => @profile)
+ folder.children << TextArticle.new(:name => 'children-article', :profile => @profile)
xhr :get, :view_page, :profile => 'testinguser', :page => [ 'myfolder', 'children-article' ], :toolbar => true
assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :href => "/myprofile/testinguser/cms/new?parent_id=#{folder.id}" } }
end
@@ -555,14 +555,14 @@ class ContentViewerControllerTest < ActionController::TestCase
login_as(profile.identifier)
a = Blog.create!(:name => 'article folder', :profile => profile)
Article.stubs(:short_description).returns('bli')
- t = TextileArticle.create!(:name => 'first post', :parent => a, :profile => profile)
+ t = TextArticle.create!(:name => 'first post', :parent => a, :profile => profile)
xhr :get, :view_page, :profile => profile.identifier, :page => [t.path], :toolbar => true
assert_tag :tag => 'a', :content => 'New post'
end
should 'display button to remove article' do
login_as(profile.identifier)
- t = TextileArticle.create!(:name => 'article to destroy', :profile => profile)
+ t = TextArticle.create!(:name => 'article to destroy', :profile => profile)
xhr :get, :view_page, :profile => profile.identifier, :page => [t.path], :toolbar => true
assert_tag :tag => 'a', :content => 'Delete', :attributes => {:href => "/myprofile/#{profile.identifier}/cms/destroy/#{t.id}"}
end
@@ -584,7 +584,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'add meta tag to rss feed on view post blog' do
login_as(profile.identifier)
blog = Blog.create!(:name => 'Blog', :profile => profile)
- TextileArticle.create!(:name => 'first post', :parent => blog, :profile => profile)
+ TextArticle.create!(:name => 'first post', :parent => blog, :profile => profile)
get :view_page, :profile => profile.identifier, :page => ['blog', 'first-post']
assert_tag :tag => 'link', :attributes => { :rel => 'alternate', :type => 'application/rss+xml', :title => 'Blog', :href => "http://#{environment.default_hostname}/testinguser/blog/feed" }
end
@@ -718,13 +718,13 @@ class ContentViewerControllerTest < ActionController::TestCase
end
should 'display source from article' do
- profile.articles << TextileArticle.new(:name => "Article one", :profile => profile, :source => 'http://www.original-source.invalid')
+ profile.articles << TextArticle.new(:name => "Article one", :profile => profile, :source => 'http://www.original-source.invalid')
get :view_page, :profile => profile.identifier, :page => ['article-one']
assert_tag :tag => 'div', :attributes => { :id => 'article-source' }, :content => /http:\/\/www.original-source.invalid/
end
should 'not display source if article has no source' do
- profile.articles << TextileArticle.new(:name => "Article one", :profile => profile)
+ profile.articles << TextArticle.new(:name => "Article one", :profile => profile)
get :view_page, :profile => profile.identifier, :page => ['article-one']
assert_no_tag :tag => 'div', :attributes => { :id => 'article-source' }
end
@@ -745,7 +745,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should "not display 'Upload files' when viewing post from a blog" do
login_as(profile.identifier)
b = Blog.create!(:name => 'article folder', :profile => profile)
- blog_post = TextileArticle.create!(:name => 'children-article', :profile => profile, :parent => b)
+ blog_post = TextArticle.create!(:name => 'children-article', :profile => profile, :parent => b)
xhr :get, :view_page, :profile => profile.identifier, :page => blog_post.path, :toolbar => true
assert_no_tag :tag => 'a', :content => 'Upload files', :attributes => {:href => /parent_id=#{b.id}/}
end
@@ -799,7 +799,7 @@ class ContentViewerControllerTest < ActionController::TestCase
blog = Blog.create!(:name => 'A blog test', :profile => profile, :visualization_format => 'short')
- blog.posts << TinyMceArticle.create!(:name => 'first post', :parent => blog, :profile => profile, :body => '
')
+ blog.posts << TextArticle.create!(:name => 'first post', :parent => blog, :profile => profile, :body => '')
get :view_page, :profile => profile.identifier, :page => blog.path
@@ -833,7 +833,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'list unpublished forum posts to owner with a different class' do
login_as('testinguser')
forum = Forum.create!(:name => 'A forum test', :profile => profile)
- forum.posts << TextileArticle.create!(:name => 'Post', :profile => profile, :parent => forum, :published => false)
+ forum.posts << TextArticle.create!(:name => 'Post', :profile => profile, :parent => forum, :published => false)
get :view_page, :profile => profile.identifier, :page => [forum.path]
assert_tag :tag => 'tr', :attributes => {:class => /not-published/}
@@ -841,7 +841,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'not list unpublished forum posts to a not logged person' do
forum = Forum.create!(:name => 'A forum test', :profile => profile)
- forum.posts << TextileArticle.create!(:name => 'Post', :profile => profile, :parent => forum, :published => false)
+ forum.posts << TextArticle.create!(:name => 'Post', :profile => profile, :parent => forum, :published => false)
get :view_page, :profile => profile.identifier, :page => [forum.path]
assert_no_tag :tag => 'a', :content => "Post"
@@ -850,7 +850,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'display pagination links of forum' do
forum = Forum.create!(:name => 'A forum test', :profile => profile, :posts_per_page => 5)
for n in 1..10
- forum.posts << TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => forum)
+ forum.posts << TextArticle.create!(:name => "Post #{n}", :profile => profile, :parent => forum)
end
assert_equal 10, forum.posts.size
@@ -861,7 +861,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'display first page of forum posts' do
forum = Forum.create!(:name => 'My forum', :profile => profile, :posts_per_page => 5)
for n in 1..10
- art = TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => forum)
+ art = TextArticle.create!(:name => "Post #{n}", :profile => profile, :parent => forum)
art.updated_at = (10 - n).days.ago
art.stubs(:record_timestamps).returns(false)
art.save!
@@ -882,7 +882,7 @@ class ContentViewerControllerTest < ActionController::TestCase
now = Time.now
for n in 1..10
Time.stubs(:now).returns(now - 10.days + n.days)
- forum.children << art = TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => forum)
+ forum.children << art = TextArticle.create!(:name => "Post #{n}", :profile => profile, :parent => forum)
end
assert_equal 10, forum.posts.size
@@ -899,8 +899,8 @@ class ContentViewerControllerTest < ActionController::TestCase
forum = Forum.create!(:name => "forum", :profile => profile)
profile.articles << forum
- past_post = create(TextileArticle, :name => "past post", :profile => profile, :parent => forum, :published_at => forum.created_at - 1.year)
- current_post = TextileArticle.create!(:name => "current post", :profile => profile, :parent => forum)
+ past_post = create(TextArticle, :name => "past post", :profile => profile, :parent => forum, :published_at => forum.created_at - 1.year)
+ current_post = TextArticle.create!(:name => "current post", :profile => profile, :parent => forum)
forum.children << past_post
forum.children << current_post
@@ -924,7 +924,7 @@ class ContentViewerControllerTest < ActionController::TestCase
login_as(profile.identifier)
a = Forum.create!(:name => 'article folder', :profile => profile)
Article.stubs(:short_description).returns('bli')
- t = TextileArticle.create!(:name => 'first post', :parent => a, :profile => profile)
+ t = TextArticle.create!(:name => 'first post', :parent => a, :profile => profile)
xhr :get, :view_page, :profile => profile.identifier, :page => [t.path], :toolbar => true
assert_tag :tag => 'a', :content => 'New discussion topic'
end
@@ -937,7 +937,7 @@ class ContentViewerControllerTest < ActionController::TestCase
community.add_member(author)
forum = Forum.create(:profile => community, :name => 'Forum test', :body => 'Forum test')
- post = fast_create(TextileArticle, :name => 'First post', :profile_id => community.id, :parent_id => forum.id, :author_id => author.id)
+ post = fast_create(TextArticle, :name => 'First post', :profile_id => community.id, :parent_id => forum.id, :author_id => author.id)
login_as(author.identifier)
get :view_page, :profile => community.identifier, :page => post.path.split('/')
@@ -953,7 +953,7 @@ class ContentViewerControllerTest < ActionController::TestCase
community.add_member(author)
forum = Forum.create(:profile => community, :name => 'Forum test', :body => 'Forum test')
- post = fast_create(TextileArticle, :name => 'First post', :profile_id => community.id, :parent_id => forum.id, :author_id => author.id)
+ post = fast_create(TextArticle, :name => 'First post', :profile_id => community.id, :parent_id => forum.id, :author_id => author.id)
login_as(author.identifier)
get :view_page, :profile => community.identifier, :page => post.path.split('/')
@@ -971,7 +971,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'add meta tag to rss feed on view post forum' do
login_as(profile.identifier)
profile.articles << Forum.new(:name => 'Forum', :profile => profile)
- profile.forum.posts << TextileArticle.new(:name => 'first post', :parent => profile.forum, :profile => profile)
+ profile.forum.posts << TextArticle.new(:name => 'first post', :parent => profile.forum, :profile => profile)
get :view_page, :profile => profile.identifier, :page => ['forum', 'first-post']
assert_tag :tag => 'link', :attributes => { :rel => 'alternate', :type => 'application/rss+xml', :title => 'Forum', :href => "http://#{environment.default_hostname}/testinguser/forum/feed" }
end
@@ -986,7 +986,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should "not display 'Upload files' when viewing post from a forum" do
login_as(profile.identifier)
b = Forum.create!(:name => 'article folder', :profile => profile)
- forum_post = TextileArticle.create!(:name => 'children-article', :profile => profile, :parent => b)
+ forum_post = TextArticle.create!(:name => 'children-article', :profile => profile, :parent => b)
xhr :get, :view_page, :profile => profile.identifier, :page => forum_post.path, :toolbar => true
assert_no_tag :tag => 'a', :content => 'Upload files', :attributes => {:href => /parent_id=#{b.id}/}
end
@@ -1002,9 +1002,9 @@ class ContentViewerControllerTest < ActionController::TestCase
environment.languages = ['en']
environment.save
login_as @profile.identifier
- textile = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')
+ textile = fast_create(TextArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')
xhr :get, :view_page, :profile => @profile.identifier, :page => textile.path, :toolbar => true
- assert_tag :a, :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?article%5Btranslation_of_id%5D=#{textile.id}&type=#{TextileArticle}" }
+ assert_tag :a, :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?article%5Btranslation_of_id%5D=#{textile.id}&type=#{TextArticle}" }
end
should 'not display add translation link if article is not translatable' do
@@ -1016,22 +1016,22 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'not display add translation link if article hasnt a language defined' do
login_as @profile.identifier
- textile = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile')
+ textile = fast_create(TextArticle, :profile_id => @profile.id, :path => 'textile')
xhr :get, :view_page, :profile => @profile.identifier, :page => textile.path, :toolbar => true
assert_no_tag :a, :attributes => { :content => 'Add translation', :class => /icon-locale/ }
end
should 'display translations link if article has translations' do
login_as @profile.identifier
- textile = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')
- translation = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'translation', :language => 'es', :translation_of_id => textile)
+ textile = fast_create(TextArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')
+ translation = fast_create(TextArticle, :profile_id => @profile.id, :path => 'translation', :language => 'es', :translation_of_id => textile)
xhr :get, :view_page, :profile => @profile.identifier, :page => textile.path, :toolbar => true
assert_tag :a, :attributes => { :class => /article-translations-menu/, :onmouseover => /toggleSubmenu/ }
end
should 'not be redirected if already in translation' do
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
@request.env['HTTP_REFERER'] = "http://localhost:3000/#{@profile.identifier}/#{es_article.path}"
FastGettext.stubs(:locale).returns('es')
get :view_page, :profile => @profile.identifier, :page => es_article.path
@@ -1041,15 +1041,15 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'not be redirected if article does not have a language' do
FastGettext.stubs(:locale).returns('es')
- article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'article')
+ article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'article')
get :view_page, :profile => @profile.identifier, :page => article.path
assert_response :success
assert_equal article, assigns(:page)
end
should 'not be redirected if http_referer is a translation' do
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
@request.env['HTTP_REFERER'] = "http://localhost:3000/#{@profile.identifier}/#{es_article.path}"
FastGettext.stubs(:locale).returns('es')
get :view_page, :profile => @profile.identifier, :page => en_article.path
@@ -1058,8 +1058,8 @@ class ContentViewerControllerTest < ActionController::TestCase
end
should 'not be redirected to transition if came from edit' do
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
FastGettext.stubs(:locale).returns('es')
@request.env['HTTP_REFERER'] = "http://localhost/myprofile/#{@profile.identifier}/cms/edit/#{en_article.id}"
get :view_page, :profile => @profile.identifier, :page => es_article.path
@@ -1068,8 +1068,8 @@ class ContentViewerControllerTest < ActionController::TestCase
end
should 'not be redirected to transition if came from new' do
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
FastGettext.stubs(:locale).returns('es')
@request.env['HTTP_REFERER'] = "http://localhost/myprofile/#{@profile.identifier}/cms/new"
get :view_page, :profile => @profile.identifier, :page => es_article.path
@@ -1082,8 +1082,8 @@ class ContentViewerControllerTest < ActionController::TestCase
blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
blog.display_posts_in_current_language = true
blog.save
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
get :view_page, :profile => @profile.identifier, :page => blog.path
assert_tag :div, :attributes => { :id => "post-#{es_article.id}" }
@@ -1095,12 +1095,12 @@ class ContentViewerControllerTest < ActionController::TestCase
blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
blog.display_posts_in_current_language = true
blog.save
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
- pt_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'pt', :parent_id => blog.id, :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
+ pt_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'pt', :parent_id => blog.id, :translation_of_id => en_article)
- en_article2 = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
- es_article2 = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article2)
+ en_article2 = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
+ es_article2 = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article2)
get :view_page, :profile => @profile.identifier, :page => blog.path
@@ -1111,8 +1111,8 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'list all posts at blog listing if blog option is disabled' do
FastGettext.stubs(:locale).returns('es')
blog = Blog.create!(:name => 'A blog test', :profile => profile, :display_posts_in_current_language => false)
- blog.posts << es_post = TextileArticle.create!(:name => 'Spanish Post', :profile => profile, :parent => blog, :language => 'es')
- blog.posts << en_post = TextileArticle.create!(:name => 'English Post', :profile => profile, :parent => blog, :language => 'en', :translation_of_id => es_post.id)
+ blog.posts << es_post = TextArticle.create!(:name => 'Spanish Post', :profile => profile, :parent => blog, :language => 'es')
+ blog.posts << en_post = TextArticle.create!(:name => 'English Post', :profile => profile, :parent => blog, :language => 'en', :translation_of_id => es_post.id)
get :view_page, :profile => profile.identifier, :page => [blog.path]
assert_equal 2, assigns(:posts).size
assert_tag :div, :attributes => { :id => "post-#{es_post.id}" }
@@ -1124,8 +1124,8 @@ class ContentViewerControllerTest < ActionController::TestCase
blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
blog.display_posts_in_current_language = true
blog.save!
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
blog.posts = [en_article, es_article]
get :view_page, :profile => @profile.identifier, :page => blog.path
@@ -1177,7 +1177,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'add an zero width space every 4 caracters of comment urls' do
url = 'www.an.url.to.be.splited.com'
- a = fast_create(TextileArticle, :profile_id => @profile.id, :language => 'en')
+ a = fast_create(TextArticle, :profile_id => @profile.id, :language => 'en')
c = a.comments.create!(:author => @profile, :title => 'An url', :body => url)
get :view_page, :profile => @profile.identifier, :page => a.path
assert_tag :a, :attributes => { :href => "http://" + url}, :content => url.scan(/.{4}/).join('')
@@ -1375,7 +1375,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'not escape acceptable HTML in list of blog posts' do
login_as('testinguser')
blog = Blog.create!(:name => 'A blog test', :profile => profile)
- blog.posts << TinyMceArticle.create!(
+ blog.posts << TextArticle.create!(
:name => 'Post',
:profile => profile,
:parent => blog,
@@ -1443,7 +1443,7 @@ class ContentViewerControllerTest < ActionController::TestCase
blog = community.articles.find_by(name: "Blog")
- article = TinyMceArticle.create(:name => 'Article to be shared with images',
+ article = TextArticle.create(:name => 'Article to be shared with images',
:body => 'This article should be shared with all social networks',
:profile => community,
:published => false,
@@ -1571,7 +1571,7 @@ class ContentViewerControllerTest < ActionController::TestCase
blog.visualization_format = 'compact'
blog.save!
- article = TinyMceArticle.create(:name => 'Article to be shared with images',
+ article = TextArticle.create(:name => 'Article to be shared with images',
:body => 'This article should be shared with all social networks',
:profile => @profile,
:published => false,
diff --git a/test/functional/enterprise_registration_controller_test.rb b/test/functional/enterprise_registration_controller_test.rb
index d9abdc8..4d18884 100644
--- a/test/functional/enterprise_registration_controller_test.rb
+++ b/test/functional/enterprise_registration_controller_test.rb
@@ -58,7 +58,7 @@ class EnterpriseRegistrationControllerTest < ActionController::TestCase
region = fast_create(Region, {})
template = Enterprise.create!(:name => 'Enterprise Template', :identifier => 'enterprise-template', :is_template => true)
- welcome_page = TinyMceArticle.create!(:name => 'Welcome Page', :profile => template, :body => 'This is the welcome page of enterprise template.', :published => true)
+ welcome_page = TextArticle.create!(:name => 'Welcome Page', :profile => template, :body => 'This is the welcome page of enterprise template.', :published => true)
template.welcome_page = welcome_page
template.save!
diff --git a/test/functional/home_controller_test.rb b/test/functional/home_controller_test.rb
index 7b15e22..292276b 100644
--- a/test/functional/home_controller_test.rb
+++ b/test/functional/home_controller_test.rb
@@ -47,14 +47,14 @@ class HomeControllerTest < ActionController::TestCase
env = Environment.default
env.enable('use_portal_community')
c = fast_create(Community)
- a1 = TextileArticle.create!(:name => "Article 1",
+ a1 = TextArticle.create!(:name => "Article 1",
:profile => c,
:abstract => "This is the article1 lead.",
- :body => "This is the article1 body.",
+ :body => "
test 
'
assert_includes a.body_images_paths, 'http://noosfero.com/test.png'
assert_includes a.body_images_paths, 'http://test.com/noosfero.png'
@@ -1493,7 +1489,7 @@ class ArticleTest < ActiveSupport::TestCase
should 'always put article image first in images paths list in article body' do
Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
- a = create(TinyMceArticle, :name => 'test', :image_builder => {
+ a = create(TextArticle, :name => 'test', :image_builder => {
:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')
}, :profile_id => @profile.id)
a.save!
@@ -1504,7 +1500,7 @@ class ArticleTest < ActiveSupport::TestCase
should 'escape utf8 characters correctly' do
Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
- a = build TinyMceArticle, profile: @profile
+ a = build TextArticle, profile: @profile
a.body = 'Noosfero 
'
assert_includes a.body_images_paths, 'http://noosfero.com/cabe%C3%A7a.png'
@@ -1515,7 +1511,7 @@ class ArticleTest < ActiveSupport::TestCase
should 'get absolute images paths in article body' do
Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
- a = build TinyMceArticle, :profile => @profile
+ a = build TextArticle, :profile => @profile
a.body = 'Noosfero 
test 
'
assert_includes a.body_images_paths, 'http://noosfero.org/test.png'
assert_includes a.body_images_paths, 'http://noosfero.org/relative/path.png'
@@ -1545,13 +1541,13 @@ class ArticleTest < ActiveSupport::TestCase
should 'find more recent contents' do
Article.delete_all
- c1 = fast_create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id, :created_at => DateTime.now - 4)
- c2 = fast_create(TinyMceArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile_id => profile.id, :created_at => DateTime.now - 1)
- c3 = fast_create(TinyMceArticle, :name => 'Testing article 3', :body => 'Article body 3', :profile_id => profile.id, :created_at => DateTime.now - 3)
+ c1 = fast_create(TextArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id, :created_at => DateTime.now - 4)
+ c2 = fast_create(TextArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile_id => profile.id, :created_at => DateTime.now - 1)
+ c3 = fast_create(TextArticle, :name => 'Testing article 3', :body => 'Article body 3', :profile_id => profile.id, :created_at => DateTime.now - 3)
assert_equal [c2,c3,c1] , Article.more_recent
- c4 = fast_create(TinyMceArticle, :name => 'Testing article 4', :body => 'Article body 4', :profile_id => profile.id, :created_at => DateTime.now - 2)
+ c4 = fast_create(TextArticle, :name => 'Testing article 4', :body => 'Article body 4', :profile_id => profile.id, :created_at => DateTime.now - 2)
assert_equal [c2,c4,c3,c1] , Article.more_recent
end
@@ -1604,18 +1600,6 @@ class ArticleTest < ActiveSupport::TestCase
assert_equal "4 views", a.more_popular_label
end
- should 'return only text articles' do
- Article.delete_all
-
- c1 = fast_create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id)
- c2 = fast_create(TextArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile_id => profile.id)
- c3 = fast_create(Event, :name => 'Testing article 3', :body => 'Article body 3', :profile_id => profile.id)
- c4 = fast_create(RssFeed, :name => 'Testing article 4', :body => 'Article body 4', :profile_id => profile.id)
- c5 = fast_create(TextileArticle, :name => 'Testing article 5', :body => 'Article body 5', :profile_id => profile.id)
-
- assert_equivalent [c1,c2,c5], Article.text_articles
- end
-
should 'delegate region info to profile' do
Person.any_instance.expects(:region)
Person.any_instance.expects(:region_id)
@@ -1708,7 +1692,7 @@ class ArticleTest < ActiveSupport::TestCase
author = fast_create(Person)
community.add_member(author)
forum = Forum.create(:profile => community, :name => 'Forum test', :body => 'Forum test')
- post = fast_create(TextileArticle, :name => 'First post', :profile_id => community.id, :parent_id => forum.id, :author_id => author.id)
+ post = fast_create(TextArticle, :name => 'First post', :profile_id => community.id, :parent_id => forum.id, :author_id => author.id)
assert post.allow_edit?(author)
end
@@ -1742,7 +1726,7 @@ class ArticleTest < ActiveSupport::TestCase
end
should 'store first image in tracked action' do
- a = create TinyMceArticle, :name => 'Tracked Article', :body => '
<%= c_('Fields') %>
diff --git a/plugins/delivery/views/delivery_plugin/admin_method/_edit.html.slim b/plugins/delivery/views/delivery_plugin/admin_method/_edit.html.slim index a1f5b24..9a14d56 100644 --- a/plugins/delivery/views/delivery_plugin/admin_method/_edit.html.slim +++ b/plugins/delivery/views/delivery_plugin/admin_method/_edit.html.slim @@ -12,7 +12,7 @@ = labelled_field f, :name, t('delivery_plugin.models.method.name'), f.text_field(:name), help: t('delivery_plugin.models.method.name_help') = labelled_field f, :description, t('delivery_plugin.models.method.instructions'), - f.text_area(:description, rows: 5, class: 'mceEditor'), help: t('delivery_plugin.models.method.instructions_help') + f.text_area(:description, rows: 5, class: current_editor('simple')), help: t('delivery_plugin.models.method.instructions_help') fieldset legend= t'delivery_plugin.models.method.costs_legend' @@ -34,5 +34,3 @@ = submit_button :save, if delivery_method.new_record? then t('delivery_plugin.views.method.edit.add') else t('delivery_plugin.views.method.edit.save') end = link_to_function t('delivery_plugin.views.method.edit.back'), "delivery.method.view.toggle()" -= render file: 'shared/tiny_mce', locals: {mode: 'simple'} - diff --git a/plugins/display_content/lib/display_content_block.rb b/plugins/display_content/lib/display_content_block.rb index 6a76499..3e9c72c 100644 --- a/plugins/display_content/lib/display_content_block.rb +++ b/plugins/display_content/lib/display_content_block.rb @@ -24,7 +24,7 @@ class DisplayContentBlock < Block {:value => 'title', :checked => true}, {:value => 'abstract', :checked => true}] settings_items :display_folder_children, :type => :boolean, :default => true - settings_items :types, :type => Array, :default => ['TextileArticle', 'TinyMceArticle', 'RawHTMLArticle'] + settings_items :types, :type => Array, :default => ['TextArticle'] settings_items :order_by_recent, :type => :boolean, :default => :true settings_items :content_with_translations, :type => :boolean, :default => :true settings_items :limit_to_show, :type => :integer, :default => 6 @@ -61,7 +61,7 @@ class DisplayContentBlock < Block end def available_content_types - @available_content_types ||= [TinyMceArticle, RawHTMLArticle, TextileArticle, UploadedFile, Event, Folder, Blog, Forum, Gallery, RssFeed] + plugins.dispatch(:content_types) + @available_content_types ||= [TextArticle, UploadedFile, Event, Folder, Blog, Forum, Gallery, RssFeed] + plugins.dispatch(:content_types) checked_types = types.map {|t| t.constantize} checked_types + (@available_content_types - checked_types) end @@ -108,7 +108,7 @@ class DisplayContentBlock < Block @parent_nodes ||= self.holder.articles.where(:id => nodes).map { |article| get_parent(article) }.compact.flatten end - VALID_CONTENT = ['RawHTMLArticle', 'TextArticle', 'TextileArticle', 'TinyMceArticle', 'Folder', 'Blog', 'Forum'] + VALID_CONTENT = ['TextArticle', 'Folder', 'Blog', 'Forum'] include Noosfero::Plugin::HotSpot diff --git a/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb b/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb index adf2a3b..18b0c78 100644 --- a/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb +++ b/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb @@ -39,7 +39,7 @@ class DisplayContentPluginAdminControllerTest < ActionController::TestCase should 'index action returns an json with node content' do Article.delete_all - article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id) + article = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id) get :index, :block_id => block.id json_response = ActiveSupport::JSON.decode(@response.body) @@ -51,7 +51,7 @@ class DisplayContentPluginAdminControllerTest < ActionController::TestCase should 'index action returns an json with node checked if the node is in the nodes list' do Article.delete_all - article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id) + article = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id) block.nodes= [article.id] block.save! @@ -67,8 +67,8 @@ class DisplayContentPluginAdminControllerTest < ActionController::TestCase should 'index action returns an json with node undetermined if the node is in the parent nodes list' do Article.delete_all f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id) - article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id) - article2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id) + article = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id) + article2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id) block.nodes = [article.id] block.save! @@ -81,7 +81,7 @@ class DisplayContentPluginAdminControllerTest < ActionController::TestCase should 'index action returns an json with node closed if the node has article with children' do Article.delete_all f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id) - article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id) + article = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id) get :index, :block_id => block.id json_response = ActiveSupport::JSON.decode(@response.body) @@ -95,8 +95,8 @@ class DisplayContentPluginAdminControllerTest < ActionController::TestCase should 'index action returns an json with all the children nodes if some parent is in the parents list' do Article.delete_all f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id) - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id) block.checked_nodes= {a1.id => true} block.save! @@ -118,9 +118,9 @@ class DisplayContentPluginAdminControllerTest < ActionController::TestCase should 'index action returns an json with all the children nodes and root nodes if some parent is in the parents list and there is others root articles' do Article.delete_all f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id) - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => environment.portal_community.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => environment.portal_community.id) block.checked_nodes= {a2.id => true, a3.id => true} block.save! @@ -148,9 +148,9 @@ class DisplayContentPluginAdminControllerTest < ActionController::TestCase should 'index action returns an json without children nodes if the parent is not in the parents list' do Article.delete_all f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id) - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => environment.portal_community.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => environment.portal_community.id) get :index, :block_id => block.id json_response = ActiveSupport::JSON.decode(@response.body) diff --git a/plugins/display_content/test/functional/display_content_plugin_myprofile_controller_test.rb b/plugins/display_content/test/functional/display_content_plugin_myprofile_controller_test.rb index e7cbbeb..c963712 100644 --- a/plugins/display_content/test/functional/display_content_plugin_myprofile_controller_test.rb +++ b/plugins/display_content/test/functional/display_content_plugin_myprofile_controller_test.rb @@ -40,7 +40,7 @@ class DisplayContentPluginMyprofileControllerTest < ActionController::TestCase should 'index action returns an json with node content' do Article.delete_all - article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) + article = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) get :index, :block_id => block.id, :profile => profile.identifier json_response = ActiveSupport::JSON.decode(@response.body) @@ -52,7 +52,7 @@ class DisplayContentPluginMyprofileControllerTest < ActionController::TestCase should 'index action returns an json with node checked if the node is in the nodes list' do Article.delete_all - article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) + article = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) block.nodes= [article.id] block.save! @@ -68,8 +68,8 @@ class DisplayContentPluginMyprofileControllerTest < ActionController::TestCase should 'index action returns an json with node undetermined if the node is in the parent nodes list' do Article.delete_all f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id) - article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id) - article2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id) + article = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id) + article2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id) block.nodes = [article.id] block.save! @@ -82,7 +82,7 @@ class DisplayContentPluginMyprofileControllerTest < ActionController::TestCase should 'index action returns an json with node closed if the node has article with children' do Article.delete_all f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id) - article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id) + article = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id) block.save! get :index, :block_id => block.id, :profile => profile.identifier @@ -97,8 +97,8 @@ class DisplayContentPluginMyprofileControllerTest < ActionController::TestCase should 'index action returns an json with all the children nodes if some parent is in the parents list' do Article.delete_all f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id) - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id) block.checked_nodes = {a1.id => true} block.save! @@ -120,9 +120,9 @@ class DisplayContentPluginMyprofileControllerTest < ActionController::TestCase should 'index action returns an json with all the children nodes and root nodes if some parent is in the parents list and there is others root articles' do Article.delete_all f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id) - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id) block.checked_nodes = {a1.id => true} block.save! @@ -150,9 +150,9 @@ class DisplayContentPluginMyprofileControllerTest < ActionController::TestCase should 'index action returns an json without children nodes if the parent is not in the parents list' do Article.delete_all f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id) - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id) get :index, :block_id => block.id, :profile => profile.identifier json_response = ActiveSupport::JSON.decode(@response.body) 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 4a73a96..bd4849b 100644 --- a/plugins/display_content/test/unit/display_content_block_test.rb +++ b/plugins/display_content/test/unit/display_content_block_test.rb @@ -2,7 +2,7 @@ require_relative '../test_helper' class DisplayContentBlockTest < ActiveSupport::TestCase INVALID_KIND_OF_ARTICLE = [Event, RssFeed, UploadedFile, Gallery] - VALID_KIND_OF_ARTICLE = [RawHTMLArticle, TextArticle, TextileArticle, TinyMceArticle, Folder, Blog, Forum] + VALID_KIND_OF_ARTICLE = [TextArticle, Folder, Blog, Forum] should 'describe itself' do assert_not_equal Block.description, DisplayContentBlock.description @@ -39,9 +39,9 @@ class DisplayContentBlockTest < ActiveSupport::TestCase should 'nodes be the article ids in hash of checked nodes' do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id) checked_articles= {a1.id => true, a2.id => true, a3.id => false} block = DisplayContentBlock.new @@ -54,9 +54,9 @@ class DisplayContentBlockTest < ActiveSupport::TestCase should 'nodes be save in database' do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id) checked_articles= {a1.id => true, a2.id => true, a3.id => false} block = DisplayContentBlock.new @@ -71,10 +71,10 @@ class DisplayContentBlockTest < ActiveSupport::TestCase should 'be able to update nodes' do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id) - a4 = fast_create(TextileArticle, :name => 'test article 4', :profile_id => profile.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id) + a4 = fast_create(TextArticle, :name => 'test article 4', :profile_id => profile.id) checked_articles= {a1.id => true, a2.id => true, a3.id => false} block = DisplayContentBlock.new @@ -95,13 +95,13 @@ class DisplayContentBlockTest < ActiveSupport::TestCase should "save selected folders and articles" do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id) f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id) f2 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id, :parent_id => f1.id) - a4 = fast_create(TextileArticle, :name => 'test article 4', :profile_id => profile.id, :parent_id => f2.id) - a5 = fast_create(TextileArticle, :name => 'test article 5', :profile_id => profile.id, :parent_id => f2.id) + a4 = fast_create(TextArticle, :name => 'test article 4', :profile_id => profile.id, :parent_id => f2.id) + a5 = fast_create(TextArticle, :name => 'test article 5', :profile_id => profile.id, :parent_id => f2.id) checked_articles= {a1.id => true, a2.id => true, f1.id => false} @@ -115,13 +115,13 @@ class DisplayContentBlockTest < ActiveSupport::TestCase should "save selected articles and blogs" do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id) b1 = fast_create(Blog, :name => 'test blog 1', :profile_id => profile.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => b1.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => b1.id) b2 = fast_create(Blog, :name => 'test blog 2', :profile_id => profile.id) - a4 = fast_create(TextileArticle, :name => 'test article 4', :profile_id => profile.id, :parent_id => b2.id) - a5 = fast_create(TextileArticle, :name => 'test article 5', :profile_id => profile.id, :parent_id => b2.id) + a4 = fast_create(TextArticle, :name => 'test article 4', :profile_id => profile.id, :parent_id => b2.id) + a5 = fast_create(TextArticle, :name => 'test article 5', :profile_id => profile.id, :parent_id => b2.id) checked_articles= {a1.id => true, a2.id => true, b1.id => false, b2.id => true} @@ -132,36 +132,10 @@ class DisplayContentBlockTest < ActiveSupport::TestCase assert_equivalent [a1.id, a2.id, b1.id, b2.id], block.nodes end - should 'TextileArticle be saved as node' do + should 'TextArticle be saved as node' do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) - - checked_articles= {a1.id => true} - block = DisplayContentBlock.new - block.stubs(:holder).returns(profile) - block.checked_nodes= checked_articles - assert_equal [], [a1.id] - block.nodes - assert_equal [], block.nodes - [a1.id] - end - - should 'TinyMceArticle be saved as node' do - profile = create_user('testuser').person - Article.delete_all - a1 = fast_create(TinyMceArticle, :name => 'test article 1', :profile_id => profile.id) - - checked_articles= {a1.id => true} - block = DisplayContentBlock.new - block.stubs(:holder).returns(profile) - block.checked_nodes= checked_articles - assert_equal [], [a1.id] - block.nodes - assert_equal [], block.nodes - [a1.id] - end - - should 'RawHTMLArticle be saved as node' do - profile = create_user('testuser').person - Article.delete_all - a1 = fast_create(RawHTMLArticle, :name => 'test article 1', :profile_id => profile.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) checked_articles= {a1.id => true} block = DisplayContentBlock.new @@ -230,9 +204,9 @@ class DisplayContentBlockTest < ActiveSupport::TestCase should "return all root articles from profile" do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id) block = DisplayContentBlock.new block.nodes= [a1.id, a2.id, a3.id] @@ -247,9 +221,9 @@ class DisplayContentBlockTest < ActiveSupport::TestCase should "return all children of an articles's profile" do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id) block = DisplayContentBlock.new box = mock() @@ -264,9 +238,9 @@ class DisplayContentBlockTest < ActiveSupport::TestCase profile = fast_create(Community, :name => 'my test community', :identifier => 'mytestcommunity') environment = Environment.default Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id) block = DisplayContentBlock.new box = mock() @@ -283,9 +257,9 @@ class DisplayContentBlockTest < ActiveSupport::TestCase profile = fast_create(Community, :name => 'my test community', :identifier => 'mytestcommunity') environment = Environment.default Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id) block = DisplayContentBlock.new box = mock() @@ -404,9 +378,9 @@ class DisplayContentBlockTest < ActiveSupport::TestCase profile = create_user('testuser').person Article.delete_all f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id) - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f1.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f1.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id) checked_articles= {f1.id => true, a1.id => true, a2.id => true, a3.id => false} block = DisplayContentBlock.new @@ -420,9 +394,9 @@ class DisplayContentBlockTest < ActiveSupport::TestCase profile = create_user('testuser').person Article.delete_all f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id) - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f1.id) - a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f1.id) + a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id) checked_articles= {f1.id => true, a1.id => true, a2.id => true, a3.id => false} block = DisplayContentBlock.new @@ -472,37 +446,37 @@ class DisplayContentBlockTest < ActiveSupport::TestCase should 'return available content types with checked types first' do Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([]) block = DisplayContentBlock.create! - block.types = ['TinyMceArticle'] + block.types = ['TextArticle'] - block.types = ['TinyMceArticle', 'Folder'] - assert_equivalent [TinyMceArticle, Folder, UploadedFile, Event, TextileArticle, RawHTMLArticle, Blog, Forum, Gallery, RssFeed], block.available_content_types + block.types = ['TextArticle', 'Folder'] + assert_equivalent [TextArticle, Folder, UploadedFile, Event, Blog, Forum, Gallery, RssFeed], block.available_content_types end should 'return available content types' do Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([]) block = DisplayContentBlock.create! - block.types = ['TinyMceArticle'] + block.types = ['TextArticle'] block.types = [] - assert_equivalent [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed], block.available_content_types + assert_equivalent [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed], block.available_content_types end should 'return first 2 content types' do Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([]) block = DisplayContentBlock.create! - block.types = ['TinyMceArticle'] + block.types = ['TextArticle'] assert_equal 2, block.first_content_types.length end should 'return all but first 2 content types' do Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([]) block = DisplayContentBlock.create! - block.types = ['TinyMceArticle'] + block.types = ['TextArticle'] assert_equal block.available_content_types.length - 2, block.more_content_types.length end should 'return 2 as default value for first_types_count' do block = DisplayContentBlock.create! - block.types = ['TinyMceArticle'] + block.types = ['TextArticle'] assert_equal 2, block.first_types_count end @@ -527,14 +501,14 @@ class DisplayContentBlockTest < ActiveSupport::TestCase Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new]) block.types = [] - assert_equivalent [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], block.available_content_types + assert_equivalent [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], block.available_content_types end should 'do not fail if a selected article was removed' do profile = create_user('testuser').person Article.delete_all f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id) - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id) checked_articles= {a1.id => true} @@ -547,16 +521,16 @@ class DisplayContentBlockTest < ActiveSupport::TestCase end -require 'boxes_helper' - class DisplayContentBlockViewTest < ActionView::TestCase include BoxesHelper + include DatesHelper + helper :dates should 'list links for all articles title defined in nodes' do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id) block = DisplayContentBlock.new block.sections = [{:value => 'title', :checked => true}] @@ -572,8 +546,8 @@ class DisplayContentBlockViewTest < ActionView::TestCase should 'list content for all articles lead defined in nodes' do profile = create_user('testuser').person Article.delete_all - 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') + 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') block = DisplayContentBlock.new block.sections = [{:value => 'abstract', :checked => true}] @@ -602,7 +576,7 @@ class DisplayContentBlockViewTest < ActionView::TestCase should 'show title if defined by user' do profile = create_user('testuser').person - a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id) + a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id) block = DisplayContentBlock.new block.nodes = [a.id] @@ -616,7 +590,7 @@ class DisplayContentBlockViewTest < ActionView::TestCase should 'show abstract if defined by user' do profile = create_user('testuser').person - a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'some abstract') + a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'some abstract') block = DisplayContentBlock.new block.nodes = [a.id] @@ -630,7 +604,7 @@ class DisplayContentBlockViewTest < ActionView::TestCase should 'show body if defined by user' do profile = create_user('testuser').person - a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body') + a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body') block = DisplayContentBlock.new block.nodes = [a.id] @@ -642,7 +616,7 @@ class DisplayContentBlockViewTest < ActionView::TestCase assert_match /#{a.body}/, render_block_content(block) end - should 'show publishd date if defined by user' do + should 'show published date 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') @@ -658,7 +632,7 @@ class DisplayContentBlockViewTest < ActionView::TestCase should 'show image if defined by user' do profile = create_user('testuser').person - a = create(TinyMceArticle, :name => 'test article 1', :profile_id => profile.id, :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')}) + a = create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')}) a.save! process_delayed_job_queue @@ -676,8 +650,8 @@ class DisplayContentBlockViewTest < ActionView::TestCase should 'show articles in recent order' do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1)) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1)) block = DisplayContentBlock.new block.sections = [{:value => 'title', :checked => true}] @@ -697,8 +671,8 @@ class DisplayContentBlockViewTest < ActionView::TestCase should 'show articles in oldest order' do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1)) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1)) block = DisplayContentBlock.new block.sections = [{:value => 'title', :checked => true}] @@ -718,8 +692,8 @@ class DisplayContentBlockViewTest < ActionView::TestCase should 'show articles in recent order with limit option' do profile = create_user('testuser').person Article.delete_all - a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current) - a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1)) + a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current) + a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1)) block = DisplayContentBlock.new block.sections = [{:value => 'title', :checked => true}] @@ -741,10 +715,10 @@ class DisplayContentBlockViewTest < ActionView::TestCase profile = create_user('testuser').person Article.delete_all - en_article = fast_create(TextileArticle, :profile_id => profile.id, :name => 'en_article', :language => 'en') - en_article2 = fast_create(TextileArticle, :profile_id => profile.id, :name => 'en_article 2', :language => 'en') + en_article = fast_create(TextArticle, :profile_id => profile.id, :name => 'en_article', :language => 'en') + en_article2 = fast_create(TextArticle, :profile_id => profile.id, :name => 'en_article 2', :language => 'en') - pt_article = fast_create TextileArticle, profile_id: profile.id, name: 'pt_article', language: 'pt', translation_of_id: en_article.id + pt_article = fast_create TextArticle, profile_id: profile.id, name: 'pt_article', language: 'pt', translation_of_id: en_article.id block = DisplayContentBlock.new block.sections = [{:value => 'title', :checked => true}] @@ -771,8 +745,8 @@ class DisplayContentBlockViewTest < ActionView::TestCase profile = create_user('testuser').person Article.delete_all - en_article = fast_create(TextileArticle, :profile_id => profile.id, :name => 'en_article', :language => 'en') - pt_article = fast_create(TextileArticle, :profile_id => profile.id, :name => 'pt_article', :language => 'pt', :translation_of_id => en_article) + en_article = fast_create(TextArticle, :profile_id => profile.id, :name => 'en_article', :language => 'en') + pt_article = fast_create(TextArticle, :profile_id => profile.id, :name => 'pt_article', :language => 'pt', :translation_of_id => en_article) block = DisplayContentBlock.new block.sections = [{:value => 'title', :checked => true}] @@ -794,7 +768,7 @@ class DisplayContentBlockViewTest < ActionView::TestCase should 'not escape abstract html of articles' do profile = create_user('testuser').person - a1 = fast_create(TextileArticle, abstract: "Test
", name: 'test article 1', profile_id: profile.id, published_at: DateTime.current) + a1 = fast_create(TextArticle, abstract: "Test
", name: 'test article 1', profile_id: profile.id, published_at: DateTime.current) block = DisplayContentBlock.new block.sections = [{:value => 'abstract', :checked => true}] @@ -807,7 +781,7 @@ class DisplayContentBlockViewTest < ActionView::TestCase should 'not raise if abstract of article is nil' do profile = create_user('testuser').person - a1 = fast_create(TextileArticle, name: 'test article 1', profile_id: profile.id, published_at: DateTime.current) + a1 = fast_create(TextArticle, name: 'test article 1', profile_id: profile.id, published_at: DateTime.current) block = DisplayContentBlock.new block.sections = [{:value => 'abstract', :checked => true}] @@ -823,7 +797,7 @@ class DisplayContentBlockViewTest < ActionView::TestCase should 'not escape body html of articles' do profile = create_user('testuser').person - a1 = fast_create(TextileArticle, body: "Test
", name: 'test article 1', profile_id: profile.id, published_at: DateTime.current) + a1 = fast_create(TextArticle, body: "Test
", name: 'test article 1', profile_id: profile.id, published_at: DateTime.current) block = DisplayContentBlock.new block.sections = [{:value => 'body', :checked => true}] @@ -836,7 +810,7 @@ class DisplayContentBlockViewTest < ActionView::TestCase should 'not raise if body of article is nil' do profile = create_user('testuser').person - a1 = fast_create(TextileArticle, name: 'test article 1', profile_id: profile.id, published_at: DateTime.current) + a1 = fast_create(TextArticle, name: 'test article 1', profile_id: profile.id, published_at: DateTime.current) block = DisplayContentBlock.new block.sections = [{:value => 'abstract', :checked => true}] diff --git a/plugins/fb_app/views/fb_app_plugin_page_tab/_configure_form.html.slim b/plugins/fb_app/views/fb_app_plugin_page_tab/_configure_form.html.slim index 3f3ffa7..6c4e76e 100644 --- a/plugins/fb_app/views/fb_app_plugin_page_tab/_configure_form.html.slim +++ b/plugins/fb_app/views/fb_app_plugin_page_tab/_configure_form.html.slim @@ -15,7 +15,7 @@ = f.text_field :title, class: 'form-control' = f.label :subtitle, t("fb_app_plugin.views.myprofile.catalogs.catalog_subtitle_label") - = f.text_area :subtitle, class: 'form-control mceEditor', id: "page-tab-subtitle-#{page_tab.id}" + = f.text_area :subtitle, class: 'form-control ' + current_editor, id: "page-tab-subtitle-#{page_tab.id}" = f.label :config_type, t("fb_app_plugin.views.myprofile.catalogs.catalog_type_chooser_label") = f.select :config_type, diff --git a/plugins/mark_comment_as_read/test/functional/mark_comment_as_read_plugin_profile_controller_test.rb b/plugins/mark_comment_as_read/test/functional/mark_comment_as_read_plugin_profile_controller_test.rb index e1d8559..359d461 100644 --- a/plugins/mark_comment_as_read/test/functional/mark_comment_as_read_plugin_profile_controller_test.rb +++ b/plugins/mark_comment_as_read/test/functional/mark_comment_as_read_plugin_profile_controller_test.rb @@ -6,7 +6,7 @@ class MarkCommentAsReadPluginProfileControllerTest < ActionController::TestCase @controller = MarkCommentAsReadPluginProfileController.new @profile = create_user('profile').person - @article = TinyMceArticle.create!(:profile => @profile, :name => 'An article') + @article = TextArticle.create!(:profile => @profile, :name => 'An article') @comment = Comment.new(:source => @article, :author => @profile, :body => 'test') @comment.save! login_as(@profile.identifier) diff --git a/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_plugin/comment_test.rb b/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_plugin/comment_test.rb index c925791..97b7a73 100644 --- a/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_plugin/comment_test.rb +++ b/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_plugin/comment_test.rb @@ -4,7 +4,7 @@ class MarkCommentAsReadPlugin::CommentTest < ActiveSupport::TestCase def setup @person = create_user('user').person - @article = TinyMceArticle.create!(:profile => @person, :name => 'An article') + @article = TextArticle.create!(:profile => @person, :name => 'An article') @comment = Comment.create!(:title => 'title', :body => 'body', :author => @person, :source => @article) end diff --git a/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_test.rb b/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_test.rb index 5ae3130..fd78210 100644 --- a/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_test.rb +++ b/plugins/mark_comment_as_read/test/unit/mark_comment_as_read_test.rb @@ -5,7 +5,7 @@ class MarkCommentAsReadPluginTest < ActionView::TestCase def setup @plugin = MarkCommentAsReadPlugin.new @person = create_user('user').person - @article = TinyMceArticle.create!(:profile => @person, :name => 'An article') + @article = TextArticle.create!(:profile => @person, :name => 'An article') @comment = Comment.create!(:source => @article, :author => @person, :body => 'test') self.stubs(:user).returns(@person) self.stubs(:profile).returns(@person) diff --git a/plugins/metadata/test/functional/content_viewer_controller_test.rb b/plugins/metadata/test/functional/content_viewer_controller_test.rb index d6c88a7..c12a740 100644 --- a/plugins/metadata/test/functional/content_viewer_controller_test.rb +++ b/plugins/metadata/test/functional/content_viewer_controller_test.rb @@ -21,7 +21,7 @@ class ContentViewerControllerTest < ActionController::TestCase end should 'add meta tags with article info' do - a = TinyMceArticle.create(name: 'Article to be shared', body: 'This article should be shared with all social networks
', profile: profile) + a = TextArticle.create(name: 'Article to be shared', body: 'This article should be shared with all social networks
', profile: profile) get :view_page, profile: profile.identifier, page: [ a.name.to_slug ] @@ -37,7 +37,7 @@ class ContentViewerControllerTest < ActionController::TestCase end should 'add meta tags with article images' do - a = TinyMceArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks', profile: profile)
+ a = TextArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks ', profile: profile)
get :view_page, profile: profile.identifier, page: [ a.name.to_slug ]
assert_tag tag: 'meta', attributes: { name: 'twitter:image', content: /\/images\/x.png/ }
@@ -45,7 +45,7 @@ class ContentViewerControllerTest < ActionController::TestCase
end
should 'escape utf8 characters correctly' do
- a = TinyMceArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks ', profile: profile)
+ a = TextArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks ', profile: profile)
get :view_page, profile: profile.identifier, page: [ a.name.to_slug ]
assert_tag tag: 'meta', attributes: { property: 'og:image', content: /\/images\/%C3%A7.png/ }
@@ -63,7 +63,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'not expose metadata on private pages' do
profile.update_column :public_profile, false
- a = TinyMceArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks ', profile: profile)
+ a = TextArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks ', profile: profile)
get :view_page, profile: profile.identifier, page: [ a.name.to_slug ]
assert_no_tag tag: 'meta', attributes: { property: 'og:image', content: /\/images\/x.png/ }
diff --git a/plugins/newsletter/test/integration/safe_strings_test.rb b/plugins/newsletter/test/integration/safe_strings_test.rb
index 9d90f6e..11ad3ae 100644
--- a/plugins/newsletter/test/integration/safe_strings_test.rb
+++ b/plugins/newsletter/test/integration/safe_strings_test.rb
@@ -10,7 +10,7 @@ class NewsletterPluginSafeStringsTest < ActionDispatch::IntegrationTest
environment.add_admin(person)
blog = fast_create(Blog, :profile_id => person.id)
- post = fast_create(TextileArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post = fast_create(TextArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
newsletter = NewsletterPlugin::Newsletter.create!(:environment => environment, :person => person, :enabled => true)
newsletter.blog_ids = [blog.id]
newsletter.save!
diff --git a/plugins/newsletter/test/unit/newsletter_plugin_moderate_newsletter_test.rb b/plugins/newsletter/test/unit/newsletter_plugin_moderate_newsletter_test.rb
index 649f55d..6da4c79 100644
--- a/plugins/newsletter/test/unit/newsletter_plugin_moderate_newsletter_test.rb
+++ b/plugins/newsletter/test/unit/newsletter_plugin_moderate_newsletter_test.rb
@@ -28,9 +28,9 @@ class NewsletterPluginModerateNewsletterTest < ActiveSupport::TestCase
should 'set posts for mailing body on perform' do
person = create_user('john').person
blog = fast_create(Blog, profile_id: person.id)
- post_1 = fast_create(TextileArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
- post_2 = fast_create(TextileArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
- post_3 = fast_create(TextileArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_1 = fast_create(TextArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_2 = fast_create(TextArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_3 = fast_create(TextArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
newsletter = NewsletterPlugin::Newsletter.create!(:environment => person.environment, :person => person, :enabled => true)
newsletter.blog_ids = [blog.id]
diff --git a/plugins/newsletter/test/unit/newsletter_plugin_newsletter_test.rb b/plugins/newsletter/test/unit/newsletter_plugin_newsletter_test.rb
index 031c781..3be1b40 100644
--- a/plugins/newsletter/test/unit/newsletter_plugin_newsletter_test.rb
+++ b/plugins/newsletter/test/unit/newsletter_plugin_newsletter_test.rb
@@ -381,9 +381,9 @@ EOS
person = fast_create(Person)
blog = fast_create(Blog, profile_id: person.id)
- post_1 = fast_create(TextileArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
- post_2 = fast_create(TextileArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
- post_3 = fast_create(TextileArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_1 = fast_create(TextArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_2 = fast_create(TextArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_3 = fast_create(TextArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
newsletter = NewsletterPlugin::Newsletter.create!(
:environment => person.environment,
@@ -397,9 +397,9 @@ EOS
person = fast_create(Person)
blog = fast_create(Blog, profile_id: person.id)
- post_1 = fast_create(TextileArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
- post_2 = fast_create(TextileArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
- post_3 = fast_create(TextileArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_1 = fast_create(TextArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_2 = fast_create(TextArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+ post_3 = fast_create(TextArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
newsletter = NewsletterPlugin::Newsletter.create!(
:environment => person.environment,
diff --git a/plugins/newsletter/views/newsletter_plugin_admin/index.html.erb b/plugins/newsletter/views/newsletter_plugin_admin/index.html.erb
index cb756c0..415dded 100644
--- a/plugins/newsletter/views/newsletter_plugin_admin/index.html.erb
+++ b/plugins/newsletter/views/newsletter_plugin_admin/index.html.erb
@@ -1,7 +1,5 @@
<%= _('Newsletter settings') %>
-<%= render :file => 'shared/tiny_mce' %> - <%= error_messages_for :newsletter %> <%= form_for(:newsletter, html: { multipart: true }) do |f| %> @@ -81,7 +79,7 @@ content_tag('h3', ui_icon('ui-icon-triangle-1-s') + _('Newsletter footer'), :class => 'newsletter-toggle-link', :element_id => '#newsletter-footer-field'), content_tag('div', - f.text_area(:footer, :style => 'width: 100%', :class => 'mceEditor'), + f.text_area(:footer, :style => 'width: 100%', :class => current_editor), :id => 'newsletter-footer-field' )) %> diff --git a/plugins/open_graph/test/unit/open_graph_graph/publisher_test.rb b/plugins/open_graph/test/unit/open_graph_graph/publisher_test.rb index d73c3be..dd4c95f 100644 --- a/plugins/open_graph/test/unit/open_graph_graph/publisher_test.rb +++ b/plugins/open_graph/test/unit/open_graph_graph/publisher_test.rb @@ -51,7 +51,7 @@ class OpenGraphPlugin::PublisherTest < ActiveSupport::TestCase user = User.current.person blog = Blog.create! profile: user, name: 'blog' - blog_post = TinyMceArticle.create! profile: user, parent: blog, name: 'blah', author: user + blog_post = TextArticle.create! profile: user, parent: blog, name: 'blah', author: user assert_last_activity user, :create_an_article, url_for(blog_post) gallery = Gallery.create! name: 'gallery', profile: user @@ -65,7 +65,7 @@ class OpenGraphPlugin::PublisherTest < ActiveSupport::TestCase assert_last_activity user, :create_an_event, url_for(event) forum = Forum.create! name: 'forum', profile: user - topic = TinyMceArticle.create! profile: user, parent: forum, name: 'blah2', author: user + topic = TextArticle.create! profile: user, parent: forum, name: 'blah2', author: user assert_last_activity user, :start_a_discussion, url_for(topic, topic.url.merge(og_type: MetadataPlugin.og_types[:forum])) AddFriend.create!(person: user, friend: @other_actor).finish @@ -82,7 +82,7 @@ class OpenGraphPlugin::PublisherTest < ActiveSupport::TestCase User.current = @actor.user user = User.current.person - blog_post = TinyMceArticle.create! profile: @enterprise, parent: @enterprise.blog, name: 'blah', author: user + blog_post = TextArticle.create! profile: @enterprise, parent: @enterprise.blog, name: 'blah', author: user story = :announce_news_from_a_sse_initiative assert_last_activity user, story, passive_url_for(blog_post, nil, OpenGraphPlugin::Stories::Definitions[story]) @@ -91,13 +91,13 @@ class OpenGraphPlugin::PublisherTest < ActiveSupport::TestCase user = User.current.person # fan - blog_post = TinyMceArticle.create! profile: @enterprise, parent: @enterprise.blog, name: 'blah2', author: user + blog_post = TextArticle.create! profile: @enterprise, parent: @enterprise.blog, name: 'blah2', author: user assert_last_activity user, :announce_news_from_a_sse_initiative, 'http://noosfero.net/coop/blog/blah2' # member - blog_post = TinyMceArticle.create! profile: @myenterprise, parent: @myenterprise.blog, name: 'blah2', author: user + blog_post = TextArticle.create! profile: @myenterprise, parent: @myenterprise.blog, name: 'blah2', author: user assert_last_activity user, :announce_news_from_a_sse_initiative, 'http://noosfero.net/mycoop/blog/blah2' - blog_post = TinyMceArticle.create! profile: @community, parent: @community.blog, name: 'blah', author: user + blog_post = TextArticle.create! profile: @community, parent: @community.blog, name: 'blah', author: user assert_last_activity user, :announce_news_from_a_community, 'http://noosfero.net/comm/blog/blah' end diff --git a/plugins/orders_cycle/views/orders_cycle_plugin_cycle/_edit_fields.html.slim b/plugins/orders_cycle/views/orders_cycle_plugin_cycle/_edit_fields.html.slim index 241b9a2..1b13e5f 100644 --- a/plugins/orders_cycle/views/orders_cycle_plugin_cycle/_edit_fields.html.slim +++ b/plugins/orders_cycle/views/orders_cycle_plugin_cycle/_edit_fields.html.slim @@ -5,8 +5,7 @@ h3= t('views.cycle._edit_fields.general_settings') = form_for @cycle, as: :cycle , remote: true, url: {action: @cycle.new? ? :new : :edit, id: @cycle.id }, html: {data: {loading: '#cycle-fields form'}} do |f| = labelled_field f, :name, t('views.cycle._edit_fields.name'), f.text_field(:name), class: 'cycle-field-name' - = labelled_field f, :description, t('views.cycle._edit_fields.description'), f.text_area(:description, class: 'mceEditor'), class: 'cycle-field-description' - = render file: 'shared/tiny_mce', locals: {mode: 'simple'} + = labelled_field f, :description, t('views.cycle._edit_fields.description'), f.text_area(:description, class: current_editor('simple')), class: 'cycle-field-description' .cycle-fields-block = labelled_datetime_range_field f, :start, :finish, t('views.cycle._edit_fields.orders_interval'), class: 'cycle-orders-period' diff --git a/plugins/products/views/products_plugin/page/_display_description.html.erb b/plugins/products/views/products_plugin/page/_display_description.html.erb index 45d6f7a..87d00cb 100644 --- a/plugins/products/views/products_plugin/page/_display_description.html.erb +++ b/plugins/products/views/products_plugin/page/_display_description.html.erb @@ -1,7 +1,7 @@ <%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %> <% if !@product.description.blank? %> <%= @product.description %> - <%= edit_product_button_to_remote(@product, 'description', _('Edit description'), :title => _('Edit the description of your product and give consumers more information about what you are advertising')) %> + <%= edit_product_button_to_remote(@product, 'description', _('Edit description'), {:title => _('Edit the description of your product and give consumers more information about what you are advertising'), :class => current_editor}) %> <% else %> <%= edit_product_ui_button_to_remote( @product, diff --git a/plugins/products/views/products_plugin/page/_edit_description.html.erb b/plugins/products/views/products_plugin/page/_edit_description.html.erb index 81cb9b9..e0681ab 100644 --- a/plugins/products/views/products_plugin/page/_edit_description.html.erb +++ b/plugins/products/views/products_plugin/page/_edit_description.html.erb @@ -1,11 +1,10 @@ -<%= render file: 'shared/tiny_mce', locals: {mode: 'simple'} %> <%= remote_form_for(@product, loading: "small_loading('product-description-form')", update: 'product-description', url: {controller: 'products_plugin/page', action: 'edit', id: @product, field: 'description'}, html: {id: 'product-description-form', method: 'post'}) do |f| %> - <%= labelled_form_field(_('Description:'), f.text_area(:description, rows: 15, style: 'width: 90%;', class: 'mceEditor')) %> + <%= labelled_form_field(_('Description:'), f.text_area(:description, rows: 15, style: 'width: 90%;', class: current_editor('simple'))) %> <%= button_bar do %> <%= submit_button :save, _('Save') %> <%= cancel_edit_product_link(@product, 'description') %> diff --git a/plugins/products/views/products_plugin/page/_form.html.erb b/plugins/products/views/products_plugin/page/_form.html.erb index 67da716..656b1fc 100644 --- a/plugins/products/views/products_plugin/page/_form.html.erb +++ b/plugins/products/views/products_plugin/page/_form.html.erb @@ -5,7 +5,7 @@ <%= display_form_field( _('Name:'), f.text_field(:name) ) %> <%= display_form_field( _('Price:'), f.text_field(:price) ) %> - <%= display_form_field( _('Description:'), f.text_area(:description, :rows => 10, :class => 'mceEditor') ) %> + <%= display_form_field( _('Description:'), f.text_area(:description, :rows => 10, :class => current_editor('simples')) ) %> <%= labelled_form_field(f.check_box(:highlighted) + _('Highlight this product'),'') %> <%= f.fields_for :image_builder, @product.image do |i| %> <%= file_field_or_thumbnail(_('Image:'), @product.image, i) %> diff --git a/plugins/profile_members_headlines/test/unit/profile_members_headlines_block_test.rb b/plugins/profile_members_headlines/test/unit/profile_members_headlines_block_test.rb index 96df07c..60a3f23 100644 --- a/plugins/profile_members_headlines/test/unit/profile_members_headlines_block_test.rb +++ b/plugins/profile_members_headlines/test/unit/profile_members_headlines_block_test.rb @@ -42,7 +42,7 @@ class ProfileMembersHeadlinesBlockTest < ActiveSupport::TestCase block = ProfileMembersHeadlinesBlock.create block.stubs(:owner).returns(community) blog = fast_create(Blog, :profile_id => member1.id) - post = fast_create(TinyMceArticle, :name => 'headlines', :profile_id => member1.id, :parent_id => blog.id) + post = fast_create(TextArticle, :name => 'headlines', :profile_id => member1.id, :parent_id => blog.id) self.expects(:render).with(:template => 'blocks/profile_members_headlines', :locals => { :block => block }).returns('file-with-authors-and-headlines') assert_equal 'file-with-authors-and-headlines', render_block_content(block) end @@ -53,7 +53,7 @@ class ProfileMembersHeadlinesBlockTest < ActiveSupport::TestCase block = ProfileMembersHeadlinesBlock.new(:limit => 1, :filtered_roles => [role.id]) block.expects(:owner).returns(community) blog = fast_create(Blog, :profile_id => member1.id) - post = fast_create(TinyMceArticle, :name => 'headlines', :profile_id => member1.id, :parent_id => blog.id) + post = fast_create(TextArticle, :name => 'headlines', :profile_id => member1.id, :parent_id => blog.id) assert_equal [member1], block.authors_list end @@ -62,7 +62,7 @@ class ProfileMembersHeadlinesBlockTest < ActiveSupport::TestCase block.expects(:owner).returns(community) private_author = fast_create(Person, :public_profile => false) blog = fast_create(Blog, :profile_id => private_author.id) - post = fast_create(TinyMceArticle, :name => 'headlines', :profile_id => private_author.id, :parent_id => blog.id) + post = fast_create(TextArticle, :name => 'headlines', :profile_id => private_author.id, :parent_id => blog.id) assert_equal [], block.authors_list end @@ -76,7 +76,7 @@ class ProfileMembersHeadlinesBlockTest < ActiveSupport::TestCase block.stubs(:owner).returns(community) community.members.each do |member| blog = fast_create(Blog, :profile_id => member.id) - post = fast_create(TinyMceArticle, :name => 'headlines', :profile_id => member.id, :parent_id => blog.id) + post = fast_create(TextArticle, :name => 'headlines', :profile_id => member.id, :parent_id => blog.id) end assert_equal [author], block.authors_list end diff --git a/plugins/recent_content/lib/recent_content_block.rb b/plugins/recent_content/lib/recent_content_block.rb index 839fe65..f407cc3 100644 --- a/plugins/recent_content/lib/recent_content_block.rb +++ b/plugins/recent_content/lib/recent_content_block.rb @@ -7,7 +7,7 @@ class RecentContentBlock < Block attr_accessible :presentation_mode, :total_items, :show_blog_picture, :selected_folder - VALID_CONTENT = ['RawHTMLArticle', 'TextArticle', 'TextileArticle', 'TinyMceArticle'] + VALID_CONTENT = ['TextArticle'] def self.description c_('Recent content') diff --git a/plugins/recent_content/test/unit/recent_content_block_test.rb b/plugins/recent_content/test/unit/recent_content_block_test.rb index ef34a83..fc4f802 100644 --- a/plugins/recent_content/test/unit/recent_content_block_test.rb +++ b/plugins/recent_content/test/unit/recent_content_block_test.rb @@ -2,7 +2,7 @@ require_relative '../test_helper' class RecentContentBlockTest < ActiveSupport::TestCase INVALID_KIND_OF_ARTICLE = [RssFeed, UploadedFile, Gallery, Folder, Blog, Forum] - VALID_KIND_OF_ARTICLE = [RawHTMLArticle, TextArticle, TextileArticle, TinyMceArticle] + VALID_KIND_OF_ARTICLE = [TextArticle] should 'describe itself' do assert_not_equal Block.description, RecentContentBlock.description @@ -61,9 +61,9 @@ class RecentContentBlockTest < ActiveSupport::TestCase root = fast_create(Blog, :name => 'test-blog', :profile_id => profile.id) - a1 = fast_create(TextileArticle, :name => 'article #1', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now - 2.days) - a2 = fast_create(TextileArticle, :name => 'article #2', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now - 1.days) - a3 = fast_create(TextileArticle, :name => 'article #3', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now) + a1 = fast_create(TextArticle, :name => 'article #1', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now - 2.days) + a2 = fast_create(TextArticle, :name => 'article #2', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now - 1.days) + a3 = fast_create(TextArticle, :name => 'article #3', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now) block = RecentContentBlock.new block.stubs(:holder).returns(profile) diff --git a/plugins/relevant_content/test/unit/article.rb b/plugins/relevant_content/test/unit/article.rb index 877f81c..f0ebdff 100644 --- a/plugins/relevant_content/test/unit/article.rb +++ b/plugins/relevant_content/test/unit/article.rb @@ -29,9 +29,9 @@ class RelevantContentBlockTest < ActiveSupport::TestCase should 'list most commented articles' do Article.delete_all - a1 = create(TextileArticle, :name => "art 1", :profile_id => profile.id) - a2 = create(TextileArticle, :name => "art 2", :profile_id => profile.id) - a3 = create(TextileArticle, :name => "art 3", :profile_id => profile.id) + a1 = create(TextArticle, :name => "art 1", :profile_id => profile.id) + a2 = create(TextArticle, :name => "art 2", :profile_id => profile.id) + a3 = create(TextArticle, :name => "art 3", :profile_id => profile.id) 2.times { Comment.create(:title => 'test', :body => 'asdsad', :author => profile, :source => a2).save! } 4.times { Comment.create(:title => 'test', :body => 'asdsad', :author => profile, :source => a3).save! } diff --git a/plugins/send_email/doc/send_email.textile b/plugins/send_email/doc/send_email.textile index 65f7f83..afae2e6 100644 --- a/plugins/send_email/doc/send_email.textile +++ b/plugins/send_email/doc/send_email.textile @@ -4,7 +4,7 @@ Allows to send e-mails through an e-mail form. h2. Usage -* Create a HTML form using RawHTMLBlock or RawHTMLArticle that invokes the {sendemail} action +* Create a HTML form using RawHTMLBlock that invokes the {sendemail} action * Add a "to" and "message" field and a submit button * Make sure to fill in allowed 'to' addresses in plugin settings diff --git a/plugins/send_email/test/unit/send_email_plugin_test.rb b/plugins/send_email/test/unit/send_email_plugin_test.rb index 72aa150..62a38b9 100644 --- a/plugins/send_email/test/unit/send_email_plugin_test.rb +++ b/plugins/send_email/test/unit/send_email_plugin_test.rb @@ -29,8 +29,7 @@ class SendEmailPluginTest < ActiveSupport::TestCase should 'expand macro used on form on profile context' do profile = fast_create(Community) @plugin.context.stubs(:profile).returns(profile) - article = RawHTMLArticle.create!(:name => 'Raw HTML', :body => "", :profile => profile) - + article = TextArticle.create!(:name => 'Text HTML', :body => "", :profile => profile, :editor => Article::Editor::RAW_HTML) assert_match /profile\/#{profile.identifier}\/plugin\/send_email\/deliver/, @plugin.parse_content(article.to_html, nil).first end diff --git a/plugins/solr/lib/ext/article.rb b/plugins/solr/lib/ext/article.rb index 1559abd..3bbe7ac 100644 --- a/plugins/solr/lib/ext/article.rb +++ b/plugins/solr/lib/ext/article.rb @@ -72,13 +72,7 @@ class Article end def solr_plugin_f_type - #join common types - case self.class.name - when 'TinyMceArticle', 'TextileArticle' - TextArticle.name - else - self.class.name - end + self.class.name end def solr_plugin_f_profile_type @@ -111,8 +105,6 @@ class Article # see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245 UploadedFile TextArticle - TinyMceArticle - TextileArticle Folder EnterpriseHomepage Gallery diff --git a/plugins/solr/test/unit/article_test.rb b/plugins/solr/test/unit/article_test.rb index 788db95..426a178 100644 --- a/plugins/solr/test/unit/article_test.rb +++ b/plugins/solr/test/unit/article_test.rb @@ -82,7 +82,7 @@ class ArticleTest < ActiveSupport::TestCase should 'index comments body together with article' do TestSolr.enable owner = create_user('testuser').person - art = fast_create(TinyMceArticle, :profile_id => owner.id, :name => 'ytest') + art = fast_create(TextArticle, :profile_id => owner.id, :name => 'ytest') c1 = Comment.create!(:title => 'test comment', :body => 'anything', :author => owner, :source => art) assert_includes Article.find_by_contents('anything')[:results], art diff --git a/plugins/solr/test/unit/profile_test.rb b/plugins/solr/test/unit/profile_test.rb index 0c8cf04..9847685 100644 --- a/plugins/solr/test/unit/profile_test.rb +++ b/plugins/solr/test/unit/profile_test.rb @@ -131,7 +131,7 @@ class ProfileTest < ActiveSupport::TestCase should 'index comments title together with article' do TestSolr.enable owner = create_user('testuser').person - art = fast_create(TinyMceArticle, :profile_id => owner.id, :name => 'ytest') + art = fast_create(TextArticle, :profile_id => owner.id, :name => 'ytest') c1 = Comment.create(:title => 'a nice comment', :body => 'anything', :author => owner, :source => art ); c1.save! assert_includes Article.find_by_contents('nice')[:results], art diff --git a/plugins/solr/test/unit/text_article_test.rb b/plugins/solr/test/unit/text_article_test.rb index 85bacf3..f46a022 100644 --- a/plugins/solr/test/unit/text_article_test.rb +++ b/plugins/solr/test/unit/text_article_test.rb @@ -8,10 +8,10 @@ class TextArticleTest < ActiveSupport::TestCase attr_accessor :environment - should 'found TextileArticle by TextArticle indexes' do + should 'found TextArticle by TextArticle indexes' do TestSolr.enable person = create_user('testuser').person - article = TextileArticle.create!(:name => 'found article test', :profile => person) - assert_equal TextileArticle.find_by_contents('found')[:results].docs, TextArticle.find_by_contents('found')[:results].docs + article = TextArticle.create!(:name => 'found article test', :profile => person) + assert_equal TextArticle.find_by_contents('found')[:results].docs, TextArticle.find_by_contents('found')[:results].docs end end diff --git a/plugins/solr/test/unit/textile_article_test.rb b/plugins/solr/test/unit/textile_article_test.rb deleted file mode 100644 index c570d4c..0000000 --- a/plugins/solr/test/unit/textile_article_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require "#{File.dirname(__FILE__)}/../test_helper" - -class TextileArticleTest < ActiveSupport::TestCase - - should 'define type facet' do - a = TextileArticle.new - assert_equal TextArticle.type_name, TextileArticle.send(:solr_plugin_f_type_proc, a.send(:solr_plugin_f_type)) - end - -end diff --git a/plugins/solr/test/unit/tiny_mce_article_test.rb b/plugins/solr/test/unit/tiny_mce_article_test.rb index 566127b..cdc1583 100644 --- a/plugins/solr/test/unit/tiny_mce_article_test.rb +++ b/plugins/solr/test/unit/tiny_mce_article_test.rb @@ -11,13 +11,13 @@ class TinyMceArticleTest < ActiveSupport::TestCase should 'be found when searching for articles by query' do TestSolr.enable - tma = TinyMceArticle.create!(:name => 'test tinymce article', :body => '---', :profile => profile) - assert_includes TinyMceArticle.find_by_contents('article')[:results], tma + tma = TextArticle.create!(:name => 'test tinymce article', :body => '---', :profile => profile) + assert_includes TextArticle.find_by_contents('article')[:results], tma assert_includes Article.find_by_contents('article')[:results], tma end should 'define type facet' do - a = TinyMceArticle.new - assert_equal TextArticle.type_name, TinyMceArticle.send(:solr_plugin_f_type_proc, a.send(:solr_plugin_f_type)) + a = TextArticle.new + assert_equal TextArticle.type_name, TextArticle.send(:solr_plugin_f_type_proc, a.send(:solr_plugin_f_type)) end end diff --git a/plugins/variables/doc/variables.textile b/plugins/variables/doc/variables.textile index c29934d..e717ccb 100644 --- a/plugins/variables/doc/variables.textile +++ b/plugins/variables/doc/variables.textile @@ -4,12 +4,12 @@ A set of simple variables to be used in a macro context. h2. Usage -* Create a HTML content using RawHTMLBlock, TinyMceArticle or other +* Create a HTML content using TextArticle or other article with HTML support * Add a HTML div tag with css class "macro" (see Example) * Add inner that div tag the variable desired, like {profile} -h2. Usage with TinyMceArticle +h2. Usage with TextArticle The Noosfero's macros add a extra button in toolbar of the editor to use macros in a single way, that way this plugin add a option diff --git a/plugins/vote/test/functional/vote_plugin_profile_controller_test.rb b/plugins/vote/test/functional/vote_plugin_profile_controller_test.rb index 128b0f5..e7aad59 100644 --- a/plugins/vote/test/functional/vote_plugin_profile_controller_test.rb +++ b/plugins/vote/test/functional/vote_plugin_profile_controller_test.rb @@ -5,7 +5,7 @@ class VotePluginProfileControllerTest < ActionController::TestCase def setup @profile = create_user('profile').person - @article = TinyMceArticle.create!(:profile => @profile, :name => 'An article') + @article = TextArticle.create!(:profile => @profile, :name => 'An article') @comment = Comment.new(:source => @article, :author => @profile, :body => 'test') @comment.save! login_as(@profile.identifier) diff --git a/plugins/vote/test/unit/vote_plugin_test.rb b/plugins/vote/test/unit/vote_plugin_test.rb index c020fe3..9db07dd 100644 --- a/plugins/vote/test/unit/vote_plugin_test.rb +++ b/plugins/vote/test/unit/vote_plugin_test.rb @@ -5,7 +5,7 @@ class VotePluginTest < ActiveSupport::TestCase def setup @plugin = VotePlugin.new @person = create_user('user').person - @article = TinyMceArticle.create!(:profile => @person, :name => 'An article') + @article = TextArticle.create!(:profile => @person, :name => 'An article') @comment = Comment.create!(:source => @article, :author => @person, :body => 'test') end diff --git a/public/javascripts/email_templates.js b/public/javascripts/email_templates.js index 87a35d8..9ddceb3 100644 --- a/public/javascripts/email_templates.js +++ b/public/javascripts/email_templates.js @@ -4,7 +4,7 @@ jQuery(document).ready(function($) { $.getJSON($(this).data('url'), {id: $(this).val()}, function(data) { $('#mailing-form #mailing_subject').val(data.parsed_subject); - $('#mailing-form .mceEditor').val(data.parsed_body); + $('#mailing-form .body').val(data.parsed_body); }); }); }); diff --git a/public/javascripts/tinymce.js b/public/javascripts/tinymce.js index 441f7b5..1295de7 100644 --- a/public/javascripts/tinymce.js +++ b/public/javascripts/tinymce.js @@ -13,10 +13,13 @@ noosfero.tinymce = { }, init: function(_options) { - var options = jQuery.extend({}, this.defaultOptions, _options) + var options = jQuery.extend({}, this.defaultOptions, _options); // just init. initing this is necessary to add some buttons to the toolbar - tinymce.init(options) - // apply to selector - jQuery('.mceEditor').tinymce(options); + tinymce.init(options); +// var options = jQuery.extend({selector: '.tiny_mce_simple'}, this.defaultOptions, _options); +// delete options['toolbar2']; +// options['menubar'] = false; + // just init. initing this is necessary to add some buttons to the toolbar +// tinymce.init(options); }, }; diff --git a/script/sample-articles b/script/sample-articles index 6dfd74f..9d3fe48 100755 --- a/script/sample-articles +++ b/script/sample-articles @@ -9,13 +9,13 @@ TAGS = ['free-software', 'noosfero', 'development', 'rails', 'ruby'] EVENT_SUBJECTS = ['International Conference on %s', '%s day', '%s World Congress', '%s World Forum', '%s Summit', '%s Week'] THEMES = ['Sustainability', 'Free Software', 'Climate Change', 'Environment', 'Agile Development', 'Solidarity Economy', 'Debian', 'Perl'] -print "Creating some TinyMce articles: " +print "Creating some Text articles: " for subject in SUBJECTS rand(20).times do |i| profile = profiles.sample name = "%s #{subject}" % profile.name next if profile.articles.where(:slug => name.to_slug).first - article = TinyMceArticle.new( + article = TextArticle.new( :name => name, :body => name, :tag_list => [TAGS.sample, TAGS.sample], @@ -71,7 +71,7 @@ for subject in SUBJECTS rand(20).times do |i| profile = profiles.sample name = "%s #{subject}" % profile.name - article = TinyMceArticle.new( + article = TextArticle.new( :name => name, :body => name, :tag_list => [TAGS.sample, TAGS.sample], diff --git a/test/api/activities_test.rb b/test/api/activities_test.rb index 15e9f43..4ce9b5c 100644 --- a/test/api/activities_test.rb +++ b/test/api/activities_test.rb @@ -107,7 +107,7 @@ class ActivitiesTest < ActiveSupport::TestCase should 'scrap activity return leave_scrap verb' do ActionTracker::Record.destroy_all - create(TinyMceArticle, :name => 'Tracked Article 1', :profile_id => person.id) + create(TextArticle, :name => 'Tracked Article 1', :profile_id => person.id) create(Scrap, :sender_id => person.id, :receiver_id => person.id) get "/api/v1/profiles/#{person.id}/activities?#{params.to_query}" json = JSON.parse(last_response.body) diff --git a/test/api/articles_test.rb b/test/api/articles_test.rb index 7f2dd0f..b1cdaf2 100644 --- a/test/api/articles_test.rb +++ b/test/api/articles_test.rb @@ -37,8 +37,8 @@ class ArticlesTest < ActiveSupport::TestCase should 'list all text articles' do profile = Community.create(identifier: 'my-community', name: 'name-my-community') a1 = fast_create(TextArticle, :profile_id => profile.id) - a2 = fast_create(TextileArticle, :profile_id => profile.id) - a3 = fast_create(TinyMceArticle, :profile_id => profile.id) + a2 = fast_create(TextArticle, :profile_id => profile.id) + a3 = fast_create(TextArticle, :profile_id => profile.id) params['content_type']='TextArticle' get "api/v1/communities/#{profile.id}/articles?#{params.to_query}" json = JSON.parse(last_response.body) @@ -138,8 +138,8 @@ class ArticlesTest < ActiveSupport::TestCase should 'list all text articles of children' do article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing") child1 = fast_create(TextArticle, :parent_id => article.id, :profile_id => user.person.id, :name => "Some thing 1") - child2 = fast_create(TextileArticle, :parent_id => article.id, :profile_id => user.person.id, :name => "Some thing 2") - child3 = fast_create(TinyMceArticle, :parent_id => article.id, :profile_id => user.person.id, :name => "Some thing 3") + child2 = fast_create(TextArticle, :parent_id => article.id, :profile_id => user.person.id, :name => "Some thing 2") + child3 = fast_create(TextArticle, :parent_id => article.id, :profile_id => user.person.id, :name => "Some thing 3") get "/api/v1/articles/#{article.id}/children?#{params.to_query}" json = JSON.parse(last_response.body) assert_equivalent [child1.id, child2.id, child3.id], json["articles"].map { |a| a["id"] } @@ -473,7 +473,7 @@ class ArticlesTest < ActiveSupport::TestCase assert_kind_of TextArticle, Article.last end - should "#{kind}: create article of TinyMceArticle type if no content type is passed as parameter" do + should "#{kind}: create article of TexrArticle type if no content type is passed as parameter" do profile = fast_create(kind.camelcase.constantize, :environment_id => environment.id) Person.any_instance.stubs(:can_post_content?).with(profile).returns(true) @@ -481,7 +481,7 @@ class ArticlesTest < ActiveSupport::TestCase post "/api/v1/#{kind.pluralize}/#{profile.id}/articles?#{params.to_query}" json = JSON.parse(last_response.body) - assert_kind_of TinyMceArticle, Article.last + assert_kind_of TextArticle, Article.last end should "#{kind}: not create article with invalid article content type" do @@ -567,12 +567,12 @@ class ArticlesTest < ActiveSupport::TestCase assert_kind_of TextArticle, Article.last end - should 'person create article of TinyMceArticle type if no content type is passed as parameter' do + should 'person create article of TextArticle type if no content type is passed as parameter' do params[:article] = {:name => "Title"} post "/api/v1/people/#{user.person.id}/articles?#{params.to_query}" json = JSON.parse(last_response.body) - assert_kind_of TinyMceArticle, Article.last + assert_kind_of TextArticle, Article.last end should 'person not create article with invalid article content type' do diff --git a/test/api/helpers_test.rb b/test/api/helpers_test.rb index 2408805..87d80bb 100644 --- a/test/api/helpers_test.rb +++ b/test/api/helpers_test.rb @@ -99,7 +99,7 @@ class Api::HelpersTest < ActiveSupport::TestCase end should 'parse_content_type return all content types as an array' do - assert_equivalent ['TextileArticle','TinyMceArticle'], parse_content_type("TextileArticle,TinyMceArticle") + assert_equivalent ['Event','TextArticle'], parse_content_type("Event,TextArticle") end should 'find_article return article by id in list passed for user with permission' do diff --git a/test/api/search_test.rb b/test/api/search_test.rb index 8b581ed..28ff473 100644 --- a/test/api/search_test.rb +++ b/test/api/search_test.rb @@ -42,16 +42,16 @@ class SearchTest < ActiveSupport::TestCase should 'not list articles of wrong type' do Article.delete_all fast_create(Article, :profile_id => person.id) - get "/api/v1/search/article?type=TinyMceArticle" + get "/api/v1/search/article?type=TextArticle" json = JSON.parse(last_response.body) assert_empty json['articles'] end should 'list articles of one type' do fast_create(Article, :profile_id => person.id) - article = fast_create(TinyMceArticle, :profile_id => person.id) + article = fast_create(TextArticle, :profile_id => person.id) - get "/api/v1/search/article?type=TinyMceArticle" + get "/api/v1/search/article?type=TextArticle" json = JSON.parse(last_response.body) assert_equal article.id, json['articles'].first['id'] end @@ -59,8 +59,8 @@ class SearchTest < ActiveSupport::TestCase should 'list articles of one type and query string' do fast_create(Article, :profile_id => person.id, :name => 'some article') fast_create(Article, :profile_id => person.id, :name => 'Some thing') - article = fast_create(TinyMceArticle, :profile_id => person.id, :name => 'Some thing') - get "/api/v1/search/article?type=TinyMceArticle&query=thing" + article = fast_create(TextArticle, :profile_id => person.id, :name => 'Some thing') + get "/api/v1/search/article?type=TextArticle&query=thing" json = JSON.parse(last_response.body) assert_equal 1, json['articles'].count assert_equal article.id, json['articles'].first['id'] diff --git a/test/fixtures/articles.yml b/test/fixtures/articles.yml deleted file mode 100644 index e8f74d9..0000000 --- a/test/fixtures/articles.yml +++ /dev/null @@ -1,5 +0,0 @@ -ze_homepage: - id: 1 - name: 'Ze home page' - profile_id: 4 - type: 'TinyMceArticle' diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb index b84c00d..437f97c 100644 --- a/test/functional/application_controller_test.rb +++ b/test/functional/application_controller_test.rb @@ -97,38 +97,6 @@ class ApplicationControllerTest < ActionController::TestCase }) end - def test_should_generate_help_box_expanding_textile_markup_when_passing_string - get :help_textile_with_string - assert_tag({ - :tag => 'div', - :attributes => { :class => 'help_box'}, - :descendant => { - :tag => 'div', - :attributes => { :class => 'help_message', :style => /display:\s+none/}, - :descendant => { - :tag => 'strong', - :content => /my_bold_help_message/ - } - } - }) - end - - def test_should_generate_help_box_expanding_textile_markup_when_passing_block - get :help_textile_with_block - assert_tag({ - :tag => 'div', - :attributes => { :class => 'help_box'}, - :descendant => { - :tag => 'div', - :attributes => { :class => 'help_message', :style => /display:\s+none/}, - :descendant => { - :tag => 'strong', - :content => /my_bold_help_message/ - } - } - }) - end - def test_shouldnt_generate_help_box_markup_when_no_block_is_passed get :help_without_block assert_no_tag({ diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb index 4f1b81b..d688ad8 100644 --- a/test/functional/cms_controller_test.rb +++ b/test/functional/cms_controller_test.rb @@ -50,26 +50,26 @@ class CmsControllerTest < ActionController::TestCase assert_template 'select_article_type' # TODO add more types here !! - [ TinyMceArticle, TextileArticle ].each do |item| + [TextArticle ].each do |item| assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?type=#{item.name}" } end end should 'present edit screen after choosing article type' do - get :new, :profile => profile.identifier, :type => 'TinyMceArticle' + get :new, :profile => profile.identifier, :type => 'TextArticle' assert_template 'edit' - assert_tag :tag => 'form', :attributes => { :action => "/myprofile/#{profile.identifier}/cms/new", :method => /post/i }, :descendant => { :tag => "input", :attributes => { :type => 'hidden', :value => 'TinyMceArticle' }} + assert_tag :tag => 'form', :attributes => { :action => "/myprofile/#{profile.identifier}/cms/new", :method => /post/i }, :descendant => { :tag => "input", :attributes => { :type => 'hidden', :value => 'TextArticle' }} end should 'be able to save a document' do assert_difference 'Article.count' do - post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'a test article', :body => 'the text of the article ...' } + post :new, :type => 'TextArticle', :profile => profile.identifier, :article => { :name => 'a test article', :body => 'the text of the article ...' } end end should 'display set as home page link to non folder' do - a = fast_create(TextileArticle, :profile_id => profile.id, :updated_at => DateTime.now) + a = fast_create(TextArticle, :profile_id => profile.id, :updated_at => DateTime.now) Article.stubs(:short_description).returns('bli') get :index, :profile => profile.identifier assert_tag :tag => 'a', :content => 'Use as homepage', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/set_home_page/#{a.id}" } @@ -198,7 +198,7 @@ class CmsControllerTest < ActionController::TestCase should 'set last_changed_by when creating article' do login_as(profile.identifier) - post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'changed by me', :body => 'content ...' } + post :new, :type => 'TextArticle', :profile => profile.identifier, :article => { :name => 'changed by me', :body => 'content ...' } a = profile.articles.find_by(path: 'changed-by-me') assert_not_nil a @@ -222,7 +222,7 @@ class CmsControllerTest < ActionController::TestCase should 'be able to set label to article image' do login_as(profile.identifier) - post :new, :type => TextileArticle.name, :profile => profile.identifier, + post :new, :type => TextArticle.name, :profile => profile.identifier, :article => { :name => 'adding-image-label', :image_builder => { @@ -449,7 +449,7 @@ class CmsControllerTest < ActionController::TestCase article.save! get :new, :profile => profile.identifier, :parent_id => article.id, :cms => true - assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?parent_id=#{article.id}&type=TextileArticle"} + assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?parent_id=#{article.id}&type=TextArticle"} end should 'not offer to create children if article does not accept them' do @@ -510,7 +510,7 @@ class CmsControllerTest < ActionController::TestCase c3 = env.categories.build(:name => "Test Category 3"); c3.save! # post is in c1 and c3 - post :new, :type => TextileArticle.name, :profile => profile.identifier, :article => { :name => 'adding-categories-test', :category_ids => [ c1.id, c3.id] } + post :new, :type => TextArticle.name, :profile => profile.identifier, :article => { :name => 'adding-categories-test', :category_ids => [ c1.id, c3.id] } saved = profile.articles.find_by(name: 'adding-categories-test') assert_includes saved.categories, c1 @@ -525,34 +525,34 @@ class CmsControllerTest < ActionController::TestCase c3 = env.categories.build(:name => "Test Category 3"); c3.save! # post is in c1, c3 and c3 - post :new, :type => TextileArticle.name, :profile => profile.identifier, :article => { :name => 'adding-categories-test', :category_ids => [ c1.id, c3.id, c3.id ] } + post :new, :type => TextArticle.name, :profile => profile.identifier, :article => { :name => 'adding-categories-test', :category_ids => [ c1.id, c3.id, c3.id ] } saved = profile.articles.find_by(name: 'adding-categories-test') assert_equivalent [c1, c3], saved.categories.all end should 'filter html with white_list from tiny mce article name' do - post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => "test", :body => 'the text of the article ...' } + post :new, :type => 'TextArticle', :profile => profile.identifier, :article => { :name => "test", :body => 'the text of the article ...' } assert_equal "test", assigns(:article).name end should 'filter html with white_list from tiny mce article abstract' do - post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'article', :abstract => " article", :body => 'the text of the article ...' } + post :new, :type => 'TextArticle', :profile => profile.identifier, :article => { :name => 'article', :abstract => " article", :body => 'the text of the article ...' } assert_equal "alert('text') article", assigns(:article).abstract end should 'filter html with white_list from tiny mce article body' do - post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'article', :abstract => 'abstract', :body => "the of article ..." } + post :new, :type => 'TextArticle', :profile => profile.identifier, :article => { :name => 'article', :abstract => 'abstract', :body => "the of article ..." } assert_equal "the alert('text') of article ...", assigns(:article).body end should 'not filter html tags permitted from tiny mce article body' do - post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'article', :abstract => 'abstract', :body => "the of article ..." } + post :new, :type => 'TextArticle', :profile => profile.identifier, :article => { :name => 'article', :abstract => 'abstract', :body => "the of article ..." } assert_equal "the alert('text') of article ...", assigns(:article).body end should 'sanitize tags' do - post :new, :type => 'TextileArticle', :profile => profile.identifier, :article => { :name => 'a test article', :body => 'the text of the article ...', :tag_list => 'tag1, tag2' } + post :new, :type => 'TextArticle', :profile => profile.identifier, :article => { :name => 'a test article', :body => 'the text of the article ...', :tag_list => 'tag1, tag2' } assert_sanitized assigns(:article).tag_list.join(', ') end @@ -562,7 +562,7 @@ class CmsControllerTest < ActionController::TestCase profile.home_page = profile.blogs.find_by name: "Sample blog" profile.save! - get :new, :profile => @profile.identifier, :parent_id => profile.home_page.id, :type => 'TextileArticle' + get :new, :profile => @profile.identifier, :parent_id => profile.home_page.id, :type => 'TextArticle' assert_tag :tag => 'select', :attributes => { :id => 'article_parent_id' }, :child => { @@ -574,7 +574,7 @@ class CmsControllerTest < ActionController::TestCase profile.articles.destroy_all folder1 = fast_create(Folder, :profile_id => profile.id, :updated_at => DateTime.now - 1.hour) - article = fast_create(TextileArticle, :profile_id => profile.id, :updated_at => DateTime.now) + article = fast_create(TextArticle, :profile_id => profile.id, :updated_at => DateTime.now) folder2 = fast_create(Folder, :profile_id => profile.id, :updated_at => DateTime.now + 1.hour) get :index, :profile => profile.identifier @@ -586,7 +586,7 @@ class CmsControllerTest < ActionController::TestCase parent = fast_create(Folder, :profile_id => profile.id) folder1 = fast_create(Folder, :parent_id => parent.id, :profile_id => profile.id, :updated_at => DateTime.now - 1.hour) - article = fast_create(TextileArticle, :parent_id => parent.id, :profile_id => profile.id, :updated_at => DateTime.now) + article = fast_create(TextArticle, :parent_id => parent.id, :profile_id => profile.id, :updated_at => DateTime.now) folder2 = fast_create(Folder, :parent_id => parent.id, :profile_id => profile.id, :updated_at => DateTime.now + 1.hour) get :view, :profile => profile.identifier, :id => parent.id @@ -606,14 +606,14 @@ class CmsControllerTest < ActionController::TestCase end should 'redirect to article after creating top-level article' do - post :new, :profile => profile.identifier, :type => 'TextileArticle', :article => { :name => 'top-level-article' } + post :new, :profile => profile.identifier, :type => 'TextArticle', :article => { :name => 'top-level-article' } assert_redirected_to @profile.articles.find_by(name: 'top-level-article').url end should 'redirect to article after creating article inside a folder' do f = Folder.new(:name => 'f'); profile.articles << f; f.save! - post :new, :profile => profile.identifier, :type => 'TextileArticle', :parent_id => f.id, :article => { :name => 'article-inside-folder' } + post :new, :profile => profile.identifier, :type => 'TextArticle', :parent_id => f.id, :article => { :name => 'article-inside-folder' } assert_redirected_to @profile.articles.find_by(name: 'article-inside-folder').url end @@ -626,7 +626,7 @@ class CmsControllerTest < ActionController::TestCase should 'redirect back to article after editing article inside a folder' do f = Folder.new(:name => 'f'); profile.articles << f; f.save! - a = create(TextileArticle, :parent => f, :name => 'article-inside-folder', :profile_id => profile.id) + a = create(TextArticle, :parent => f, :name => 'article-inside-folder', :profile_id => profile.id) post :edit, :profile => profile.identifier, :id => a.id assert_redirected_to @profile.articles.find_by(name: 'article-inside-folder').url @@ -653,7 +653,7 @@ class CmsControllerTest < ActionController::TestCase should 'point back to folder when cancelling edition of an article inside it' do f = Folder.new(:name => 'f'); profile.articles << f; f.save! - a = create(TextileArticle, :name => 'test', :parent => f, :profile_id => profile.id) + a = create(TextArticle, :name => 'test', :parent => f, :profile_id => profile.id) get :edit, :profile => profile.identifier, :id => a.id assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/view/#{f.id}" }, :descendant => { :content => /Cancel/ } @@ -723,15 +723,15 @@ class CmsControllerTest < ActionController::TestCase end should 'be able to add image with alignment' do - post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'image-alignment', :body => "the text of the article with imageContent to be displayed.
Anything') + blog.posts << TextArticle.create!(:name => 'first post', :parent => blog, :profile => profile, :body => 'Content to be displayed.
Anything') get :view_page, :profile => profile.identifier, :page => blog.path @@ -812,7 +812,7 @@ class ContentViewerControllerTest < ActionController::TestCase blog = Blog.create!(:name => 'A blog test', :profile => profile, :visualization_format => 'short+pic') - blog.posts << TinyMceArticle.create!(:name => 'first post', :parent => blog, :profile => profile, :body => 'Content to be displayed.
')
+ blog.posts << TextArticle.create!(:name => 'first post', :parent => blog, :profile => profile, :body => 'Content to be displayed.
')
get :view_page, :profile => profile.identifier, :page => blog.path
@@ -833,7 +833,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'list unpublished forum posts to owner with a different class' do
login_as('testinguser')
forum = Forum.create!(:name => 'A forum test', :profile => profile)
- forum.posts << TextileArticle.create!(:name => 'Post', :profile => profile, :parent => forum, :published => false)
+ forum.posts << TextArticle.create!(:name => 'Post', :profile => profile, :parent => forum, :published => false)
get :view_page, :profile => profile.identifier, :page => [forum.path]
assert_tag :tag => 'tr', :attributes => {:class => /not-published/}
@@ -841,7 +841,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'not list unpublished forum posts to a not logged person' do
forum = Forum.create!(:name => 'A forum test', :profile => profile)
- forum.posts << TextileArticle.create!(:name => 'Post', :profile => profile, :parent => forum, :published => false)
+ forum.posts << TextArticle.create!(:name => 'Post', :profile => profile, :parent => forum, :published => false)
get :view_page, :profile => profile.identifier, :page => [forum.path]
assert_no_tag :tag => 'a', :content => "Post"
@@ -850,7 +850,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'display pagination links of forum' do
forum = Forum.create!(:name => 'A forum test', :profile => profile, :posts_per_page => 5)
for n in 1..10
- forum.posts << TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => forum)
+ forum.posts << TextArticle.create!(:name => "Post #{n}", :profile => profile, :parent => forum)
end
assert_equal 10, forum.posts.size
@@ -861,7 +861,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'display first page of forum posts' do
forum = Forum.create!(:name => 'My forum', :profile => profile, :posts_per_page => 5)
for n in 1..10
- art = TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => forum)
+ art = TextArticle.create!(:name => "Post #{n}", :profile => profile, :parent => forum)
art.updated_at = (10 - n).days.ago
art.stubs(:record_timestamps).returns(false)
art.save!
@@ -882,7 +882,7 @@ class ContentViewerControllerTest < ActionController::TestCase
now = Time.now
for n in 1..10
Time.stubs(:now).returns(now - 10.days + n.days)
- forum.children << art = TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => forum)
+ forum.children << art = TextArticle.create!(:name => "Post #{n}", :profile => profile, :parent => forum)
end
assert_equal 10, forum.posts.size
@@ -899,8 +899,8 @@ class ContentViewerControllerTest < ActionController::TestCase
forum = Forum.create!(:name => "forum", :profile => profile)
profile.articles << forum
- past_post = create(TextileArticle, :name => "past post", :profile => profile, :parent => forum, :published_at => forum.created_at - 1.year)
- current_post = TextileArticle.create!(:name => "current post", :profile => profile, :parent => forum)
+ past_post = create(TextArticle, :name => "past post", :profile => profile, :parent => forum, :published_at => forum.created_at - 1.year)
+ current_post = TextArticle.create!(:name => "current post", :profile => profile, :parent => forum)
forum.children << past_post
forum.children << current_post
@@ -924,7 +924,7 @@ class ContentViewerControllerTest < ActionController::TestCase
login_as(profile.identifier)
a = Forum.create!(:name => 'article folder', :profile => profile)
Article.stubs(:short_description).returns('bli')
- t = TextileArticle.create!(:name => 'first post', :parent => a, :profile => profile)
+ t = TextArticle.create!(:name => 'first post', :parent => a, :profile => profile)
xhr :get, :view_page, :profile => profile.identifier, :page => [t.path], :toolbar => true
assert_tag :tag => 'a', :content => 'New discussion topic'
end
@@ -937,7 +937,7 @@ class ContentViewerControllerTest < ActionController::TestCase
community.add_member(author)
forum = Forum.create(:profile => community, :name => 'Forum test', :body => 'Forum test')
- post = fast_create(TextileArticle, :name => 'First post', :profile_id => community.id, :parent_id => forum.id, :author_id => author.id)
+ post = fast_create(TextArticle, :name => 'First post', :profile_id => community.id, :parent_id => forum.id, :author_id => author.id)
login_as(author.identifier)
get :view_page, :profile => community.identifier, :page => post.path.split('/')
@@ -953,7 +953,7 @@ class ContentViewerControllerTest < ActionController::TestCase
community.add_member(author)
forum = Forum.create(:profile => community, :name => 'Forum test', :body => 'Forum test')
- post = fast_create(TextileArticle, :name => 'First post', :profile_id => community.id, :parent_id => forum.id, :author_id => author.id)
+ post = fast_create(TextArticle, :name => 'First post', :profile_id => community.id, :parent_id => forum.id, :author_id => author.id)
login_as(author.identifier)
get :view_page, :profile => community.identifier, :page => post.path.split('/')
@@ -971,7 +971,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'add meta tag to rss feed on view post forum' do
login_as(profile.identifier)
profile.articles << Forum.new(:name => 'Forum', :profile => profile)
- profile.forum.posts << TextileArticle.new(:name => 'first post', :parent => profile.forum, :profile => profile)
+ profile.forum.posts << TextArticle.new(:name => 'first post', :parent => profile.forum, :profile => profile)
get :view_page, :profile => profile.identifier, :page => ['forum', 'first-post']
assert_tag :tag => 'link', :attributes => { :rel => 'alternate', :type => 'application/rss+xml', :title => 'Forum', :href => "http://#{environment.default_hostname}/testinguser/forum/feed" }
end
@@ -986,7 +986,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should "not display 'Upload files' when viewing post from a forum" do
login_as(profile.identifier)
b = Forum.create!(:name => 'article folder', :profile => profile)
- forum_post = TextileArticle.create!(:name => 'children-article', :profile => profile, :parent => b)
+ forum_post = TextArticle.create!(:name => 'children-article', :profile => profile, :parent => b)
xhr :get, :view_page, :profile => profile.identifier, :page => forum_post.path, :toolbar => true
assert_no_tag :tag => 'a', :content => 'Upload files', :attributes => {:href => /parent_id=#{b.id}/}
end
@@ -1002,9 +1002,9 @@ class ContentViewerControllerTest < ActionController::TestCase
environment.languages = ['en']
environment.save
login_as @profile.identifier
- textile = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')
+ textile = fast_create(TextArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')
xhr :get, :view_page, :profile => @profile.identifier, :page => textile.path, :toolbar => true
- assert_tag :a, :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?article%5Btranslation_of_id%5D=#{textile.id}&type=#{TextileArticle}" }
+ assert_tag :a, :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?article%5Btranslation_of_id%5D=#{textile.id}&type=#{TextArticle}" }
end
should 'not display add translation link if article is not translatable' do
@@ -1016,22 +1016,22 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'not display add translation link if article hasnt a language defined' do
login_as @profile.identifier
- textile = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile')
+ textile = fast_create(TextArticle, :profile_id => @profile.id, :path => 'textile')
xhr :get, :view_page, :profile => @profile.identifier, :page => textile.path, :toolbar => true
assert_no_tag :a, :attributes => { :content => 'Add translation', :class => /icon-locale/ }
end
should 'display translations link if article has translations' do
login_as @profile.identifier
- textile = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')
- translation = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'translation', :language => 'es', :translation_of_id => textile)
+ textile = fast_create(TextArticle, :profile_id => @profile.id, :path => 'textile', :language => 'en')
+ translation = fast_create(TextArticle, :profile_id => @profile.id, :path => 'translation', :language => 'es', :translation_of_id => textile)
xhr :get, :view_page, :profile => @profile.identifier, :page => textile.path, :toolbar => true
assert_tag :a, :attributes => { :class => /article-translations-menu/, :onmouseover => /toggleSubmenu/ }
end
should 'not be redirected if already in translation' do
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
@request.env['HTTP_REFERER'] = "http://localhost:3000/#{@profile.identifier}/#{es_article.path}"
FastGettext.stubs(:locale).returns('es')
get :view_page, :profile => @profile.identifier, :page => es_article.path
@@ -1041,15 +1041,15 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'not be redirected if article does not have a language' do
FastGettext.stubs(:locale).returns('es')
- article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'article')
+ article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'article')
get :view_page, :profile => @profile.identifier, :page => article.path
assert_response :success
assert_equal article, assigns(:page)
end
should 'not be redirected if http_referer is a translation' do
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
@request.env['HTTP_REFERER'] = "http://localhost:3000/#{@profile.identifier}/#{es_article.path}"
FastGettext.stubs(:locale).returns('es')
get :view_page, :profile => @profile.identifier, :page => en_article.path
@@ -1058,8 +1058,8 @@ class ContentViewerControllerTest < ActionController::TestCase
end
should 'not be redirected to transition if came from edit' do
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
FastGettext.stubs(:locale).returns('es')
@request.env['HTTP_REFERER'] = "http://localhost/myprofile/#{@profile.identifier}/cms/edit/#{en_article.id}"
get :view_page, :profile => @profile.identifier, :page => es_article.path
@@ -1068,8 +1068,8 @@ class ContentViewerControllerTest < ActionController::TestCase
end
should 'not be redirected to transition if came from new' do
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en')
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :translation_of_id => en_article)
FastGettext.stubs(:locale).returns('es')
@request.env['HTTP_REFERER'] = "http://localhost/myprofile/#{@profile.identifier}/cms/new"
get :view_page, :profile => @profile.identifier, :page => es_article.path
@@ -1082,8 +1082,8 @@ class ContentViewerControllerTest < ActionController::TestCase
blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
blog.display_posts_in_current_language = true
blog.save
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
get :view_page, :profile => @profile.identifier, :page => blog.path
assert_tag :div, :attributes => { :id => "post-#{es_article.id}" }
@@ -1095,12 +1095,12 @@ class ContentViewerControllerTest < ActionController::TestCase
blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
blog.display_posts_in_current_language = true
blog.save
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
- pt_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'pt', :parent_id => blog.id, :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
+ pt_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'pt', :parent_id => blog.id, :translation_of_id => en_article)
- en_article2 = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
- es_article2 = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article2)
+ en_article2 = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
+ es_article2 = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article2)
get :view_page, :profile => @profile.identifier, :page => blog.path
@@ -1111,8 +1111,8 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'list all posts at blog listing if blog option is disabled' do
FastGettext.stubs(:locale).returns('es')
blog = Blog.create!(:name => 'A blog test', :profile => profile, :display_posts_in_current_language => false)
- blog.posts << es_post = TextileArticle.create!(:name => 'Spanish Post', :profile => profile, :parent => blog, :language => 'es')
- blog.posts << en_post = TextileArticle.create!(:name => 'English Post', :profile => profile, :parent => blog, :language => 'en', :translation_of_id => es_post.id)
+ blog.posts << es_post = TextArticle.create!(:name => 'Spanish Post', :profile => profile, :parent => blog, :language => 'es')
+ blog.posts << en_post = TextArticle.create!(:name => 'English Post', :profile => profile, :parent => blog, :language => 'en', :translation_of_id => es_post.id)
get :view_page, :profile => profile.identifier, :page => [blog.path]
assert_equal 2, assigns(:posts).size
assert_tag :div, :attributes => { :id => "post-#{es_post.id}" }
@@ -1124,8 +1124,8 @@ class ContentViewerControllerTest < ActionController::TestCase
blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
blog.display_posts_in_current_language = true
blog.save!
- en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
- es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
+ en_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
+ es_article = fast_create(TextArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
blog.posts = [en_article, es_article]
get :view_page, :profile => @profile.identifier, :page => blog.path
@@ -1177,7 +1177,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'add an zero width space every 4 caracters of comment urls' do
url = 'www.an.url.to.be.splited.com'
- a = fast_create(TextileArticle, :profile_id => @profile.id, :language => 'en')
+ a = fast_create(TextArticle, :profile_id => @profile.id, :language => 'en')
c = a.comments.create!(:author => @profile, :title => 'An url', :body => url)
get :view_page, :profile => @profile.identifier, :page => a.path
assert_tag :a, :attributes => { :href => "http://" + url}, :content => url.scan(/.{4}/).join('')
@@ -1375,7 +1375,7 @@ class ContentViewerControllerTest < ActionController::TestCase
should 'not escape acceptable HTML in list of blog posts' do
login_as('testinguser')
blog = Blog.create!(:name => 'A blog test', :profile => profile)
- blog.posts << TinyMceArticle.create!(
+ blog.posts << TextArticle.create!(
:name => 'Post',
:profile => profile,
:parent => blog,
@@ -1443,7 +1443,7 @@ class ContentViewerControllerTest < ActionController::TestCase
blog = community.articles.find_by(name: "Blog")
- article = TinyMceArticle.create(:name => 'Article to be shared with images',
+ article = TextArticle.create(:name => 'Article to be shared with images',
:body => 'This article should be shared with all social networks',
:profile => community,
:published => false,
@@ -1571,7 +1571,7 @@ class ContentViewerControllerTest < ActionController::TestCase
blog.visualization_format = 'compact'
blog.save!
- article = TinyMceArticle.create(:name => 'Article to be shared with images',
+ article = TextArticle.create(:name => 'Article to be shared with images',
:body => 'This article should be shared with all social networks',
:profile => @profile,
:published => false,
diff --git a/test/functional/enterprise_registration_controller_test.rb b/test/functional/enterprise_registration_controller_test.rb
index d9abdc8..4d18884 100644
--- a/test/functional/enterprise_registration_controller_test.rb
+++ b/test/functional/enterprise_registration_controller_test.rb
@@ -58,7 +58,7 @@ class EnterpriseRegistrationControllerTest < ActionController::TestCase
region = fast_create(Region, {})
template = Enterprise.create!(:name => 'Enterprise Template', :identifier => 'enterprise-template', :is_template => true)
- welcome_page = TinyMceArticle.create!(:name => 'Welcome Page', :profile => template, :body => 'This is the welcome page of enterprise template.', :published => true)
+ welcome_page = TextArticle.create!(:name => 'Welcome Page', :profile => template, :body => 'This is the welcome page of enterprise template.', :published => true)
template.welcome_page = welcome_page
template.save!
diff --git a/test/functional/home_controller_test.rb b/test/functional/home_controller_test.rb
index 7b15e22..292276b 100644
--- a/test/functional/home_controller_test.rb
+++ b/test/functional/home_controller_test.rb
@@ -47,14 +47,14 @@ class HomeControllerTest < ActionController::TestCase
env = Environment.default
env.enable('use_portal_community')
c = fast_create(Community)
- a1 = TextileArticle.create!(:name => "Article 1",
+ a1 = TextArticle.create!(:name => "Article 1",
:profile => c,
:abstract => "This is the article1 lead.",
- :body => "This is the article1 body.",
+ :body => "This is the article1 body.
", :highlighted => true) - a2 = TextileArticle.create!(:name => "Article 2", + a2 = TextArticle.create!(:name => "Article 2", :profile => c, - :body => "This is the article2 body.", + :body => "This is the article2 body.
", :highlighted => true) env.portal_community = c env.save! @@ -62,8 +62,8 @@ class HomeControllerTest < ActionController::TestCase get :index assert_tag :attributes => { :class => 'headline' }, :content => a1.abstract - assert_no_tag :attributes => { :class => 'headline' }, :content => a1.body - assert_tag :attributes => { :class => 'headline' }, :content => a2.body + assert_no_tag :attributes => { :class => 'headline' }, :content => 'This is the article1 body.' + assert_tag :attributes => { :class => 'headline' }, :content => 'This is the article2 body.' end should 'display block in index page if it\'s configured to display on homepage and its an environment block' do @@ -128,7 +128,7 @@ class HomeControllerTest < ActionController::TestCase should 'display template welcome page' do template = create_user('template').person template.is_template = true - welcome_page = TinyMceArticle.create!(:name => 'Welcome page', :profile => template, :published => true, :body => 'Template welcome page') + welcome_page = TextArticle.create!(:name => 'Welcome page', :profile => template, :published => true, :body => 'Template welcome page') template.welcome_page = welcome_page template.save! get :welcome, :template_id => template.id @@ -138,7 +138,7 @@ class HomeControllerTest < ActionController::TestCase should 'not display template welcome page if it is not published' do template = create_user('template').person template.is_template = true - welcome_page = TinyMceArticle.create!(:name => 'Welcome page', :profile => template, :published => false, :body => 'Template welcome page') + welcome_page = TextArticle.create!(:name => 'Welcome page', :profile => template, :published => false, :body => 'Template welcome page') template.welcome_page = welcome_page template.save! get :welcome, :template_id => template.id diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb index 4fddb9c..369e888 100644 --- a/test/functional/profile_controller_test.rb +++ b/test/functional/profile_controller_test.rb @@ -518,9 +518,9 @@ class ProfileControllerTest < ActionController::TestCase should 'show number of published posts in index' do profile.articles << blog = create(Blog, :name => 'Blog', :profile_id => profile.id) - fast_create(TextileArticle, :name => 'Published post', :parent_id => profile.blog.id, :profile_id => profile.id) - fast_create(TextileArticle, :name => 'Other published post', :parent_id => profile.blog.id, :profile_id => profile.id) - fast_create(TextileArticle, :name => 'Unpublished post', :parent_id => profile.blog.id, :profile_id => profile.id, :published => false) + fast_create(TextArticle, :name => 'Published post', :parent_id => profile.blog.id, :profile_id => profile.id) + fast_create(TextArticle, :name => 'Other published post', :parent_id => profile.blog.id, :profile_id => profile.id) + fast_create(TextArticle, :name => 'Unpublished post', :parent_id => profile.blog.id, :profile_id => profile.id, :published => false) get :index, :profile => profile.identifier assert_tag :tag => 'a', :content => '2 posts', :attributes => { :href => /\/testuser\/#{blog.slug}/ } @@ -604,8 +604,8 @@ class ProfileControllerTest < ActionController::TestCase end should 'reverse the order of posts in tag feed' do - create(TextileArticle, :name => 'First post', :profile => profile, :tag_list => 'tag1', :published_at => Time.now) - create(TextileArticle, :name => 'Second post', :profile => profile, :tag_list => 'tag1', :published_at => Time.now + 1.day) + create(TextArticle, :name => 'First post', :profile => profile, :tag_list => 'tag1', :published_at => Time.now) + create(TextArticle, :name => 'Second post', :profile => profile, :tag_list => 'tag1', :published_at => Time.now + 1.day) get :tag_feed, :profile => profile.identifier, :id => 'tag1' assert_match(/Second.*First/, @response.body) @@ -613,11 +613,11 @@ class ProfileControllerTest < ActionController::TestCase should 'display the most recent posts in tag feed' do start = Time.now - 30.days - first = create(TextileArticle, :name => 'First post', :profile => profile, :tag_list => 'tag1', :published_at => start) + first = create(TextArticle, :name => 'First post', :profile => profile, :tag_list => 'tag1', :published_at => start) 20.times do |i| - create(TextileArticle, :name => 'Post #' + i.to_s, :profile => profile, :tag_list => 'tag1', :published_at => start + i.days) + create(TextArticle, :name => 'Post #' + i.to_s, :profile => profile, :tag_list => 'tag1', :published_at => start + i.days) end - last = create(TextileArticle, :name => 'Last post', :profile => profile, :tag_list => 'tag1', :published_at => Time.now) + last = create(TextArticle, :name => 'Last post', :profile => profile, :tag_list => 'tag1', :published_at => Time.now) get :tag_feed, :profile => profile.identifier, :id => 'tag1' assert_no_match(/First post/, @response.body) # First post is older than other 20 posts already @@ -755,7 +755,7 @@ class ProfileControllerTest < ActionController::TestCase scrap2 = create(Scrap, defaults_for_scrap(:sender => p2, :receiver => p1)) User.current = p1.user - create(TinyMceArticle, :profile => p1, :name => 'An article about free software') + create(TextArticle, :profile => p1, :name => 'An article about free software') a1 = ActionTracker::Record.last login_as(profile.identifier) @@ -787,10 +787,10 @@ class ProfileControllerTest < ActionController::TestCase scrap2 = create(Scrap, defaults_for_scrap(:sender => p2, :receiver => profile)) User.current = p3.user - article1 = TinyMceArticle.create!(:profile => p3, :name => 'An article about free software') + article1 = TextArticle.create!(:profile => p3, :name => 'An article about free software') User.current = p2.user - article2 = TinyMceArticle.create!(:profile => p2, :name => 'Another article about free software') + article2 = TextArticle.create!(:profile => p2, :name => 'Another article about free software') login_as(profile.identifier) get :index, :profile => p3.identifier @@ -1181,7 +1181,7 @@ class ProfileControllerTest < ActionController::TestCase should "view more activities paginated" do login_as(profile.identifier) - article = TinyMceArticle.create!(:profile => profile, :name => 'An Article about Free Software') + article = TextArticle.create!(:profile => profile, :name => 'An Article about Free Software') ActionTracker::Record.destroy_all 40.times{ create(ActionTracker::Record, :user_id => profile.id, :user_type => 'Profile', :verb => 'create_article', :target_id => article.id, :target_type => 'Article', :params => {'name' => article.name, 'url' => article.url, 'lead' => article.lead, 'first_image' => article.first_image})} assert_equal 40, profile.tracked_actions.count @@ -1214,7 +1214,7 @@ class ProfileControllerTest < ActionController::TestCase should "not index display activities comments" do login_as(profile.identifier) - article = TinyMceArticle.create!(:profile => profile, :name => 'An Article about Free Software') + article = TextArticle.create!(:profile => profile, :name => 'An Article about Free Software') ActionTracker::Record.destroy_all activity = create(ActionTracker::Record, :user_id => profile.id, :user_type => 'Profile', :verb => 'create_article', :target_id => article.id, :target_type => 'Article', :params => {'name' => article.name, 'url' => article.url, 'lead' => article.lead, 'first_image' => article.first_image}) 20.times {comment = fast_create(Comment, :source_id => article, :title => 'a comment', :body => 'lalala', :created_at => Time.now)} @@ -1225,7 +1225,7 @@ class ProfileControllerTest < ActionController::TestCase should "view more comments paginated" do login_as(profile.identifier) - article = TinyMceArticle.create!(:profile => profile, :name => 'An Article about Free Software') + article = TextArticle.create!(:profile => profile, :name => 'An Article about Free Software') ActionTracker::Record.destroy_all activity = create(ActionTracker::Record, :user_id => profile.id, :user_type => 'Profile', :verb => 'create_article', :target_id => article.id, :target_type => 'Article', :params => {'name' => article.name, 'url' => article.url, 'lead' => article.lead, 'first_image' => article.first_image}) 20.times {comment = fast_create(Comment, :source_id => article, :title => 'a comment', :body => 'lalala', :created_at => Time.now)} @@ -1341,7 +1341,7 @@ class ProfileControllerTest < ActionController::TestCase should 'register abuse report with content' do reported = fast_create(Profile) - content = fast_create(RawHTMLArticle, :profile_id => reported.id) + content = fast_create(TextArticle, :profile_id => reported.id) login_as(profile.identifier) @controller.stubs(:verify_recaptcha).returns(true) @@ -1368,7 +1368,7 @@ class ProfileControllerTest < ActionController::TestCase User.current = profile.user ActionTracker::Record.destroy_all - TinyMceArticle.create!(:profile => profile, :name => 'An article about free software') + TextArticle.create!(:profile => profile, :name => 'An article about free software') login_as(profile.identifier) get :index, :profile => profile.identifier @@ -1383,7 +1383,7 @@ class ProfileControllerTest < ActionController::TestCase User.current = profile.user ActionTracker::Record.destroy_all - TinyMceArticle.create!(:profile => profile, :name => 'An article about free software') + TextArticle.create!(:profile => profile, :name => 'An article about free software') activity = ActionTracker::Record.last login_as(profile.identifier) @@ -1393,14 +1393,14 @@ class ProfileControllerTest < ActionController::TestCase end should "follow an article" do - article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software') + article = TextArticle.create!(:profile => profile, :name => 'An article about free software') login_as(@profile.identifier) post :follow_article, :profile => profile.identifier, :article_id => article.id assert_includes article.person_followers, @profile end should "unfollow an article" do - article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software') + article = TextArticle.create!(:profile => profile, :name => 'An article about free software') article.person_followers << @profile article.save! assert_includes article.person_followers, @profile @@ -1411,7 +1411,7 @@ class ProfileControllerTest < ActionController::TestCase end should "be logged in to leave comment on an activity" do - article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software') + article = TextArticle.create!(:profile => profile, :name => 'An article about free software') activity = ActionTracker::Record.last count = activity.comments.count @@ -1422,7 +1422,7 @@ class ProfileControllerTest < ActionController::TestCase should "leave a comment in own activity" do login_as(profile.identifier) - TinyMceArticle.create!(:profile => profile, :name => 'An article about free software') + TextArticle.create!(:profile => profile, :name => 'An article about free software') activity = ActionTracker::Record.last count = activity.comments.count @@ -1436,7 +1436,7 @@ class ProfileControllerTest < ActionController::TestCase should "leave a comment on another profile's activity" do login_as(profile.identifier) another_person = fast_create(Person) - TinyMceArticle.create!(:profile => another_person, :name => 'An article about free software') + TextArticle.create!(:profile => another_person, :name => 'An article about free software') activity = ActionTracker::Record.last count = activity.comments.count assert_equal 0, count @@ -1448,7 +1448,7 @@ class ProfileControllerTest < ActionController::TestCase should 'display comment in wall if user was removed after click in view all comments' do User.current = profile.user - article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software') + article = TextArticle.create!(:profile => profile, :name => 'An article about free software') to_be_removed = create_user('removed_user').person comment = create(Comment, :author => to_be_removed, :title => 'Test Comment', :body => 'My author does not exist =(', :source_id => article.id, :source_type => 'Article') to_be_removed.destroy @@ -1465,7 +1465,7 @@ class ProfileControllerTest < ActionController::TestCase should 'not display spam comments in wall' do User.current = profile.user - article = TinyMceArticle.create!(:profile => profile, :name => 'An article about spam\'s nutritional attributes') + article = TextArticle.create!(:profile => profile, :name => 'An article about spam\'s nutritional attributes') comment = create(Comment, :author => profile, :title => 'Test Comment', :body => 'This article makes me hungry', :source_id => article.id, :source_type => 'Article') comment.spam! login_as(profile.identifier) @@ -1476,7 +1476,7 @@ class ProfileControllerTest < ActionController::TestCase should 'display comment in wall from non logged users after click in view all comments' do User.current = profile.user - article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software') + article = TextArticle.create!(:profile => profile, :name => 'An article about free software') comment = create(Comment, :name => 'outside user', :email => 'outside@localhost.localdomain', :title => 'Test Comment', :body => 'My author does not exist =(', :source_id => article.id, :source_type => 'Article') login_as(profile.identifier) diff --git a/test/functional/profile_editor_controller_test.rb b/test/functional/profile_editor_controller_test.rb index 000d132..a4b8522 100644 --- a/test/functional/profile_editor_controller_test.rb +++ b/test/functional/profile_editor_controller_test.rb @@ -534,8 +534,8 @@ class ProfileEditorControllerTest < ActionController::TestCase should 'render TinyMce Editor for header and footer' do get :header_footer, :profile => profile.identifier - assert_tag :tag => 'textarea', :attributes => { :id => 'custom_header', :class => 'mceEditor' } - assert_tag :tag => 'textarea', :attributes => { :id => 'custom_footer', :class => 'mceEditor' } + assert_tag :tag => 'textarea', :attributes => { :id => 'custom_header', :class => Article::Editor::TINY_MCE } + assert_tag :tag => 'textarea', :attributes => { :id => 'custom_footer', :class => Article::Editor::TINY_MCE } end should 'save footer and header' do @@ -966,7 +966,7 @@ class ProfileEditorControllerTest < ActionController::TestCase person_template = create_user('person_template').person person_template.is_template = true - welcome_page = fast_create(TinyMceArticle, :body => 'Initial welcome page') + welcome_page = fast_create(TextArticle, :body => 'Initial welcome page') person_template.welcome_page = welcome_page person_template.save! welcome_page.profile = person_template diff --git a/test/functional/profile_search_controller_test.rb b/test/functional/profile_search_controller_test.rb index c9c219c..afa4f81 100644 --- a/test/functional/profile_search_controller_test.rb +++ b/test/functional/profile_search_controller_test.rb @@ -21,15 +21,15 @@ class ProfileSearchControllerTest < ActionController::TestCase end should 'search for articles' do - article = TextileArticle.create(:name => 'My article', :body => 'Article to test profile search', :profile => person) + article = TextArticle.create(:name => 'My article', :body => 'Article to test profile search', :profile => person) get 'index', :profile => person.identifier, :q => 'article to test' assert_includes assigns(:results), article end should 'not display articles from another profile' do - article = TextileArticle.create(:name => 'My article', :body => 'Article to test profile search', :profile => person) - article2 = TextileArticle.create(:name => 'Another article', :body => 'Article from someone else', :profile => fast_create(Person)) + article = TextArticle.create(:name => 'My article', :body => 'Article to test profile search', :profile => person) + article2 = TextArticle.create(:name => 'Another article', :body => 'Article from someone else', :profile => fast_create(Person)) get 'index', :profile => person.identifier, :q => 'article' assert_includes assigns(:results), article @@ -49,7 +49,7 @@ class ProfileSearchControllerTest < ActionController::TestCase should 'paginate results listing' do (1..11).each do |i| - TextileArticle.create!(:name => "Article #{i}", :profile => person, :language => 'en') + TextArticle.create!(:name => "Article #{i}", :profile => person, :language => 'en') end get 'index', :profile => person.identifier, :q => 'Article' @@ -59,20 +59,20 @@ class ProfileSearchControllerTest < ActionController::TestCase end should 'display abstract if given' do - article1 = TextileArticle.create(:name => 'Article 1', :abstract => 'Abstract to test', :body => 'Article to test profile search', :profile => person) - article2 = TextileArticle.create(:name => 'Article 2', :body => 'Another article to test profile search', :profile => person) + article1 = TextArticle.create(:name => 'Article 1', :abstract => 'Abstract to test', :body => 'Article to test profile search
', :profile => person) + article2 = TextArticle.create(:name => 'Article 2', :body => 'Another article to test profile search
', :profile => person) get 'index', :profile => person.identifier, :q => 'article to test' assert_tag :tag => 'li', :descendant => { :tag => 'a', :content => article1.abstract, :attributes => { :class => /article-details/ }} - assert_no_tag :tag => 'li', :descendant => { :tag => 'a', :content => article1.body, :attributes => { :class => /article-details/ }} + assert_no_tag :tag => 'li', :descendant => { :tag => 'a', :content => 'Article to test profile search', :attributes => { :class => /article-details/ }} - assert_tag :tag => 'li', :descendant => { :tag => 'a', :content => article2.body, :attributes => { :class => /article-details/ }} + assert_tag :tag => 'li', :descendant => { :tag => 'a', :content => 'Another article to test profile search', :attributes => { :class => /article-details/ }} end should 'display nothing if search is blank' do - article1 = TextileArticle.create(:name => 'Article 1', :body => 'Article to test profile search', :profile => person) - article2 = TextileArticle.create(:name => 'Article 2', :body => 'Another article to test profile search', :profile => person) + article1 = TextArticle.create(:name => 'Article 1', :body => 'Article to test profile search', :profile => person) + article2 = TextArticle.create(:name => 'Article 2', :body => 'Another article to test profile search', :profile => person) get 'index', :profile => person.identifier, :q => '' @@ -80,19 +80,19 @@ class ProfileSearchControllerTest < ActionController::TestCase end should 'not display private articles' do - article1 = TextileArticle.create(:name => 'Article 1', :body => 'Article to test profile search', :profile => person, :published => false) - article2 = TextileArticle.create(:name => 'Article 2', :body => 'Another article to test profile search', :profile => person) + article1 = TextArticle.create(:name => 'Article 1', :body => 'Article to test profile search
', :profile => person, :published => false) + article2 = TextArticle.create(:name => 'Article 2', :body => 'Another article to test profile search
', :profile => person) get 'index', :profile => person.identifier, :q => 'article to test' - assert_no_tag :tag => 'li', :descendant => { :tag => 'a', :content => article1.body, :attributes => { :class => /article-details/ }} + assert_no_tag :tag => 'li', :descendant => { :tag => 'a', :content => 'Article to test profile search', :attributes => { :class => /article-details/ }} - assert_tag :tag => 'li', :descendant => { :tag => 'a', :content => article2.body, :attributes => { :class => /article-details/ }} + assert_tag :tag => 'li', :descendant => { :tag => 'a', :content => 'Another article to test profile search', :attributes => { :class => /article-details/ }} end should 'display number of results found' do - article1 = TextileArticle.create(:name => 'Article 1', :body => 'Article to test profile search', :profile => person) - article2 = TextileArticle.create(:name => 'Article 2', :body => 'Another article to test profile search', :profile => person) + article1 = TextArticle.create(:name => 'Article 1', :body => 'Article to test profile search', :profile => person) + article2 = TextArticle.create(:name => 'Article 2', :body => 'Another article to test profile search', :profile => person) get 'index', :profile => person.identifier, :q => 'article to test' diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb index 6e8dadf..8dd5510 100644 --- a/test/functional/search_controller_test.rb +++ b/test/functional/search_controller_test.rb @@ -309,9 +309,9 @@ class SearchControllerTest < ActionController::TestCase assert_tag :tag => 'table', :attributes => {:class => /current-month/}, :descendant => {:tag => 'caption', :content => /August 2008/} end - should 'found TextileArticle in articles' do + should 'found TextArticle in articles' do person = create_user('teste').person - art = TextileArticle.create!(:name => 'an text_article article to be found', :profile => person) + art = TextArticle.create!(:name => 'an text_article article to be found', :profile => person) get 'articles', :query => 'article to be found' diff --git a/test/functional/spam_controller_test.rb b/test/functional/spam_controller_test.rb index dfa2c7d..c63ed11 100644 --- a/test/functional/spam_controller_test.rb +++ b/test/functional/spam_controller_test.rb @@ -7,7 +7,7 @@ class SpamControllerTest < ActionController::TestCase @community = fast_create(Community, :name => 'testcommunity') @community.add_admin(@profile) - @article = fast_create(TextileArticle, :profile_id => @community.id) + @article = fast_create(TextArticle, :profile_id => @community.id) @spam_comment = fast_create(Comment, :source_id => @article.id, :spam => true, :name => 'foo', :email => 'foo@example.com') @spam_suggest_article = SuggestArticle.create!(:name => 'spammer', :article => {:name => 'Spam article', :body => "Something you don't need"}, :email => 'spammer@shady.place', :target => @community, :spam => true) diff --git a/test/functional/tasks_controller_test.rb b/test/functional/tasks_controller_test.rb index 33ecf99..4d437ae 100644 --- a/test/functional/tasks_controller_test.rb +++ b/test/functional/tasks_controller_test.rb @@ -325,23 +325,23 @@ class TasksControllerTest < ActionController::TestCase t = SuggestArticle.create!(:article => {:name => 'test name', :abstract => 'test abstract', :body => 'test body'}, :name => 'some name', :email => 'test@localhost.com', :target => c) get :index - assert_tag :tag => 'textarea', :content => /test abstract/, :attributes => { :name => /tasks\[#{t.id}\]\[task\]\[article\]\[abstract\]/, :class => 'mceEditor' } - assert_tag :tag => 'textarea', :content => /test body/, :attributes => { :name => /tasks\[#{t.id}\]\[task\]\[article\]\[body\]/, :class => 'mceEditor' } + assert_tag :tag => 'textarea', :content => /test abstract/, :attributes => { :name => /tasks\[#{t.id}\]\[task\]\[article\]\[abstract\]/, :class => Article::Editor::TINY_MCE } + assert_tag :tag => 'textarea', :content => /test body/, :attributes => { :name => /tasks\[#{t.id}\]\[task\]\[article\]\[body\]/, :class => Article::Editor::TINY_MCE } end - should 'create TinyMceArticle article after finish approve suggested article task' do - TinyMceArticle.destroy_all + should 'create TextArticle article after finish approve suggested article task' do + TextArticle.destroy_all c = fast_create(Community) c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id)) @controller.stubs(:profile).returns(c) t = SuggestArticle.create!(:article => {:name => 'test name', :body => 'test body'}, :name => 'some name', :email => 'test@localhost.com', :target => c) post :close, :tasks => {t.id => { :task => {}, :decision => "finish"}} - assert_not_nil TinyMceArticle.first + assert_not_nil TextArticle.first end should "change the article's attributes on suggested article task approval" do - TinyMceArticle.destroy_all + TextArticle.destroy_all c = fast_create(Community) c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id)) @controller.stubs(:profile).returns(c) @@ -353,11 +353,11 @@ class TasksControllerTest < ActionController::TestCase t.save! post :close, :tasks => {t.id => { :task => {:article => {:name => 'new article name', :body => 'new body', :source => 'http://www.noosfero.com', :source_name => 'new source'}, :name => 'new name'}, :decision => "finish"}} - assert_equal 'new article name', TinyMceArticle.first.name - assert_equal 'new name', TinyMceArticle.first.author_name - assert_equal 'new body', TinyMceArticle.first.body - assert_equal 'http://www.noosfero.com', TinyMceArticle.first.source - assert_equal 'new source', TinyMceArticle.first.source_name + assert_equal 'new article name', TextArticle.first.name + assert_equal 'new name', TextArticle.first.author_name + assert_equal 'new body', TextArticle.first.body + assert_equal 'http://www.noosfero.com', TextArticle.first.source + assert_equal 'new source', TextArticle.first.source_name end should "display name from article suggestion when requestor was not setted" do @@ -372,7 +372,7 @@ class TasksControllerTest < ActionController::TestCase end should "not crash when article suggestion task fails" do - TinyMceArticle.destroy_all + TextArticle.destroy_all c = fast_create(Community) c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id)) @controller.stubs(:profile).returns(c) diff --git a/test/integration/manage_documents_test.rb b/test/integration/manage_documents_test.rb index 33a8150..8b4a97e 100644 --- a/test/integration/manage_documents_test.rb +++ b/test/integration/manage_documents_test.rb @@ -17,14 +17,14 @@ class ManageDocumentsTest < ActionDispatch::IntegrationTest get '/myprofile/myuser/cms/new' assert_response :success - assert_tag :tag => 'a', :attributes => { :href => '/myprofile/myuser/cms/new?type=TinyMceArticle' } + assert_tag :tag => 'a', :attributes => { :href => '/myprofile/myuser/cms/new?type=TextArticle' } - get '/myprofile/myuser/cms/new?type=TinyMceArticle' + get '/myprofile/myuser/cms/new?type=TextArticle' assert_response :success assert_tag :tag => 'form', :attributes => { :action => '/myprofile/myuser/cms/new', :method => /post/i } assert_difference 'Article.count' do - post_via_redirect '/myprofile/myuser/cms/new', :type => 'TinyMceArticle', :article => { :name => 'my article', :body => 'this is the body of ther article'} + post_via_redirect '/myprofile/myuser/cms/new', :type => 'TextArticle', :article => { :name => 'my article', :body => 'this is the body of ther article'} end assert_response :success @@ -96,7 +96,7 @@ class ManageDocumentsTest < ActionDispatch::IntegrationTest protected def create_article(profile, options) - a = TinyMceArticle.new(options) + a = TextArticle.new(options) a.profile = profile a.save! a diff --git a/test/integration/performance_test.rb b/test/integration/performance_test.rb index f09dc8d..df2dc6d 100644 --- a/test/integration/performance_test.rb +++ b/test/integration/performance_test.rb @@ -49,7 +49,7 @@ class PerformanceTest < ActionDispatch::IntegrationTest blog = profile.blog n.times do |i| postnumber += 1 - TinyMceArticle.create!(:profile => profile, :parent => blog, :name => "post number #{postnumber}") + TextArticle.create!(:profile => profile, :parent => blog, :name => "post number #{postnumber}") end end diff --git a/test/integration/profile_blocks_test.rb b/test/integration/profile_blocks_test.rb index eedae82..4ab06b8 100644 --- a/test/integration/profile_blocks_test.rb +++ b/test/integration/profile_blocks_test.rb @@ -5,8 +5,8 @@ class ProfileBlocksTest < ActionDispatch::IntegrationTest def blog_on_article_block_bootstrap profile = fast_create(Profile) blog = fast_create(Blog, :name => 'Blog', :profile_id => profile.id) - fast_create(TinyMceArticle, :name => "First Post", :profile_id => profile.id, :parent_id => blog.id, :body => 'Wasserstoffbombe
') - fast_create(TinyMceArticle, :name => "A Post", :profile_id => profile.id, :parent_id => blog.id, :body => 'Lorem ipsum dolor sit amet
Second paragraph
') + fast_create(TextArticle, :name => "First Post", :profile_id => profile.id, :parent_id => blog.id, :body => 'Wasserstoffbombe
') + fast_create(TextArticle, :name => "A Post", :profile_id => profile.id, :parent_id => blog.id, :body => 'Lorem ipsum dolor sit amet
Second paragraph
') block = ArticleBlock.new block.article = blog profile.boxes << Box.new diff --git a/test/integration/safe_strings_test.rb b/test/integration/safe_strings_test.rb index f1868d3..7c4b42a 100644 --- a/test/integration/safe_strings_test.rb +++ b/test/integration/safe_strings_test.rb @@ -122,7 +122,7 @@ class SafeStringsTest < ActionDispatch::IntegrationTest create_user('jimi', :password => 'test', :password_confirmation => 'test').activate person = Person['jimi'] login 'jimi', 'test' - get "/myprofile/jimi/cms/new?type=TinyMceArticle" + get "/myprofile/jimi/cms/new?type=TextArticle" assert_no_match /title: "Safestringstest::plugin1::macro"/, response.body end @@ -134,7 +134,7 @@ class SafeStringsTest < ActionDispatch::IntegrationTest expected_content = 'something' html_content = "#{expected_content}
" - article = TinyMceArticle.create!(:profile => profile, :name => 'An Article about Free Software', :body => html_content) + article = TextArticle.create!(:profile => profile, :name => 'An Article about Free Software', :body => html_content) ActionTracker::Record.destroy_all activity = create(ActionTracker::Record, :user_id => profile.id, :user_type => 'Profile', :verb => 'create_article', :target_id => article.id, :target_type => 'Article', :params => {'name' => article.name, 'url' => article.url, 'lead' => article.lead, 'first_image' => article.first_image}) get "/profile/marley" @@ -178,7 +178,7 @@ class SafeStringsTest < ActionDispatch::IntegrationTest should 'not escape read more link to article on display short format' do profile = fast_create Profile blog = fast_create Blog, :name => 'Blog', :profile_id => profile.id - fast_create(TinyMceArticle, :name => "Post Test", :profile_id => profile.id, :parent_id => blog.id, :accept_comments => false, :body => 'Lorem ipsum dolor sit amet
') + fast_create(TextArticle, :name => "Post Test", :profile_id => profile.id, :parent_id => blog.id, :accept_comments => false, :body => 'Lorem ipsum dolor sit amet
') blog.update_attribute(:visualization_format, 'short') get "/#{profile.identifier}/blog" diff --git a/test/support/factories.rb b/test/support/factories.rb index 3c853c4..aadc416 100644 --- a/test/support/factories.rb +++ b/test/support/factories.rb @@ -118,7 +118,7 @@ module Noosfero::Factory }.merge(options) user = fast_insert_with_timestamps(User, data) person = fast_insert_with_timestamps(Person, { :type => 'Person', :identifier => name, :name => name, :user_id => user.id, :environment_id => environment_id }.merge(person_options)) - homepage = fast_insert_with_timestamps(TextileArticle, { :type => 'TextileArticle', :name => 'homepage', :slug => 'homepage', :path => 'homepage', :profile_id => person.id }) + homepage = fast_insert_with_timestamps(TextArticle, { :type => 'TextArticle', :name => 'homepage', :slug => 'homepage', :path => 'homepage', :profile_id => person.id }) fast_update(person, {:home_page_id => homepage.id}) box = fast_insert(Box, { :owner_type => "Profile", :owner_id => person.id, :position => 1}) block = fast_insert(Block, { :box_id => box.id, :type => 'MainBlock', :position => 0}) diff --git a/test/unit/action_tracker_notification_test.rb b/test/unit/action_tracker_notification_test.rb index 513b7d1..9a70f14 100644 --- a/test/unit/action_tracker_notification_test.rb +++ b/test/unit/action_tracker_notification_test.rb @@ -91,7 +91,7 @@ class ActionTrackerNotificationTest < ActiveSupport::TestCase should "have comments through article action_tracker" do user = User.current = create_user person = user.person - article = create(TextileArticle, :profile_id => person.id) + article = create(TextArticle, :profile_id => person.id) process_delayed_job_queue notification = ActionTrackerNotification.last diff --git a/test/unit/application_helper_test.rb b/test/unit/application_helper_test.rb index 736a036..e924baa 100644 --- a/test/unit/application_helper_test.rb +++ b/test/unit/application_helper_test.rb @@ -615,7 +615,7 @@ class ApplicationHelperTest < ActionView::TestCase should 'reference to article' do c = fast_create(Community) - a = fast_create(TinyMceArticle, :profile_id => c.id) + a = fast_create(TextArticle, :profile_id => c.id) assert_equal( "x", reference_to_article('x', a) ) @@ -623,7 +623,7 @@ class ApplicationHelperTest < ActionView::TestCase should 'reference to article, with anchor' do c = fast_create(Community) - a = fast_create(TinyMceArticle, :profile_id => c.id) + a = fast_create(TextArticle, :profile_id => c.id) assert_equal( "x", reference_to_article('x', a, 'place') ) @@ -632,7 +632,7 @@ class ApplicationHelperTest < ActionView::TestCase should 'reference to article, in a blog' do c = fast_create(Community) b = fast_create(Blog, :profile_id => c.id) - a = fast_create(TinyMceArticle, :profile_id => c.id, :parent_id => b.id) + a = fast_create(TextArticle, :profile_id => c.id, :parent_id => b.id) a.save! # needed to link to the parent blog assert_equal( "x", @@ -643,7 +643,7 @@ class ApplicationHelperTest < ActionView::TestCase c = fast_create(Community) c.domains << build(Domain, :name=>'domain.xyz') b = fast_create(Blog, :profile_id => c.id) - a = fast_create(TinyMceArticle, :profile_id => c.id, :parent_id => b.id) + a = fast_create(TextArticle, :profile_id => c.id, :parent_id => b.id) a.save! assert_equal( "x", @@ -856,7 +856,7 @@ class ApplicationHelperTest < ActionView::TestCase assert_equal "Clone Blog", label_for_clone_article(Blog.new) assert_equal "Clone Event", label_for_clone_article(Event.new) assert_equal "Clone Forum", label_for_clone_article(Forum.new) - assert_equal "Clone Article", label_for_clone_article(TinyMceArticle.new) + assert_equal "Clone Article", label_for_clone_article(TextArticle.new) end should "return top url of environment" do @@ -880,6 +880,86 @@ class ApplicationHelperTest < ActionView::TestCase assert_equal c.top_url, top_url end + should "current editor return the editor defined in article" do + person = fast_create(Person) + @article = fast_create(Article) + @article.editor = Article::Editor::TEXTILE + @article.save + stubs(:current_person).returns(person) + assert_equal Article::Editor::TEXTILE, current_editor + end + + should "current editor be tiny mce if an article is present and no editor is defined" do + person = fast_create(Person) + @article = fast_create(Article) + @article.editor = nil + @article.save + stubs(:current_person).returns(person) + assert_equal Article::Editor::TINY_MCE, current_editor + end + + should "current editor be the person editor if there is no article" do + person = fast_create(Person) + request = mock() + stubs(:current_person).returns(person) + person.stubs(:editor).returns(Article::Editor::TEXTILE) + assert_equal Article::Editor::TEXTILE, current_editor + end + + + should "current editor be tiny mce if there is no article and no person editor is defined" do + person = fast_create(Person) + stubs(:current_person).returns(person) + person.stubs(:editor).returns(nil) + assert_equal Article::Editor::TINY_MCE, current_editor + end + + should "current editor return the editor defined in article even if there is a person editor defined" do + person = fast_create(Person) + @article = fast_create(Article) + @article.editor = Article::Editor::TEXTILE + @article.save + stubs(:current_person).returns(person) + person.stubs(:editor).returns(Article::Editor::TINY_MCE) + assert_equal Article::Editor::TEXTILE, current_editor + end + + should "current editor be tiny mce if an article is present and no editor is defined even if there is a person editor defined" do + person = fast_create(Person) + @article = fast_create(Article) + @article.editor = nil + @article.save + stubs(:current_person).returns(person) + person.stubs(:editor).returns(Article::Editor::TINY_MCE) + assert_equal Article::Editor::TINY_MCE, current_editor + end + + should "current editor concat the mode passed as parameter" do + person = fast_create(Person) + @article = fast_create(Article) + @article.editor = Article::Editor::TEXTILE + @article.save + stubs(:current_person).returns(person) + mode = 'something' + assert_equal Article::Editor::TEXTILE + '_' + mode, current_editor(mode) + end + should "current_editor_is? be true if the test editor is equal to defined one" do + stubs(:current_editor).returns(Article::Editor::TEXTILE) + assert current_editor_is?(Article::Editor::TEXTILE) + end + + should "current_editor_is? be false if the test editor is different to defined one" do + stubs(:current_editor).returns(Article::Editor::TINY_MCE) + refute current_editor_is?(Article::Editor::TEXTILE) + end + + should "current_editor_is? be false if the test editor is nil" do + stubs(:current_editor).returns(Article::Editor::TEXTILE) + refute current_editor_is?(nil) + stubs(:current_editor).returns(Article::Editor::TINY_MCE) + refute current_editor_is?(nil) + end + protected include NoosferoTestHelper @@ -892,3 +972,4 @@ class ApplicationHelperTest < ActionView::TestCase end end + diff --git a/test/unit/approve_article_test.rb b/test/unit/approve_article_test.rb index db5c002..3bc3227 100644 --- a/test/unit/approve_article_test.rb +++ b/test/unit/approve_article_test.rb @@ -8,7 +8,7 @@ class ApproveArticleTest < ActiveSupport::TestCase ActionMailer::Base.deliveries = [] User.current = @user = create_user 'test_user' @profile = @user.person - @article = fast_create(TextileArticle, :profile_id => @profile.id, :name => 'test name', :abstract => 'Lead of article', :body => 'This is my article') + @article = fast_create(TextArticle, :profile_id => @profile.id, :name => 'test name', :abstract => 'Lead of article', :body => 'This is my article') @community = fast_create(Community) @community.add_member(@profile) end @@ -257,15 +257,15 @@ class ApproveArticleTest < ActiveSupport::TestCase other_community.add_member(profile) ActionTracker::Record.delete_all - article = fast_create(TextileArticle) + article = fast_create(TextArticle) a = create(ApproveArticle, :name => 'bar', :article => article, :target => community, :requestor => profile) a.finish - article = fast_create(TextileArticle) + article = fast_create(TextArticle) a = create(ApproveArticle, :name => 'another bar', :article => article, :target => community, :requestor => profile) a.finish - article = fast_create(TextileArticle) + article = fast_create(TextArticle) a = create(ApproveArticle, :name => 'another bar', :article => article, :target => other_community, :requestor => profile) a.finish assert_equal 3, ActionTracker::Record.count @@ -275,11 +275,11 @@ class ApproveArticleTest < ActiveSupport::TestCase other_community = fast_create(Community) other_community.add_member(profile) ActionTracker::Record.delete_all - article1 = fast_create(TextileArticle) + article1 = fast_create(TextArticle) a = create(ApproveArticle, :name => 'bar', :article => article1, :target => community, :requestor => profile) a.finish - article2 = fast_create(TinyMceArticle) + article2 = fast_create(TextArticle) a = create(ApproveArticle, :name => 'another bar', :article => article2, :target => other_community, :requestor => profile) a.finish assert_equal 2, ActionTracker::Record.count diff --git a/test/unit/approve_comment_test.rb b/test/unit/approve_comment_test.rb index a2fe7a7..0201572 100644 --- a/test/unit/approve_comment_test.rb +++ b/test/unit/approve_comment_test.rb @@ -7,7 +7,7 @@ class ApproveCommentTest < ActiveSupport::TestCase ActionMailer::Base.perform_deliveries = true ActionMailer::Base.deliveries = [] @profile = create_user('test_user', :email => "someone@anyhost.com").person - @article = fast_create(TextileArticle, :profile_id => @profile.id, :name => 'test name', :abstract => 'Lead of article', :body => 'This is my article') + @article = fast_create(TextArticle, :profile_id => @profile.id, :name => 'test name', :abstract => 'Lead of article', :body => 'This is my article') @community = create(Community, :contact_email => "someone@anyhost.com") @comment = build(Comment, :article => @article, :title => 'any comment', :body => "any text", :author => create_user('someperson').person) end diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb index ce46e2d..ac4d45e 100644 --- a/test/unit/article_test.rb +++ b/test/unit/article_test.rb @@ -341,9 +341,9 @@ class ArticleTest < ActiveSupport::TestCase should 'list most commented articles' do Article.delete_all - a1 = create(TextileArticle, :name => "art 1", :profile_id => profile.id) - a2 = create(TextileArticle, :name => "art 2", :profile_id => profile.id) - a3 = create(TextileArticle, :name => "art 3", :profile_id => profile.id) + a1 = create(TextArticle, :name => "art 1", :profile_id => profile.id) + a2 = create(TextArticle, :name => "art 2", :profile_id => profile.id) + a3 = create(TextArticle, :name => "art 3", :profile_id => profile.id) 2.times { create(Comment, :title => 'test', :body => 'asdsad', :author => profile, :source => a2).save! } 4.times { create(Comment, :title => 'test', :body => 'asdsad', :author => profile, :source => a3).save! } @@ -643,14 +643,14 @@ class ArticleTest < ActiveSupport::TestCase should 'identify if belongs to blog' do p = create_user('user_blog_test').person blog = fast_create(Blog, :name => 'Blog test', :profile_id => p.id) - post = fast_create(TextileArticle, :name => 'First post', :profile_id => p.id, :parent_id => blog.id) + post = fast_create(TextArticle, :name => 'First post', :profile_id => p.id, :parent_id => blog.id) assert post.belongs_to_blog? end should 'not belongs to blog' do p = create_user('user_blog_test').person folder = fast_create(Folder, :name => 'Not Blog', :profile_id => p.id) - a = fast_create(TextileArticle, :name => 'Not blog post', :profile_id => p.id, :parent_id => folder.id) + a = fast_create(TextArticle, :name => 'Not blog post', :profile_id => p.id, :parent_id => folder.id) refute a.belongs_to_blog? end @@ -955,7 +955,7 @@ class ArticleTest < ActiveSupport::TestCase end should 'have short lead' do - a = fast_create(TinyMceArticle, :body => '' + ('a' *180) + '
') + a = fast_create(TextArticle, :body => '' + ('a' *180) + '
') assert_equal 170, a.short_lead.length end @@ -965,7 +965,7 @@ class ArticleTest < ActiveSupport::TestCase end should 'track action when a published article is created outside a community' do - article = create(TinyMceArticle, :profile_id => profile.id) + article = create(TextArticle, :profile_id => profile.id) ta = article.activity assert_equal article.name, ta.get_name assert_equal article.url, ta.get_url @@ -980,7 +980,7 @@ class ArticleTest < ActiveSupport::TestCase community.add_member(p2) User.current = p1.user - article = create(TinyMceArticle, :profile_id => community.id) + article = create(TextArticle, :profile_id => community.id) activity = article.activity process_delayed_job_queue @@ -989,7 +989,7 @@ class ArticleTest < ActiveSupport::TestCase end should 'destroy activity when a published article is removed' do - a = create(TinyMceArticle, :profile_id => profile.id) + a = create(TextArticle, :profile_id => profile.id) assert_difference 'ActionTracker::Record.count', -1 do a.destroy end @@ -1022,7 +1022,7 @@ class ArticleTest < ActiveSupport::TestCase end should 'create activity' do - a = create TextileArticle, :name => 'bar', :profile_id => profile.id, :published => true + a = create TextArticle, :name => 'bar', :profile_id => profile.id, :published => true a.activity.destroy assert_nil a.activity @@ -1068,7 +1068,7 @@ class ArticleTest < ActiveSupport::TestCase should "not be trackable if article is inside a private community" do private_community = fast_create(Community, :public_profile => false) - a = fast_create(TinyMceArticle, :profile_id => private_community.id) + a = fast_create(TextArticle, :profile_id => private_community.id) assert_equal false, a.is_trackable? end @@ -1081,7 +1081,7 @@ class ArticleTest < ActiveSupport::TestCase member_1 = User.current.person community.add_member(member_1) - article = create TinyMceArticle, :name => 'Tracked Article 1', :profile_id => community.id + article = create TextArticle, :name => 'Tracked Article 1', :profile_id => community.id first_activity = article.activity assert_equal [first_activity], ActionTracker::Record.where(verb: 'create_article') @@ -1091,7 +1091,7 @@ class ArticleTest < ActiveSupport::TestCase member_2 = fast_create(Person) community.add_member(member_2) - article2 = create TinyMceArticle, :name => 'Tracked Article 2', :profile_id => community.id + article2 = create TextArticle, :name => 'Tracked Article 2', :profile_id => community.id second_activity = article2.activity assert_equivalent [first_activity, second_activity], ActionTracker::Record.where(verb: 'create_article') @@ -1107,7 +1107,7 @@ class ArticleTest < ActiveSupport::TestCase ActionTracker::Record.destroy_all ActionTrackerNotification.destroy_all User.current = profile.user - article = create(TinyMceArticle, :profile_id => profile.id) + article = create(TextArticle, :profile_id => profile.id) process_delayed_job_queue assert_equal friend, ActionTrackerNotification.last.profile @@ -1119,7 +1119,7 @@ class ArticleTest < ActiveSupport::TestCase f1.follow(profile, circle) User.current = profile.user - article = create TinyMceArticle, :name => 'Tracked Article 1', :profile_id => profile.id + article = create TextArticle, :name => 'Tracked Article 1', :profile_id => profile.id assert_equal 1, ActionTracker::Record.where(verb: 'create_article').count process_delayed_job_queue assert_equal 2, ActionTrackerNotification.where(action_tracker_id: article.activity.id).count @@ -1128,7 +1128,7 @@ class ArticleTest < ActiveSupport::TestCase circle2 = Circle.create!(:person=> f2, :name => "Zombies", :profile_type => 'Person') f2.follow(profile, circle2) - article2 = create TinyMceArticle, :name => 'Tracked Article 2', :profile_id => profile.id + article2 = create TextArticle, :name => 'Tracked Article 2', :profile_id => profile.id assert_equal 2, ActionTracker::Record.where(verb: 'create_article').count process_delayed_job_queue assert_equal 3, ActionTrackerNotification.where(action_tracker_id: article2.activity.id).count @@ -1145,7 +1145,7 @@ class ArticleTest < ActiveSupport::TestCase ActionTracker::Record.destroy_all ActionTrackerNotification.destroy_all User.current = profile.user - article = create(TinyMceArticle, :profile_id => profile.id) + article = create(TextArticle, :profile_id => profile.id) activity = article.activity process_delayed_job_queue @@ -1168,7 +1168,7 @@ class ArticleTest < ActiveSupport::TestCase community.add_member(p2) User.current = p1.user - article = create(TinyMceArticle, :profile_id => community.id) + article = create(TextArticle, :profile_id => community.id) activity = article.activity process_delayed_job_queue @@ -1410,7 +1410,7 @@ class ArticleTest < ActiveSupport::TestCase should 'retrieve latest info from topic when has no comments' do forum = fast_create(Forum, :name => 'Forum test', :profile_id => profile.id) - post = fast_create(TextileArticle, :name => 'First post', :profile_id => profile.id, :parent_id => forum.id, :updated_at => Time.now.in_time_zone, :author_id => profile.id) + post = fast_create(TextArticle, :name => 'First post', :profile_id => profile.id, :parent_id => forum.id, :updated_at => Time.now.in_time_zone, :author_id => profile.id) assert_equal post.updated_at, post.info_from_last_update[:date] assert_equal profile.name, post.info_from_last_update[:author_name] assert_equal profile.url, post.info_from_last_update[:author_url] @@ -1418,19 +1418,15 @@ class ArticleTest < ActiveSupport::TestCase should 'retrieve latest info from comment when has comments' do forum = fast_create(Forum, :name => 'Forum test', :profile_id => profile.id) - post = fast_create(TextileArticle, :name => 'First post', :profile_id => profile.id, :parent_id => forum.id, :updated_at => Time.now.in_time_zone) + post = fast_create(TextArticle, :name => 'First post', :profile_id => profile.id, :parent_id => forum.id, :updated_at => Time.now.in_time_zone) post.comments << build(Comment, :name => 'Guest', :email => 'guest@example.com', :title => 'test comment', :body => 'hello!') assert_equal post.comments.last.created_at, post.info_from_last_update[:date] assert_equal "Guest", post.info_from_last_update[:author_name] assert_nil post.info_from_last_update[:author_url] end - should 'tiny mce editor is disabled by default' do - refute Article.new.tiny_mce? - end - should 'return only folders' do - not_folders = [RssFeed, TinyMceArticle, Event, TextileArticle] + not_folders = [RssFeed, TextArticle, Event, TextArticle] folders = [Folder, Blog, Gallery, Forum] not_folders.each do |klass| @@ -1445,7 +1441,7 @@ class ArticleTest < ActiveSupport::TestCase end should 'return no folders' do - not_folders = [RssFeed, TinyMceArticle, Event, TextileArticle] + not_folders = [RssFeed, TextArticle, Event, TextArticle] folders = [Folder, Blog, Gallery, Forum] not_folders.each do |klass| @@ -1485,7 +1481,7 @@ class ArticleTest < ActiveSupport::TestCase should 'get images paths in article body' do Environment.any_instance.stubs(:default_hostname).returns('noosfero.org') - a = build TinyMceArticle, :profile => @profile + a = build TextArticle, :profile => @profile a.body = 'Noosfero test '
assert_includes a.body_images_paths, 'http://noosfero.com/test.png'
assert_includes a.body_images_paths, 'http://test.com/noosfero.png'
@@ -1493,7 +1489,7 @@ class ArticleTest < ActiveSupport::TestCase
should 'always put article image first in images paths list in article body' do
Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
- a = create(TinyMceArticle, :name => 'test', :image_builder => {
+ a = create(TextArticle, :name => 'test', :image_builder => {
:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')
}, :profile_id => @profile.id)
a.save!
@@ -1504,7 +1500,7 @@ class ArticleTest < ActiveSupport::TestCase
should 'escape utf8 characters correctly' do
Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
- a = build TinyMceArticle, profile: @profile
+ a = build TextArticle, profile: @profile
a.body = 'Noosfero '
assert_includes a.body_images_paths, 'http://noosfero.com/cabe%C3%A7a.png'
@@ -1515,7 +1511,7 @@ class ArticleTest < ActiveSupport::TestCase
should 'get absolute images paths in article body' do
Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
- a = build TinyMceArticle, :profile => @profile
+ a = build TextArticle, :profile => @profile
a.body = 'Noosfero test '
assert_includes a.body_images_paths, 'http://noosfero.org/test.png'
assert_includes a.body_images_paths, 'http://noosfero.org/relative/path.png'
@@ -1545,13 +1541,13 @@ class ArticleTest < ActiveSupport::TestCase
should 'find more recent contents' do
Article.delete_all
- c1 = fast_create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id, :created_at => DateTime.now - 4)
- c2 = fast_create(TinyMceArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile_id => profile.id, :created_at => DateTime.now - 1)
- c3 = fast_create(TinyMceArticle, :name => 'Testing article 3', :body => 'Article body 3', :profile_id => profile.id, :created_at => DateTime.now - 3)
+ c1 = fast_create(TextArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id, :created_at => DateTime.now - 4)
+ c2 = fast_create(TextArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile_id => profile.id, :created_at => DateTime.now - 1)
+ c3 = fast_create(TextArticle, :name => 'Testing article 3', :body => 'Article body 3', :profile_id => profile.id, :created_at => DateTime.now - 3)
assert_equal [c2,c3,c1] , Article.more_recent
- c4 = fast_create(TinyMceArticle, :name => 'Testing article 4', :body => 'Article body 4', :profile_id => profile.id, :created_at => DateTime.now - 2)
+ c4 = fast_create(TextArticle, :name => 'Testing article 4', :body => 'Article body 4', :profile_id => profile.id, :created_at => DateTime.now - 2)
assert_equal [c2,c4,c3,c1] , Article.more_recent
end
@@ -1604,18 +1600,6 @@ class ArticleTest < ActiveSupport::TestCase
assert_equal "4 views", a.more_popular_label
end
- should 'return only text articles' do
- Article.delete_all
-
- c1 = fast_create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id)
- c2 = fast_create(TextArticle, :name => 'Testing article 2', :body => 'Article body 2', :profile_id => profile.id)
- c3 = fast_create(Event, :name => 'Testing article 3', :body => 'Article body 3', :profile_id => profile.id)
- c4 = fast_create(RssFeed, :name => 'Testing article 4', :body => 'Article body 4', :profile_id => profile.id)
- c5 = fast_create(TextileArticle, :name => 'Testing article 5', :body => 'Article body 5', :profile_id => profile.id)
-
- assert_equivalent [c1,c2,c5], Article.text_articles
- end
-
should 'delegate region info to profile' do
Person.any_instance.expects(:region)
Person.any_instance.expects(:region_id)
@@ -1708,7 +1692,7 @@ class ArticleTest < ActiveSupport::TestCase
author = fast_create(Person)
community.add_member(author)
forum = Forum.create(:profile => community, :name => 'Forum test', :body => 'Forum test')
- post = fast_create(TextileArticle, :name => 'First post', :profile_id => community.id, :parent_id => forum.id, :author_id => author.id)
+ post = fast_create(TextArticle, :name => 'First post', :profile_id => community.id, :parent_id => forum.id, :author_id => author.id)
assert post.allow_edit?(author)
end
@@ -1742,7 +1726,7 @@ class ArticleTest < ActiveSupport::TestCase
end
should 'store first image in tracked action' do
- a = create TinyMceArticle, :name => 'Tracked Article', :body => 'Foo
Bar
FooBar