Merge remote-tracking branch 'upstream/pull/3856'

test/controllers/api/changesets_controller_test.rb

@@ -1768,7 +1768,7 @@ module Api
       get changeset_download_path(changeset)
 
       assert_response :success
-      # print @response.body
+
       # FIXME: needs more assert_select tests
       assert_select "osmChange[version='#{Settings.api_version}'][generator='#{Settings.generator}']" do
         assert_select "create", :count => 5

test/controllers/diary_entries_controller_test.rb

@@ -325,7 +325,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
       assert_select "p", :text => /#{new_body}/, :count => 1
       assert_select "abbr[class='geo'][title='#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}']", :count => 1
       # As we're not logged in, check that you cannot edit
-      # print @response.body
       assert_select "a[href='/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
     end
 

test/controllers/users_controller_test.rb

@@ -529,7 +529,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     get user_path(seen_user)
     assert_response :success
-    # put @response.body
     assert_select "div.content-heading" do
       assert_select "dt", :count => 1, :text => /Contributor terms/
       assert_select "dd", /Declined/

test/integration/user_diaries_test.rb

@@ -15,7 +15,7 @@ class UserDiariesTest < ActionDispatch::IntegrationTest
     # We can now login
     post "/login", :params => { "username" => user.email, "password" => "test", :referer => "/diary/new" }
     assert_response :redirect
-    # print @response.body
+
     # Check that there is some payload alerting the user to the redirect
     # and allowing them to get to the page they are being directed to
     assert_select "html:root" do
@@ -30,8 +30,6 @@ class UserDiariesTest < ActionDispatch::IntegrationTest
 
     assert_response :success
     assert_template "diary_entries/new"
-    # print @response.body
-    # print @html_document.to_yaml
 
     # We will make sure that the form exists here, full
     # assert testing of the full form should be done in the

test/models/way_test.rb

@@ -34,7 +34,6 @@ class WayTest < ActiveSupport::TestCase
       way.add_nd_num(node_b.id)
     end
     way.save
-    # print way.nds.size
     assert_predicate way, :valid?
     way.add_nd_num(node_c.id)
     assert_predicate way, :valid?