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

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

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 2055faa13522a822647383afb3d0eddbac744880..cb861ab9323f7d2d97cccad67d17cad4a52e8ab0 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -30,7 +30,7 @@ public_user:
   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:
@@ -49,7 +49,7 @@ inactive_user:
   terms_seen: true
   languages: en
   email_valid: false
-  
+
 second_public_user:
   id: 4
   email: public@OpenStreetMap.org
@@ -232,7 +232,7 @@ north_pole_user:
   languages: en
   home_lat: 89.9
   home_lon: 146.8
- 
+
 german_user:
   id: 18
   email: german@example.com
@@ -248,3 +248,45 @@ german_user:
   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