new version with small Haiti-related improvements

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

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 28e1aca3d0fd26a757cb39d01fab696fe89ab582..1849fd4d99aae8ddeb603e51f1d58786aa1e4be1 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -2,24 +2,24 @@
 normal_user:
   id: 1
   email: test@openstreetmap.org
 normal_user:
   id: 1
   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
   home_lat: 12.1
   home_lon: 12.1
   home_zoom: 3
   
   description: test
   home_lat: 12.1
   home_lon: 12.1
   home_zoom: 3
   

-second_user:
+public_user:

   id: 2
   email: test@example.com
   id: 2
   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
   description: some test description
   home_lat: 12
   home_lon: 12


@@ -28,11 +28,43 @@ second_user:
 inactive_user:
   id: 3
   email: inactive@openstreetmap.org
 inactive_user:
   id: 3
   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
   home_lat: 123.4
   home_lon: 12.34
   home_zoom: 15
   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
+
+moderator_user:
+  id: 5
+  email: moderator@example.com
+  active: true
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: moderator
+  data_public: true
+
+administrator_user:
+  id: 6
+  email: administrator@example.com
+  active: true
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: administrator
+  data_public: true