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

Use squiggly heredocs instead of rails strip_heredoc

Browse source 
Squiggly heredocs were introduced in ruby 2.3 and I prefer the ability
to indent the closing heredoc marker.
This commit is contained in:
Andy Allan 2019-12-11 10:54:19 +01:00
parent b9d9785330
commit 7595e5a4dd
3 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -282,7 +282,7 @@ module Api
# simple diff to change a node, way and relation by removing # simple diff to change a node, way and relation by removing
# their tags # their tags
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<modify> <modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/> <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
@ -311,7 +311,7 @@ CHANGESET
# simple diff to change a node, way and relation by removing # simple diff to change a node, way and relation by removing
# their tags # their tags
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<modify> <modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/> <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
@ -340,7 +340,7 @@ CHANGESET
# simple diff to change a node, way and relation by removing # simple diff to change a node, way and relation by removing
# their tags # their tags
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<modify> <modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/> <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
@ -381,7 +381,7 @@ CHANGESET
basic_authorization user.email, "test" basic_authorization user.email, "test"
# simple diff to create a node way and relation using placeholders # simple diff to create a node way and relation using placeholders
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<create> <create>
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'> <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
@ -529,7 +529,7 @@ CHANGESET
changeset_id = @response.body.to_i changeset_id = @response.body.to_i
# upload some widely-spaced nodes, spiralling positive and negative # upload some widely-spaced nodes, spiralling positive and negative
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<create> <create>
<node id='-1' lon='-20' lat='-10' changeset='#{changeset_id}'/> <node id='-1' lon='-20' lat='-10' changeset='#{changeset_id}'/>
@ -683,7 +683,7 @@ CHANGESET
basic_authorization changeset.user.email, "test" basic_authorization changeset.user.email, "test"
# simple diff to create a node way and relation using placeholders # simple diff to create a node way and relation using placeholders
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<create> <create>
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'> <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
@ -713,7 +713,7 @@ CHANGESET
basic_authorization changeset.user.email, "test" basic_authorization changeset.user.email, "test"
# simple diff to create a node way and relation using placeholders # simple diff to create a node way and relation using placeholders
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<create> <create>
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'> <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
@ -772,7 +772,7 @@ CHANGESET
basic_authorization changeset.user.email, "test" basic_authorization changeset.user.email, "test"
# simple diff to create a node way and relation using placeholders # simple diff to create a node way and relation using placeholders
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<modify> <modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/> <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
@ -817,7 +817,7 @@ CHANGESET
# change the location of a node multiple times, each time referencing # change the location of a node multiple times, each time referencing
# the last version. doesn't this depend on version numbers being # the last version. doesn't this depend on version numbers being
# sequential? # sequential?
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<modify> <modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/> <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
@ -852,7 +852,7 @@ CHANGESET
basic_authorization changeset.user.email, "test" basic_authorization changeset.user.email, "test"
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<modify> <modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/> <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
@ -874,7 +874,7 @@ CHANGESET
basic_authorization changeset.user.email, "test" basic_authorization changeset.user.email, "test"
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<modify> <modify>
<node id='1' lon='1' lat='1' changeset='#{changeset.id}'/> <node id='1' lon='1' lat='1' changeset='#{changeset.id}'/>
@ -895,7 +895,7 @@ CHANGESET
basic_authorization changeset.user.email, "test" basic_authorization changeset.user.email, "test"
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<ping> <ping>
<node id='1' lon='1' lat='1' changeset='#{changeset.id}' /> <node id='1' lon='1' lat='1' changeset='#{changeset.id}' />
@ -920,7 +920,7 @@ CHANGESET
basic_authorization changeset.user.email, "test" basic_authorization changeset.user.email, "test"
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<modify><node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' <modify><node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}'
version='1'></node> version='1'></node>
@ -955,7 +955,7 @@ CHANGESET
basic_authorization changeset.user.email, "test" basic_authorization changeset.user.email, "test"
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<create> <create>
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'> <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
@ -989,7 +989,7 @@ CHANGESET
basic_authorization changeset.user.email, "test" basic_authorization changeset.user.email, "test"
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<create> <create>
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/> <node id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
@ -1014,7 +1014,7 @@ CHANGESET
basic_authorization changeset.user.email, "test" basic_authorization changeset.user.email, "test"
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<create> <create>
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/> <node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
@ -1037,7 +1037,7 @@ CHANGESET
assert_equal "Placeholder node not found for reference -4 in way -1", @response.body assert_equal "Placeholder node not found for reference -4 in way -1", @response.body
# the same again, but this time use an existing way # the same again, but this time use an existing way
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<create> <create>
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/> <node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
@ -1069,7 +1069,7 @@ CHANGESET
basic_authorization changeset.user.email, "test" basic_authorization changeset.user.email, "test"
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<create> <create>
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/> <node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
@ -1092,7 +1092,7 @@ CHANGESET
assert_equal "Placeholder Node not found for reference -4 in relation -1.", @response.body assert_equal "Placeholder Node not found for reference -4 in relation -1.", @response.body
# the same again, but this time use an existing relation # the same again, but this time use an existing relation
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<create> <create>
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/> <node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
@ -1266,7 +1266,7 @@ CHANGESET
changeset_id = @response.body.to_i changeset_id = @response.body.to_i
# add a diff to it # add a diff to it
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<modify> <modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/> <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
@ -1310,7 +1310,7 @@ CHANGESET
assert_response :success assert_response :success
changeset_id = @response.body.to_i changeset_id = @response.body.to_i
diff = <<OSMFILE.strip_heredoc diff = <<~OSMFILE
<osmChange version="0.6" generator="JOSM"> <osmChange version="0.6" generator="JOSM">
<create version="0.6" generator="JOSM"> <create version="0.6" generator="JOSM">
<node id='-1' visible='true' changeset='#{changeset_id}' lat='51.49619982187321' lon='-0.18722061869438314' /> <node id='-1' visible='true' changeset='#{changeset_id}' lat='51.49619982187321' lon='-0.18722061869438314' />
@ -1372,7 +1372,7 @@ OSMFILE
changeset_id = @response.body.to_i changeset_id = @response.body.to_i
# add a diff to it # add a diff to it
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<delete> <delete>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/> <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>

6
test/controllers/api/relations_controller_test.rb
View file

@ -737,7 +737,7 @@ module Api
basic_authorization user.email, "test" basic_authorization user.email, "test"
doc_str = <<OSM.strip_heredoc doc_str = <<~OSM
<osm> <osm>
<relation changeset='#{changeset.id}'> <relation changeset='#{changeset.id}'>
<member ref='#{node1.id}' type='node' role='first'/> <member ref='#{node1.id}' type='node' role='first'/>
@ -795,7 +795,7 @@ OSM
node1 = create(:node) node1 = create(:node)
node2 = create(:node) node2 = create(:node)
doc_str = <<OSM.strip_heredoc doc_str = <<~OSM
<osm> <osm>
<relation changeset='#{changeset.id}'> <relation changeset='#{changeset.id}'>
<member ref='#{node1.id}' type='node' role='forward'/> <member ref='#{node1.id}' type='node' role='forward'/>
@ -836,7 +836,7 @@ OSM
node3 = create(:node) node3 = create(:node)
node4 = create(:node) node4 = create(:node)
doc_str = <<OSM.strip_heredoc doc_str = <<~OSM
<osm> <osm>
<relation changeset='#{changeset.id}'> <relation changeset='#{changeset.id}'>
<member ref='#{node1.id}' type='node' role='forward'/> <member ref='#{node1.id}' type='node' role='forward'/>

6
test/integration/compressed_requests_test.rb
View file

@ -16,7 +16,7 @@ class CompressedRequestsTest < ActionDispatch::IntegrationTest
# simple diff to change a node, way and relation by removing # simple diff to change a node, way and relation by removing
# their tags # their tags
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<modify> <modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/> <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
@ -65,7 +65,7 @@ CHANGESET
# simple diff to change a node, way and relation by removing # simple diff to change a node, way and relation by removing
# their tags # their tags
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<modify> <modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/> <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
@ -115,7 +115,7 @@ CHANGESET
# simple diff to change a node, way and relation by removing # simple diff to change a node, way and relation by removing
# their tags # their tags
diff = <<CHANGESET.strip_heredoc diff = <<~CHANGESET
<osmChange> <osmChange>
<modify> <modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/> <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>