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

diff --git a/test/controllers/api/notes_controller_test.rb b/test/controllers/api/notes_controller_test.rb
index d6759e192405a3dc9a89f8db6d2b55602a000e96..962718454d274feae454aaaa05cc702d74e383a8 100644 (file)
--- a/test/controllers/api/notes_controller_test.rb
+++ b/test/controllers/api/notes_controller_test.rb
@@ -495,9 +495,9 @@ module Api
             assert_select "link", browse_note_url(open_note)
             assert_select "guid", note_url(open_note)
             assert_select "pubDate", open_note.created_at.to_fs(:rfc822)
-            #          assert_select "geo:lat", open_note.lat.to_s
-            #          assert_select "geo:long", open_note.lon
-            #          assert_select "georss:point", "#{open_note.lon} #{open_note.lon}"
+            assert_select "geo|lat", open_note.lat.to_s
+            assert_select "geo|long", open_note.lon.to_s
+            assert_select "georss|point", "#{open_note.lon} #{open_note.lon}"
           end
         end
       end