Merge branch 'master' into openstreetbugs

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

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index ba66d87953e29c3349a903737d3d73c75af5c7eb..34ac9ce421f0255acfd8ce9addb21e482c613408 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -11,7 +11,9 @@ normal_user:
   home_lat: 12.1
   home_lon: 12.1
   home_zoom: 3
+  terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
+  languages: en
   
 public_user:
   id: 2
@@ -25,7 +27,9 @@ public_user:
   home_lat: 12
   home_lon: 12
   home_zoom: 12
+  terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
+  languages: en
   
 inactive_user:
   id: 3
@@ -39,7 +43,9 @@ inactive_user:
   home_lat: 123.4
   home_lon: 12.34
   home_zoom: 15
+  terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
+  languages: en
   
 second_public_user:
   id: 4
@@ -53,7 +59,9 @@ second_public_user:
   home_lat: 89
   home_lon: 87
   home_zoom: 12
+  terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
+  languages: en
 
 moderator_user:
   id: 5
@@ -63,7 +71,9 @@ moderator_user:
   creation_time: "2008-05-01 01:23:45"
   display_name: moderator
   data_public: true
+  terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
+  languages: en
 
 administrator_user:
   id: 6
@@ -73,7 +83,9 @@ administrator_user:
   creation_time: "2008-05-01 01:23:45"
   display_name: administrator
   data_public: true
+  terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
+  languages: en
 
 terms_not_seen_user:
   id: 7
@@ -84,6 +96,7 @@ terms_not_seen_user:
   display_name: not_agreed
   data_public: true
   terms_seen: false
+  languages: en
 
 openid_user:
   id: 8
@@ -94,4 +107,58 @@ openid_user:
   display_name: openIDuser
   data_public: true
   openid_url: http://localhost:1123/john.doe?openid.success=true
+  terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
+  languages: en
+
+uppercase_user:
+  id: 9
+  email: TEST@OPENSTREETMAP.ORG
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2007-01-01 00:00:00"
+  display_name: TEST
+  data_public: true
+  description: test
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en
+
+suspended_user:
+  id: 10
+  email: suspended@openstreetmap.org
+  status: suspended
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2007-01-01 00:00:00"
+  display_name: suspended
+  data_public: true
+  description: test
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en
+
+deleted_user:
+  id: 11
+  email: deleted@openstreetmap.org
+  status: deleted
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2007-01-01 00:00:00"
+  display_name: deleted
+  data_public: true
+  description: test
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en
+
+confirmed_user:
+  id: 12
+  email: confirmed@openstreetmap.org
+  status: confirmed
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2007-01-01 00:00:00"
+  display_name: confirmed
+  data_public: true
+  description: test
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en