Merge branch 'master' into openid

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

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 46f8885d9e4b5ccdef124ffdb33f7deb458ac22e..9802783fd0da0b7dfece5ca063f7ec3013497ad2 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -2,7 +2,7 @@
 normal_user:
   id: 1
   email: test@openstreetmap.org
 normal_user:
   id: 1
   email: test@openstreetmap.org

-  active: true
+  status: active

   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


@@ -15,7 +15,7 @@ normal_user:
 public_user:
   id: 2
   email: test@example.com
 public_user:
   id: 2
   email: test@example.com

-  active: true
+  status: active

   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


@@ -28,7 +28,7 @@ public_user:
 inactive_user:
   id: 3
   email: inactive@openstreetmap.org
 inactive_user:
   id: 3
   email: inactive@openstreetmap.org

-  active: false
+  status: pending

   pass_crypt: <%= Digest::MD5::hexdigest('test2') %>
   creation_time: "2008-07-01 02:23:45"
   display_name: Inactive User
   pass_crypt: <%= Digest::MD5::hexdigest('test2') %>
   creation_time: "2008-07-01 02:23:45"
   display_name: Inactive User


@@ -37,3 +37,44 @@ inactive_user:
   home_lat: 123.4
   home_lon: 12.34
   home_zoom: 15
   home_lat: 123.4
   home_lon: 12.34
   home_zoom: 15

+  
+second_public_user:
+  id: 4
+  email: public@OpenStreetMap.org
+  status: active
+  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
+  status: active
+  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
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: administrator
+  data_public: true
+
+openid_user:
+  id: 7
+  email: openid-user@example.com
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: openIDuser
+  data_public: true
+  openid_url: http://localhost:1123/john.doe?openid.success=true