From c24967d1685024079e29c84fa307c355625e92d0 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 22 Aug 2011 22:42:38 +0100 Subject: [PATCH 1/1] Remove :root qualifiers as they don't seem to work in rails 2.3.14 --- test/functional/api_controller_test.rb | 16 ++++++++-------- test/functional/diary_entry_controller_test.rb | 12 ++++++------ test/functional/user_controller_test.rb | 2 +- .../user_preference_controller_test.rb | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/functional/api_controller_test.rb b/test/functional/api_controller_test.rb index d5b1163e1..9226e3892 100644 --- a/test/functional/api_controller_test.rb +++ b/test/functional/api_controller_test.rb @@ -37,7 +37,7 @@ class ApiControllerTest < ActionController::TestCase print @response.body end assert_response :success, "Expected scucess with the map call" - assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']:root", :count => 1 do + assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do assert_select "bounds[minlon=#{minlon}][minlat=#{minlat}][maxlon=#{maxlon}][maxlat=#{maxlat}]", :count => 1 assert_select "node[id=#{node.id}][lat=#{node.lat}][lon=#{node.lon}][version=#{node.version}][changeset=#{node.changeset_id}][visible=#{node.visible}][timestamp=#{node.timestamp.xmlschema}]", :count => 1 do # This should really be more generic @@ -54,7 +54,7 @@ class ApiControllerTest < ActionController::TestCase bbox = "#{node.lon},#{node.lat},#{node.lon},#{node.lat}" get :map, :bbox => bbox assert_response :success, "The map call should have succeeded" - assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']:root", :count => 1 do + assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do assert_select "bounds[minlon=#{node.lon}][minlat=#{node.lat}][maxlon=#{node.lon}][maxlat=#{node.lat}]", :count => 1 assert_select "node[id=#{node.id}][lat=#{node.lat}][lon=#{node.lon}][version=#{node.version}][changeset=#{node.changeset_id}][visible=#{node.visible}][timestamp=#{node.timestamp.xmlschema}]", :count => 1 do # This should really be more generic @@ -73,7 +73,7 @@ class ApiControllerTest < ActionController::TestCase bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" get :trackpoints, :bbox => bbox assert_response :success - assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]:root", :count => 1 do + assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]", :count => 1 do assert_select "trk" do assert_select "trkseg" end @@ -89,7 +89,7 @@ class ApiControllerTest < ActionController::TestCase bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" get :trackpoints, :bbox => bbox assert_response :success - assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]:root", :count => 1 do + assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]", :count => 1 do assert_select "trk", :count => 1 do assert_select "trk > trkseg", :count => 2 do |trksegs| trksegs.each do |trkseg| @@ -111,7 +111,7 @@ class ApiControllerTest < ActionController::TestCase bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" get :trackpoints, :bbox => bbox assert_response :success - assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]:root", :count => 1 do + assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]", :count => 1 do assert_select "trk", :count => 1 do assert_select "trk>name", :count => 1 assert_select "trk>desc", :count => 1 @@ -210,7 +210,7 @@ class ApiControllerTest < ActionController::TestCase # changes at the time we have frozen at now = Time.now.getutc hourago = now - 1.hour - assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']:root", :count => 1 do + assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 end Timecop.return @@ -231,7 +231,7 @@ class ApiControllerTest < ActionController::TestCase assert_response :success # NOTE: there was a test here for the timing, but it was too sensitive to be a good test # and it was annoying. - assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']:root", :count => 1 do + assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do assert_select "changes", :count => 1 end end @@ -264,7 +264,7 @@ class ApiControllerTest < ActionController::TestCase def test_capabilities get :capabilities assert_response :success - assert_select "osm:root[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do + assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do assert_select "api", :count => 1 do assert_select "version[minimum=#{API_VERSION}][maximum=#{API_VERSION}]", :count => 1 assert_select "area[maximum=#{MAX_REQUEST_AREA}]", :count => 1 diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb index b4ff824bd..1914880f3 100644 --- a/test/functional/diary_entry_controller_test.rb +++ b/test/functional/diary_entry_controller_test.rb @@ -16,7 +16,7 @@ class DiaryEntryControllerTest < ActionController::TestCase #print @response.body #print @response.to_yaml - assert_select "html:root", :count => 1 do + assert_select "html", :count => 1 do assert_select "head", :count => 1 do assert_select "title", :text => /New Diary Entry/, :count => 1 end @@ -52,7 +52,7 @@ class DiaryEntryControllerTest < ActionController::TestCase # Verify that you get a not found error, when you don't pass an id get(:edit, nil, {'user' => users(:normal_user).id}) assert_response :not_found - assert_select "html:root", :count => 1 do + assert_select "html", :count => 1 do assert_select "body", :count => 1 do assert_select "div#content", :count => 1 do assert_select "h2", :text => "No entry with the id:", :count => 1 @@ -64,7 +64,7 @@ class DiaryEntryControllerTest < ActionController::TestCase # user as the person who created the entry get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id}) assert_response :success - assert_select "html:root", :count => 1 do + assert_select "html", :count => 1 do assert_select "head", :count => 1 do assert_select "title", :text => /Edit diary entry/, :count => 1 end @@ -101,7 +101,7 @@ class DiaryEntryControllerTest < ActionController::TestCase get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:normal_user).id} assert_response :success assert_template 'diary_entry/view' - assert_select "html:root", :count => 1 do + assert_select "html", :count => 1 do assert_select "head", :count => 1 do assert_select "title", :text => /Users' diaries | /, :count => 1 end @@ -124,7 +124,7 @@ class DiaryEntryControllerTest < ActionController::TestCase get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:public_user).id} assert_response :success assert_template 'diary_entry/view' - assert_select "html:root", :count => 1 do + assert_select "html", :count => 1 do assert_select "head", :count => 1 do assert_select "title", :text => /Users' diaries | /, :count => 1 end @@ -179,7 +179,7 @@ class DiaryEntryControllerTest < ActionController::TestCase def test_rss get :rss assert_response :success, "Should be able to get a diary RSS" - assert_select "rss:root", :count => 1 do + assert_select "rss", :count => 1 do assert_select "channel", :count => 1 do assert_select "channel>title", :count => 1 assert_select "image", :count => 1 diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb index 1c591f0e6..750cfbaaf 100644 --- a/test/functional/user_controller_test.rb +++ b/test/functional/user_controller_test.rb @@ -8,7 +8,7 @@ class UserControllerTest < ActionController::TestCase get :new assert_response :success - assert_select "html:root", :count => 1 do + assert_select "html", :count => 1 do assert_select "head", :count => 1 do assert_select "title", :text => /Create account/, :count => 1 end diff --git a/test/functional/user_preference_controller_test.rb b/test/functional/user_preference_controller_test.rb index 714f45c5d..2c6ca446b 100644 --- a/test/functional/user_preference_controller_test.rb +++ b/test/functional/user_preference_controller_test.rb @@ -13,7 +13,7 @@ class UserPreferenceControllerTest < ActionController::TestCase get :read assert_response :success - assert_select "osm:root" do + assert_select "osm" do assert_select "preferences", :count => 1 do assert_select "preference", :count => 2 assert_select "preference[k=\"#{user_preferences(:a).k}\"][v=\"#{user_preferences(:a).v}\"]", :count => 1 -- 2.43.2