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

[rails.git] / test / controllers / ways_controller_test.rb

diff --git a/test/controllers/ways_controller_test.rb b/test/controllers/ways_controller_test.rb
index 995004cb4179236a95c8998263b90e872ae9366b..5b80a070cffcd7ef0e7d04f43b5561ccea6d9c93 100644 (file)
--- a/test/controllers/ways_controller_test.rb
+++ b/test/controllers/ways_controller_test.rb
@@ -12,7 +12,7 @@ class WaysControllerTest < ActionDispatch::IntegrationTest
 
   def test_show
     way = create(:way)
 
   def test_show
     way = create(:way)

-    sidebar_browse_check :way_path, way.id, "browse/feature"
+    sidebar_browse_check :way_path, way.id, "elements/show"

     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
     end
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
     end


@@ -23,7 +23,7 @@ class WaysControllerTest < ActionDispatch::IntegrationTest
 
   def test_show_multiple_versions
     way = create(:way, :with_history, :version => 2)
 
   def test_show_multiple_versions
     way = create(:way, :with_history, :version => 2)

-    sidebar_browse_check :way_path, way.id, "browse/feature"
+    sidebar_browse_check :way_path, way.id, "elements/show"

     assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_way_path way, 2}']", :count => 1
     assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_way_path way, 2}']", :count => 1


@@ -33,7 +33,7 @@ class WaysControllerTest < ActionDispatch::IntegrationTest
     member = create(:way)
     relation = create(:relation)
     create(:relation_member, :relation => relation, :member => member)
     member = create(:way)
     relation = create(:relation)
     create(:relation_member, :relation => relation, :member => member)

-    sidebar_browse_check :way_path, member.id, "browse/feature"
+    sidebar_browse_check :way_path, member.id, "elements/show"

     assert_select "a[href='#{relation_path relation}']", :count => 1
   end
 
     assert_select "a[href='#{relation_path relation}']", :count => 1
   end