Commit af578baecae355464e60bb2e36997891a607e147
1 parent
90eebff2
Exists in
master
and in
29 other branches
Fixed comment_test
Also fixed missing 'end' cms_controller_test
Showing
2 changed files
with
6 additions
and
1 deletions
Show diff stats
test/functional/cms_controller_test.rb
| @@ -1544,7 +1544,7 @@ class CmsControllerTest < Test::Unit::TestCase | @@ -1544,7 +1544,7 @@ class CmsControllerTest < Test::Unit::TestCase | ||
| 1544 | # making some adjustments. | 1544 | # making some adjustments. |
| 1545 | def parse_json_response | 1545 | def parse_json_response |
| 1546 | eval(@response.body.gsub('":', '"=>').gsub('null', 'nil')) | 1546 | eval(@response.body.gsub('":', '"=>').gsub('null', 'nil')) |
| 1547 | - ed | 1547 | + end |
| 1548 | 1548 | ||
| 1549 | should 'make RawHTMLArticle available only to environment admins' do | 1549 | should 'make RawHTMLArticle available only to environment admins' do |
| 1550 | @controller.stubs(:profile).returns(profile) | 1550 | @controller.stubs(:profile).returns(profile) |
test/unit/comment_test.rb
| @@ -2,6 +2,10 @@ require File.dirname(__FILE__) + '/../test_helper' | @@ -2,6 +2,10 @@ require File.dirname(__FILE__) + '/../test_helper' | ||
| 2 | 2 | ||
| 3 | class CommentTest < Test::Unit::TestCase | 3 | class CommentTest < Test::Unit::TestCase |
| 4 | 4 | ||
| 5 | + def setup | ||
| 6 | + Comment.skip_captcha! | ||
| 7 | + end | ||
| 8 | + | ||
| 5 | should 'have a name and require it' do | 9 | should 'have a name and require it' do |
| 6 | assert_mandatory(Comment.new, :title) | 10 | assert_mandatory(Comment.new, :title) |
| 7 | end | 11 | end |
| @@ -328,6 +332,7 @@ class CommentTest < Test::Unit::TestCase | @@ -328,6 +332,7 @@ class CommentTest < Test::Unit::TestCase | ||
| 328 | end | 332 | end |
| 329 | 333 | ||
| 330 | should 'have the captcha_solution be solved' do | 334 | should 'have the captcha_solution be solved' do |
| 335 | + Comment.dont_skip_captcha! | ||
| 331 | c = Comment.new | 336 | c = Comment.new |
| 332 | assert !c.valid? && c.errors.invalid?(:captcha_solution) | 337 | assert !c.valid? && c.errors.invalid?(:captcha_solution) |
| 333 | c.skip_captcha! | 338 | c.skip_captcha! |