Download as
Browse Code »

Commit cecea6c4380e1e5b004dd9a338999103a77600bb

Authored by Evandro Jr
1 parent e34756f0
Exists in master

fix tests

Showing 3 changed files with 5 additions and 68 deletions   Show diff stats
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @cecea6c
@@ -11,7 +11,7 @@ class ContentViewerControllerTest < ActionController::TestCase @@ -11,7 +11,7 @@ class ContentViewerControllerTest < ActionController::TestCase
11 11
12 def setup 12 def setup
13 @profile = fast_create(Community) 13 @profile = fast_create(Community)
14 - @page = fast_create(Article, :profile_id => @profile.id, :body => "<div class=\"macro\" data-macro-paragraph_id=\"1\" data-macro='comment_paragraph_plugin/allow_comment' ></div>") 14 + @page = fast_create(Article, :profile_id => @profile.id, :body => "<div class=\"macro\" data-macro-paragraph_id=\"0\" data-macro='comment_paragraph_plugin/allow_comment' ></div>")
15 @environment = Environment.default 15 @environment = Environment.default
16 @environment.enable_plugin(CommentParagraphPlugin) 16 @environment.enable_plugin(CommentParagraphPlugin)
17 end 17 end
@@ -19,10 +19,9 @@ class ContentViewerControllerTest &lt; ActionController::TestCase @@ -19,10 +19,9 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
19 attr_reader :page 19 attr_reader :page
20 20
21 should 'parse article body and render comment paragraph view' do 21 should 'parse article body and render comment paragraph view' do
22 - comment1 = fast_create(Comment, :paragraph_id => 1, :source_id => page.id) 22 + comment1 = fast_create(Comment, :paragraph_id => 0, :source_id => page.id)
23 get :view_page, @page.url 23 get :view_page, @page.url
24 - assert_tag 'div', :attributes => {:class => 'comment_paragraph_1'}  
25 - assert_tag 'div', :attributes => {:id => 'comments_paragraph_count_1'} 24 + assert_tag 'div', :attributes => {:class => 'comment_paragraph'}
26 end 25 end
27 26
28 end 27 end
test/unit/article_test.rb
  Diff comments   View file @cecea6c
@@ -16,41 +16,11 @@ class ArticleTest &lt; ActiveSupport::TestCase @@ -16,41 +16,11 @@ class ArticleTest &lt; ActiveSupport::TestCase
16 assert_equal [comment1], article.paragraph_comments 16 assert_equal [comment1], article.paragraph_comments
17 end 17 end
18 18
19 - should 'do not allow a exclusion of a paragraph comment macro if this paragraph has comments' do  
20 - article.body = "<div class=\"macro\" data-macro-paragraph_id=2></div>"  
21 - comment1 = fast_create(Comment, :paragraph_id => 1, :source_id => article.id)  
22 - assert !article.save  
23 - assert_equal ['Not empty paragraph comment cannot be removed'], article.errors[:base]  
24 - end  
25 -  
26 should 'allow save if comment paragraph macro is not removed for paragraph with comments' do 19 should 'allow save if comment paragraph macro is not removed for paragraph with comments' do
27 - article.body = "<div class=\"macro\" data-macro-paragraph_id=1></div>"  
28 - comment1 = fast_create(Comment, :paragraph_id => 1, :source_id => article.id)  
29 - assert article.save  
30 - end  
31 -  
32 - should 'do not validate empty paragraph if article body is not changed' do  
33 - article.body = "<div class=\"macro\" data-macro-paragraph_id=2></div>"  
34 - assert article.save  
35 - comment1 = fast_create(Comment, :paragraph_id => 1, :source_id => article.id)  
36 - article.name = article.name + 'changed' 20 + article.body = "<div class=\"macro\" data-macro-paragraph_id=0></div>"
  21 + comment1 = fast_create(Comment, :paragraph_id => 0, :source_id => article.id)
37 assert article.save 22 assert article.save
38 end 23 end
39 24
40 - should 'improve performance checking changes in body' do  
41 - i = 1  
42 - time0 = (Benchmark.measure { 50.times {  
43 - i = i + 1  
44 - article.body = "i = #{i}"  
45 - assert article.save  
46 - }})  
47 - i = 1  
48 - time1 = (Benchmark.measure { 50.times {  
49 - i = i + 1  
50 - article.body = "i = 1"  
51 - assert article.save  
52 - }})  
53 - assert time0.total > time1.total  
54 - end  
55 25
56 end 26 end
test/unit/comment_paragraph_plugin_test.rb
  Diff comments   View file @cecea6c
@@ -25,36 +25,4 @@ class CommentParagraphPluginTest &lt; ActiveSupport::TestCase @@ -25,36 +25,4 @@ class CommentParagraphPluginTest &lt; ActiveSupport::TestCase
25 assert plugin.stylesheet? 25 assert plugin.stylesheet?
26 end 26 end
27 27
28 - should 'have extra contents for comment form' do  
29 - comment = fast_create(Comment, :paragraph_id => 1)  
30 - content = plugin.comment_form_extra_contents({:comment => comment})  
31 - expects(:hidden_field_tag).with('comment[paragraph_id]', comment.paragraph_id).once  
32 - instance_eval(&content)  
33 - end  
34 -  
35 - should 'do not have extra contents for comments without paragraph' do  
36 - comment = fast_create(Comment, :paragraph_id => nil)  
37 - content = plugin.comment_form_extra_contents({:comment => comment})  
38 - assert_equal nil, instance_eval(&content)  
39 - end  
40 -  
41 - should 'call without_paragraph for scope passed as parameter to unavailable_comments' do  
42 - article = fast_create(Article)  
43 - article.expects(:without_paragraph).once  
44 - plugin.unavailable_comments(article)  
45 - end  
46 -  
47 -#FIXME Obsolete test  
48 -#  
49 -# should 'filter_comments returns all the comments wihout paragraph of an article passed as parameter' do  
50 -# article = fast_create(Article)  
51 -# c1 = fast_create(Comment, :source_id => article.id, :paragraph_id => 1)  
52 -# c2 = fast_create(Comment, :source_id => article.id)  
53 -# c3 = fast_create(Comment, :source_id => article.id)  
54 -#  
55 -# plugin = CommentParagraphPlugin.new  
56 -# assert_equal [], [c2, c3] - plugin.filter_comments(article.comments)  
57 -# assert_equal [], plugin.filter_comments(article.comments) - [c2, c3]  
58 -# end  
59 -  
60 end 28 end