Download as
Browse Code »

Commit 79890fcaba6fba6394a3573a1961c845c8a835bf

Authored by Junior Silva
1 parent 20c5b0d1
Exists in master and in 28 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_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

article-version: versioned_article: using diff to show differences between versions of article 

AI2822
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @79890fc
... ... @@ -120,7 +120,7 @@ class ContentViewerController < ApplicationController
120 120 end
121 121 end
122 122  
123   - def self.versioning_articles(string1, string2)
  123 + def versioning_articles(string1, string2)
124 124 Diffy::Diff.new('string1', 'string2').to_s(:html)
125 125 end
126 126  
... ...
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @79890fc
... ... @@ -1211,7 +1211,7 @@ class ContentViewerControllerTest < ActionController::TestCase
1211 1211 :published => true,
1212 1212 :body => "<p>That is a <strong>bold</strong> statement right there!</p>"
1213 1213 )
1214   - ContentViewerController.versioning_articles('Post1','Post2')
  1214 + @controller.versioning_articles('Post1','Post2')
1215 1215 end
1216 1216  
1217 1217 should 'not display comments marked as spam' do
... ...