Merge 12304:14009 from trunk.

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

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 89522ef7c457f3860d5bf01e7c485bbb0fcc082a..709139d68e72aca707f94d21aa04eb74debf88db 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -1,35 +1,39 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 normal_user:
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 normal_user:

+  id: 1

   email: test@openstreetmap.org
   email: test@openstreetmap.org

-  active: 1
+  active: true

   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
   creation_time: "2007-01-01 00:00:00"
   display_name: test
   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
   creation_time: "2007-01-01 00:00:00"
   display_name: test

-  data_public: 0
+  data_public: false

   description: test
   description: test

-  home_lat: 1
-  home_lon: 1
+  home_lat: 12.1
+  home_lon: 12.1

   home_zoom: 3
   
 second_user:
   home_zoom: 3
   
 second_user:

+  id: 2

   email: test@example.com
   email: test@example.com

-  active: 1
+  active: true

   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
   creation_time: "2008-05-01 01:23:45"
   display_name: test2
   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
   creation_time: "2008-05-01 01:23:45"
   display_name: test2

-  data_public: 1
+  data_public: true

   description: some test description
   home_lat: 12
   home_lon: 12
   home_zoom: 12
   
 inactive_user:
   description: some test description
   home_lat: 12
   home_lon: 12
   home_zoom: 12
   
 inactive_user:

+  id: 3

   email: inactive@openstreetmap.org
   email: inactive@openstreetmap.org

-  active: 0
+  active: false

   pass_crypt: <%= Digest::MD5::hexdigest('test2') %>
   pass_crypt: <%= Digest::MD5::hexdigest('test2') %>

+  creation_time: "2008-07-01 02:23:45"

   display_name: Inactive User
   display_name: Inactive User

-  data_public: 1
+  data_public: true

   description: description
   description: description

-  home_lat: 12.34
+  home_lat: 123.4

   home_lon: 12.34
   home_zoom: 15
   home_lon: 12.34
   home_zoom: 15