Merge remote-tracking branch 'openstreetmap/pull/1004'

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

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index dbe8fcd50d4214db9d0af5cd3d960939573a70ed..74365904a758270feb0aea8f1f79a75ba8b680f0 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


@@ -47,10 +49,11 @@ inactive_user:
   terms_seen: true
   languages: en
   email_valid: false
   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"


@@ -62,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


@@ -75,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


@@ -228,7 +232,7 @@ north_pole_user:
   languages: en
   home_lat: 89.9
   home_lon: 146.8
   languages: en
   home_lat: 89.9
   home_lon: 146.8

- 
+

 german_user:
   id: 18
   email: german@example.com
 german_user:
   id: 18
   email: german@example.com


@@ -238,6 +242,65 @@ german_user:
   display_name: germanuser
   data_public: true
   description: deutsch sprechen
   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
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: de

+
+google_user:
+  id: 19
+  email: google-user@example.com
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: googleuser
+  data_public: true
+  auth_provider: google
+  auth_uid: 123456789
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en
+
+facebook_user:
+  id: 20
+  email: facebook-user@example.com
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: facebookuser
+  data_public: true
+  auth_provider: facebook
+  auth_uid: 123456789
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en
+
+windowslive_user:
+  id: 21
+  email: windowslive-user@example.com
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: windowsliveuser
+  data_public: true
+  auth_provider: windowslive
+  auth_uid: 123456789
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en
+
+github_user:
+  id: 22
+  email: github-user@example.com
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2008-05-01 01:23:45"
+  display_name: githubuser
+  data_public: true
+  auth_provider: github
+  auth_uid: 123456789
+  terms_agreed: "2010-01-01 11:22:33"
+  terms_seen: true
+  languages: en