Download as
Browse Code »

Commit 20c5b0d1d3b2ff23c07a1b1edd6ee27edf9c1927

Authored by Junior Silva
1 parent 83008eab
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

Changing tests to check diff posts and using strings instead files

Showing 2 changed files with 19 additions and 5 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @20c5b0d
... ... @@ -120,8 +120,8 @@ class ContentViewerController < ApplicationController
120 120 end
121 121 end
122 122  
123   - def self.versioning_articles(article1, article2)
124   - Diffy::Diff.new('article1', 'article2', :source => 'files').to_s(:html)
  123 + def self.versioning_articles(string1, string2)
  124 + Diffy::Diff.new('string1', 'string2').to_s(:html)
125 125 end
126 126  
127 127 protected
... ...
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @20c5b0d
... ... @@ -1195,9 +1195,23 @@ class ContentViewerControllerTest < ActionController::TestCase
1195 1195 end
1196 1196  
1197 1197 should 'display differences between article versions' do
1198   - file1 = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'bin/unknown'), :profile => profile)
1199   - file2 = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'bin/unknown'), :profile => profile)
1200   - ContentViewerController.versioning_articles('file1','file2')
  1198 + blog = Blog.create!(:name => 'A blog test', :profile => profile)
  1199 + blog.posts << TinyMceArticle.create!(
  1200 + :name => 'Post1',
  1201 + :profile => profile,
  1202 + :parent => blog,
  1203 + :published => true,
  1204 + :body => "<p>This is a <strong>bold</strong> statement right there!</p>"
  1205 + )
  1206 +
  1207 + blog.posts << TinyMceArticle.create!(
  1208 + :name => 'Post2',
  1209 + :profile => profile,
  1210 + :parent => blog,
  1211 + :published => true,
  1212 + :body => "<p>That is a <strong>bold</strong> statement right there!</p>"
  1213 + )
  1214 + ContentViewerController.versioning_articles('Post1','Post2')
1201 1215 end
1202 1216  
1203 1217 should 'not display comments marked as spam' do
... ...