Allow space as a language separator

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

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 09565cc3c04d7abc7d9987f44bb69dcef1662683..32a4e03873e1511b95a8ba7e1beaedcd727c60ce 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -14,7 +14,8 @@ normal_user:
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en

-  
+  creation_ip: "1.2.3.4"
+

 public_user:
   id: 2
   email: test@example.com
 public_user:
   id: 2
   email: test@example.com


@@ -29,8 +30,9 @@ public_user:
   home_zoom: 12
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   home_zoom: 12
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true

-  languages: en
-  
+  languages: "en de"
+  creation_ip: "4.5.6.7"
+

 inactive_user:
   id: 3
   email: inactive@openstreetmap.org
 inactive_user:
   id: 3
   email: inactive@openstreetmap.org


@@ -46,10 +48,12 @@ inactive_user:
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en

+  email_valid: false

   
 second_public_user:
   id: 4
   email: public@OpenStreetMap.org
   
 second_public_user:
   id: 4
   email: public@OpenStreetMap.org

+  new_email: new_public@OpenStreetMap.org

   status: active
   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
   creation_time: "2008-05-01 01:23:45"
   status: active
   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
   creation_time: "2008-05-01 01:23:45"


@@ -61,7 +65,7 @@ second_public_user:
   home_zoom: 12
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   home_zoom: 12
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true

-  languages: en
+  creation_ip: "1.2.3.4"

 
 moderator_user:
   id: 5
 
 moderator_user:
   id: 5


@@ -74,6 +78,7 @@ moderator_user:
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en

+  image_use_gravatar: false

 
 administrator_user:
   id: 6
 
 administrator_user:
   id: 6


@@ -106,7 +111,8 @@ openid_user:
   creation_time: "2008-05-01 01:23:45"
   display_name: openIDuser
   data_public: true
   creation_time: "2008-05-01 01:23:45"
   display_name: openIDuser
   data_public: true

-  openid_url: http://localhost:1123/john.doe?openid.success=true
+  auth_provider: openid
+  auth_uid: http://localhost:1123/john.doe

   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en


@@ -118,7 +124,7 @@ uppercase_user:
   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: false
+  data_public: true

   description: test
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   description: test
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true


@@ -131,11 +137,8 @@ suspended_user:
   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
   creation_time: "2007-01-01 00:00:00"
   display_name: suspended
   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
   creation_time: "2007-01-01 00:00:00"
   display_name: suspended

-  data_public: false
+  data_public: true

   description: test
   description: test

-  home_lat: 12.1
-  home_lon: 12.1
-  home_zoom: 3

   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en


@@ -147,11 +150,101 @@ deleted_user:
   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
   creation_time: "2007-01-01 00:00:00"
   display_name: deleted
   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
   creation_time: "2007-01-01 00:00:00"
   display_name: deleted

-  data_public: false
+  data_public: true

   description: test
   description: test

-  home_lat: 12.1
-  home_lon: 12.1
-  home_zoom: 3

   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en
   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
+
+north_pole_user:
+  id: 17
+  email: santa@example.com
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: santa
+  data_public: true
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en
+  home_lat: 89.9
+  home_lon: 146.8
+ 
+german_user:
+  id: 18
+  email: german@example.com
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: germanuser
+  data_public: true
+  description: deutsch sprechen
+  home_lat: 11.9
+  home_lon: 12.1
+  home_zoom: 12
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: de