Merge remote-tracking branch 'openstreetmap/pull/1322'

[rails.git] / test / fixtures / changesets.yml

diff --git a/test/fixtures/changesets.yml b/test/fixtures/changesets.yml
index b6b7ac23661690e788d8a08ad11eb987ce7e0b0e..2d5ce4e2aaf7703922d081e149555876afdb9d28 100644 (file)
--- a/test/fixtures/changesets.yml
+++ b/test/fixtures/changesets.yml
@@ -1,5 +1,5 @@
 # FIXME! all of these changesets need their bounding boxes set correctly!
 # FIXME! all of these changesets need their bounding boxes set correctly!

-# 
+#

 <% SCALE = 10000000 unless defined?(SCALE) %>
 
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 <% SCALE = 10000000 unless defined?(SCALE) %>
 
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html


@@ -7,18 +7,25 @@ normal_user_first_change:
   id: 1
   user_id: 1
   created_at: "2007-01-01 00:00:00"
   id: 1
   user_id: 1
   created_at: "2007-01-01 00:00:00"

-  closed_at: <%= DateTime.now + Rational(1,24) %>
+  closed_at: <%= Time.now.utc + 86400 %>

   min_lon: <%= 1 * SCALE %>
   min_lat: <%= 1 * SCALE %>
   max_lon: <%= 5 * SCALE %>
   max_lat: <%= 5 * SCALE %>
   num_changes: 11
   min_lon: <%= 1 * SCALE %>
   min_lat: <%= 1 * SCALE %>
   max_lon: <%= 5 * SCALE %>
   max_lat: <%= 5 * SCALE %>
   num_changes: 11

-  
+

 public_user_first_change:
   id: 2
   user_id: 2
 public_user_first_change:
   id: 2
   user_id: 2

-  created_at: <%= DateTime.now.utc %>
-  closed_at: <%= DateTime.now + Rational(1,24) %>
+  created_at: <%= Time.now.utc %>
+  closed_at: <%= Time.now.utc + 86400 %>
+  num_changes: 0
+
+deleted_user_first_change:
+  id: 9
+  user_id: 11
+  created_at: "2007-01-01 00:00:00"
+  closed_at: "2007-01-02 00:00:00"

   num_changes: 0
 
 normal_user_closed_change:
   num_changes: 0
 
 normal_user_closed_change:


@@ -38,8 +45,8 @@ public_user_closed_change:
 public_user_version_change:
   id: 4
   user_id: 2
 public_user_version_change:
   id: 4
   user_id: 2

-  created_at: <%= Time.now.getutc %>
-  closed_at: <%= DateTime.now + Rational(1,24) %>
+  created_at: <%= Time.now.utc %>
+  closed_at: <%= Time.now.utc + 86400 %>

   min_lon: <%= 1 * SCALE %>
   min_lat: <%= 1 * SCALE %>
   max_lon: <%= 4 * SCALE %>
   min_lon: <%= 1 * SCALE %>
   min_lat: <%= 1 * SCALE %>
   max_lon: <%= 4 * SCALE %>


@@ -62,10 +69,16 @@ too_many_elements_changeset:
   id: 6
   user_id: 1
   created_at: "2008-01-01 00:00:00"
   id: 6
   user_id: 1
   created_at: "2008-01-01 00:00:00"

-  closed_at: <%= DateTime.now + Rational(1,24) %>
+  closed_at: <%= Time.now.utc + 86400 %>

   min_lon: <%= 1 * SCALE %>
   min_lat: <%= 1 * SCALE %>
   max_lon: <%= 4 * SCALE %>
   max_lat: <%= 4 * SCALE %>
   num_changes: <%= Changeset::MAX_ELEMENTS + 1 %>
 
   min_lon: <%= 1 * SCALE %>
   min_lat: <%= 1 * SCALE %>
   max_lon: <%= 4 * SCALE %>
   max_lat: <%= 4 * SCALE %>
   num_changes: <%= Changeset::MAX_ELEMENTS + 1 %>
 

+normal_user_subscribed_change:
+  id: 8
+  user_id: 1
+  created_at: "2007-01-01 00:00:00"
+  closed_at: "2007-01-02 00:00:00"
+  num_changes: 0