Download as
Browse Code »

Commit 79890fcaba6fba6394a3573a1961c845c8a835bf

Authored by Junior Silva
1 parent 20c5b0d1
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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,7 +120,7 @@ class ContentViewerController < ApplicationController
120 end 120 end
121 end 121 end
122 122
123 - def self.versioning_articles(string1, string2) 123 + def versioning_articles(string1, string2)
124 Diffy::Diff.new('string1', 'string2').to_s(:html) 124 Diffy::Diff.new('string1', 'string2').to_s(:html)
125 end 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,7 +1211,7 @@ class ContentViewerControllerTest < ActionController::TestCase
1211 :published => true, 1211 :published => true,
1212 :body => "<p>That is a <strong>bold</strong> statement right there!</p>" 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 end 1215 end
1216 1216
1217 should 'not display comments marked as spam' do 1217 should 'not display comments marked as spam' do