Download as
Browse Code »

Commit 56915809caf11bd4f53e27270aad12c8cff2eed1

Authored by Rodrigo Souto
1 parent c1cd1797
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

Fixing approve comment json lib call 

(ActionItem2737)
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/models/approve_comment.rb
  Diff comments   View file @5691580
@@ -6,7 +6,7 @@ class ApproveComment < Task @@ -6,7 +6,7 @@ class ApproveComment < Task
6 validates_presence_of :comment_attributes 6 validates_presence_of :comment_attributes
7 7
8 def comment 8 def comment
9 - @comment ||= Comment.new(JSON.parse(self.comment_attributes)) unless self.comment_attributes.nil? 9 + @comment ||= Comment.new(ActiveSupport::JSON.decode(self.comment_attributes)) unless self.comment_attributes.nil?
10 end 10 end
11 11
12 def requestor_name 12 def requestor_name
test/functional/comment_controller_test.rb
  Diff comments   View file @5691580
@@ -150,7 +150,7 @@ class CommentControllerTest < ActionController::TestCase @@ -150,7 +150,7 @@ class CommentControllerTest < ActionController::TestCase
150 login_as @profile.identifier 150 login_as @profile.identifier
151 page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text') 151 page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
152 xhr :post, :create, :profile => @profile.identifier, :id => page.id, :comment => { :title => '', :body => '' }, :confirm => 'true' 152 xhr :post, :create, :profile => @profile.identifier, :id => page.id, :comment => { :title => '', :body => '' }, :confirm => 'true'
153 - response = JSON.parse @response.body 153 + response = ActiveSupport::JSON.decode @response.body
154 assert_match /errorExplanation/, response["html"] 154 assert_match /errorExplanation/, response["html"]
155 end 155 end
156 156
@@ -507,7 +507,7 @@ class CommentControllerTest < ActionController::TestCase @@ -507,7 +507,7 @@ class CommentControllerTest < ActionController::TestCase
507 comment = fast_create(Comment, :body => 'Original comment', :source_id => page.id, :source_type => 'Article', :author_id => profile) 507 comment = fast_create(Comment, :body => 'Original comment', :source_id => page.id, :source_type => 'Article', :author_id => profile)
508 508
509 xhr :post, :update, :id => comment.id, :profile => profile.identifier, :comment => { :body => 'Comment edited' } 509 xhr :post, :update, :id => comment.id, :profile => profile.identifier, :comment => { :body => 'Comment edited' }
510 - assert JSON.parse(@response.body)["ok"], "attribute ok expected to be true" 510 + assert ActiveSupport::JSON.decode(@response.body)["ok"], "attribute ok expected to be true"
511 assert_equal 'Comment edited', Comment.find(comment.id).body 511 assert_equal 'Comment edited', Comment.find(comment.id).body
512 end 512 end
513 513