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

[rails.git] / test / controllers / api / changesets_controller_test.rb

diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb
index e9132764c12b3a77ad1b8e96da0e561bf5a5cb7a..3716ae707edb60c3a8d45bc1fe7ad92d6e0921bc 100644 (file)
--- a/test/controllers/api/changesets_controller_test.rb
+++ b/test/controllers/api/changesets_controller_test.rb
@@ -132,31 +132,40 @@ module Api
     # check that the changeset can be shown and returns the correct
     # document structure.
     def test_show
-      changeset_id = create(:changeset).id
+      changeset = create(:changeset)
 
-      get :show, :params => { :id => changeset_id }
+      get :show, :params => { :id => changeset.id }
       assert_response :success, "cannot get first changeset"
 
       assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
-      assert_select "osm>changeset[id='#{changeset_id}']", 1
+      assert_select "osm>changeset[id='#{changeset.id}']", 1
+      assert_select "osm>changeset>@open", "true"
+      assert_select "osm>changeset>@created_at", changeset.created_at.xmlschema
+      assert_select "osm>changeset>@closed_at", 0
       assert_select "osm>changeset>discussion", 0
 
-      get :show, :params => { :id => changeset_id, :include_discussion => true }
+      get :show, :params => { :id => changeset.id, :include_discussion => true }
       assert_response :success, "cannot get first changeset with comments"
 
       assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
-      assert_select "osm>changeset[id='#{changeset_id}']", 1
+      assert_select "osm>changeset[id='#{changeset.id}']", 1
+      assert_select "osm>changeset>@open", "true"
+      assert_select "osm>changeset>@created_at", changeset.created_at.xmlschema
+      assert_select "osm>changeset>@closed_at", 0
       assert_select "osm>changeset>discussion", 1
       assert_select "osm>changeset>discussion>comment", 0
 
-      changeset_id = create(:changeset, :closed).id
-      create_list(:changeset_comment, 3, :changeset_id => changeset_id)
+      changeset = create(:changeset, :closed)
+      create_list(:changeset_comment, 3, :changeset_id => changeset.id)
 
-      get :show, :params => { :id => changeset_id, :include_discussion => true }
+      get :show, :params => { :id => changeset.id, :include_discussion => true }
       assert_response :success, "cannot get closed changeset with comments"
 
       assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
-      assert_select "osm>changeset[id='#{changeset_id}']", 1
+      assert_select "osm>changeset[id='#{changeset.id}']", 1
+      assert_select "osm>changeset>@open", "false"
+      assert_select "osm>changeset>@created_at", changeset.created_at.xmlschema
+      assert_select "osm>changeset>@closed_at", changeset.closed_at.xmlschema
       assert_select "osm>changeset>discussion", 1
       assert_select "osm>changeset>discussion>comment", 3
     end
@@ -167,8 +176,8 @@ module Api
       [0, -32, 233455644, "afg", "213"].each do |id|
         get :show, :params => { :id => id }
         assert_response :not_found, "should get a not found"
-      rescue ActionController::UrlGenerationError => ex
-        assert_match(/No route matches/, ex.to_s)
+      rescue ActionController::UrlGenerationError => e
+        assert_match(/No route matches/, e.to_s)
       end
     end
 
@@ -239,8 +248,8 @@ module Api
       cs_ids.each do |id|
         put :close, :params => { :id => id }
         assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized"
-      rescue ActionController::UrlGenerationError => ex
-        assert_match(/No route matches/, ex.to_s)
+      rescue ActionController::UrlGenerationError => e
+        assert_match(/No route matches/, e.to_s)
       end
 
       # Now try with auth
@@ -248,8 +257,8 @@ module Api
       cs_ids.each do |id|
         put :close, :params => { :id => id }
         assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed"
-      rescue ActionController::UrlGenerationError => ex
-        assert_match(/No route matches/, ex.to_s)
+      rescue ActionController::UrlGenerationError => e
+        assert_match(/No route matches/, e.to_s)
       end
     end
 
@@ -1552,8 +1561,8 @@ CHANGESET
       user = create(:user)
       changeset = create(:changeset, :user => user)
       closed_changeset = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 1, 1, 0, 0, 0), :closed_at => Time.utc(2008, 1, 2, 0, 0, 0))
-      changeset2 = create(:changeset, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 15 * GeoRecord::SCALE, :max_lon => 15 * GeoRecord::SCALE)
-      changeset3 = create(:changeset, :min_lat => 4.5 * GeoRecord::SCALE, :min_lon => 4.5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
+      changeset2 = create(:changeset, :min_lat => (5 * GeoRecord::SCALE).round, :min_lon => (5 * GeoRecord::SCALE).round, :max_lat => (15 * GeoRecord::SCALE).round, :max_lon => (15 * GeoRecord::SCALE).round)
+      changeset3 = create(:changeset, :min_lat => (4.5 * GeoRecord::SCALE).round, :min_lon => (4.5 * GeoRecord::SCALE).round, :max_lat => (5 * GeoRecord::SCALE).round, :max_lon => (5 * GeoRecord::SCALE).round)
 
       get :query, :params => { :bbox => "-10,-10, 10, 10" }
       assert_response :success, "can't get changesets in bbox"