Download as
Browse Code »

Commit 3c2de986d2eba190314b40e2961d7be7ac6327d4

Authored by Victor Costa
1 parent 356ed1a3
Exists in master and in 26 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Validate article type in SuggestArticle

Showing 2 changed files with 17 additions and 1 deletions   Show diff stats
app/models/suggest_article.rb
  Diff comments   View file @3c2de98
@@ -36,7 +36,11 @@ class SuggestArticle < Task @@ -36,7 +36,11 @@ class SuggestArticle < Task
36 end 36 end
37 37
38 def article_type 38 def article_type
39 - (article[:type] || 'TinyMceArticle').constantize 39 + if article[:type].present?
  40 + type = article[:type].constantize
  41 + return type if type < Article
  42 + end
  43 + TinyMceArticle
40 end 44 end
41 45
42 def perform 46 def perform
test/unit/suggest_article_test.rb
  Diff comments   View file @3c2de98
@@ -230,4 +230,16 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase @@ -230,4 +230,16 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
230 end 230 end
231 end 231 end
232 232
  233 + should 'accept article type parameter' do
  234 + t = SuggestArticle.new
  235 + t.article = {:name => 'name', :body => 'body', :type => 'TextArticle'}
  236 + t.article_type == TextArticle
  237 + end
  238 +
  239 + should 'fallback to tinymce when type parameter is invalid' do
  240 + t = SuggestArticle.new
  241 + t.article = {:name => 'name', :body => 'body', :type => 'Comment'}
  242 + t.article_type == TinyMceArticle
  243 + end
  244 +
233 end 245 end