From ae1c68f2d0aa014d79d19458283a4f8bf0ac9317 Mon Sep 17 00:00:00 2001 From: Joenio Costa Date: Tue, 15 Feb 2011 20:39:05 -0300 Subject: [PATCH] Enabling tiny mce editor for Events --- app/models/event.rb | 4 ++++ app/views/cms/_event.rhtml | 2 +- test/functional/cms_controller_test.rb | 5 +++++ test/unit/article_test.rb | 4 ++++ test/unit/event_test.rb | 4 ++++ test/unit/tiny_mce_article_test.rb | 5 +++++ 6 files changed, 23 insertions(+), 1 deletion(-) diff --git a/app/models/event.rb b/app/models/event.rb index 53840c1..b6722ff 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -116,6 +116,10 @@ class Event < Article true end + def tiny_mce? + true + end + include Noosfero::TranslatableContent include MaybeAddHttp diff --git a/app/views/cms/_event.rhtml b/app/views/cms/_event.rhtml index fedd5aa..f6aec62 100644 --- a/app/views/cms/_event.rhtml +++ b/app/views/cms/_event.rhtml @@ -15,5 +15,5 @@ <%= labelled_form_field(_('Address:'), text_field(:article, :address)) %> -<%= labelled_form_field(_('Information about the event:'), text_area(:article, :body, :cols => 64)) %> +<%= labelled_form_field(_('Information about the event:'), text_area(:article, :body, :cols => 64, :class => 'mceEditor')) %> diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb index 2421d2c..755abdc 100644 --- a/test/functional/cms_controller_test.rb +++ b/test/functional/cms_controller_test.rb @@ -1576,4 +1576,9 @@ class CmsControllerTest < Test::Unit::TestCase assert_redirected_to :action => 'view', :id => f end + should 'render TinyMce Editor for events' do + get :new, :profile => @profile.identifier, :type => 'Event' + assert_tag :tag => 'textarea', :attributes => { :class => 'mceEditor' } + end + end diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb index 20406d6..3717b5d 100644 --- a/test/unit/article_test.rb +++ b/test/unit/article_test.rb @@ -1440,4 +1440,8 @@ class ArticleTest < Test::Unit::TestCase assert_nil post.info_from_last_update[:author_url] end + should 'tiny mce editor is disabled by default' do + assert !Article.new.tiny_mce? + end + end diff --git a/test/unit/event_test.rb b/test/unit/event_test.rb index f6d361b..7ff9c54 100644 --- a/test/unit/event_test.rb +++ b/test/unit/event_test.rb @@ -270,4 +270,8 @@ class EventTest < ActiveSupport::TestCase assert_kind_of Noosfero::TranslatableContent, Event.new end + should 'tiny mce editor is enabled' do + assert Event.new.tiny_mce? + end + end diff --git a/test/unit/tiny_mce_article_test.rb b/test/unit/tiny_mce_article_test.rb index b930529..6a44928 100644 --- a/test/unit/tiny_mce_article_test.rb +++ b/test/unit/tiny_mce_article_test.rb @@ -236,4 +236,9 @@ class TinyMceArticleTest < Test::Unit::TestCase assert_equal false, a.advertise? assert_equal false, a.is_trackable? end + + should 'tiny mce editor is enabled' do + assert TinyMceArticle.new.tiny_mce? + end + end -- libgit2 0.21.2