cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2022-12-22 15:49:28 +00:00
commit 5be5155e03
5 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/controllers/api/changesets_controller_test.rb
View file

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

1
test/controllers/diary_entries_controller_test.rb
View file

@ -325,7 +325,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
assert_select "p", :text => /#{new_body}/, :count => 1 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 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 # 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 assert_select "a[href='/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
end end

1
test/controllers/users_controller_test.rb
View file

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

4
test/integration/user_diaries_test.rb
View file

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

1
test/models/way_test.rb
View file

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