Merge branch 'master' into notes

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

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index d044a2c3164b74d29187011b903eb7020e48edbe..c1b7244cb71951e5008d18bbe1de31f401f0d34a 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -13,6 +13,7 @@ normal_user:
   home_zoom: 3
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
+  languages: en
   
 public_user:
   id: 2
@@ -28,6 +29,7 @@ public_user:
   home_zoom: 12
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
+  languages: en
   
 inactive_user:
   id: 3
@@ -43,6 +45,7 @@ inactive_user:
   home_zoom: 15
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
+  languages: en
   
 second_public_user:
   id: 4
@@ -58,6 +61,7 @@ second_public_user:
   home_zoom: 12
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
+  languages: en
 
 moderator_user:
   id: 5
@@ -69,6 +73,7 @@ moderator_user:
   data_public: true
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
+  languages: en
 
 administrator_user:
   id: 6
@@ -80,6 +85,7 @@ administrator_user:
   data_public: true
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
+  languages: en
 
 terms_not_seen_user:
   id: 7
@@ -90,6 +96,7 @@ terms_not_seen_user:
   display_name: not_agreed
   data_public: true
   terms_seen: false
+  languages: en
 
 openid_user:
   id: 8
@@ -102,3 +109,106 @@ openid_user:
   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
+
+blocked_user:
+  id: 13
+  email: blocked@openstreetmap.org
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2007-01-01 00:00:00"
+  display_name: blocked
+  data_public: true
+  description: test
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en
+
+unblocked_user:
+  id: 14
+  email: unblocked@openstreetmap.org
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2007-01-01 00:00:00"
+  display_name: unblocked
+  data_public: true
+  description: test
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en
+
+second_moderator_user:
+  id: 15
+  email: second_moderator@example.com
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: second_moderator
+  data_public: true
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en
+
+super_user:
+  id: 16
+  email: super@example.com
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: super
+  data_public: true
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en