Merge 16891:17044 from trunk.

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

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index be8bf4c554e62ef59940bb34e8ead8f3cacce12a..ac0029a62eee370c946f262c3db60c0037c3ef33 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -1,26 +1,53 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 normal_user:
-  email: test@openstreetmap.org
   id: 1
-  active: 1
+  email: test@openstreetmap.org
+  active: true
   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
-  home_lat: 1
-  home_lon: 1
+  home_lat: 12.1
+  home_lon: 12.1
   home_zoom: 3
   
-second_user:
-  email:test@example.com
+public_user:
   id: 2
-  active: 1
+  email: test@example.com
+  active: true
   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:
+  id: 3
+  email: inactive@openstreetmap.org
+  active: false
+  pass_crypt: <%= Digest::MD5::hexdigest('test2') %>
+  creation_time: "2008-07-01 02:23:45"
+  display_name: Inactive User
+  data_public: true
+  description: description
+  home_lat: 123.4
+  home_lon: 12.34
+  home_zoom: 15
+  
+second_public_user:
+  id: 4
+  email: public@OpenStreetMap.org
+  active: true
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: pulibc_test2
+  data_public: true
+  description: some test description
+  home_lat: 89
+  home_lon: 87
+  home_zoom: 12
+