Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

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

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 89522ef7c457f3860d5bf01e7c485bbb0fcc082a..28e1aca3d0fd26a757cb39d01fab696fe89ab582 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -1,5 +1,6 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 normal_user:
+  id: 1
   email: test@openstreetmap.org
   active: 1
   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
@@ -7,11 +8,12 @@ normal_user:
   display_name: test
   data_public: 0
   description: test
-  home_lat: 1
-  home_lon: 1
+  home_lat: 12.1
+  home_lon: 12.1
   home_zoom: 3
   
 second_user:
+  id: 2
   email: test@example.com
   active: 1
   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
@@ -24,12 +26,13 @@ second_user:
   home_zoom: 12
   
 inactive_user:
+  id: 3
   email: inactive@openstreetmap.org
   active: 0
   pass_crypt: <%= Digest::MD5::hexdigest('test2') %>
   display_name: Inactive User
   data_public: 1
   description: description
-  home_lat: 12.34
+  home_lat: 123.4
   home_lon: 12.34
   home_zoom: 15