Remove unneessary return added accidentally

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

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 09565cc3c04d7abc7d9987f44bb69dcef1662683..15e3cc3947831202b78b3516db730effc3270865 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -46,6 +46,7 @@ inactive_user:
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en
+  email_valid: false
   
 second_public_user:
   id: 4
@@ -118,7 +119,7 @@ uppercase_user:
   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
@@ -131,11 +132,8 @@ suspended_user:
   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
-  home_lat: 12.1
-  home_lon: 12.1
-  home_zoom: 3
   terms_agreed: "2010-01-01 11:22:33"
   terms_seen: true
   languages: en
@@ -147,11 +145,71 @@ deleted_user:
   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
-  home_lat: 12.1
-  home_lon: 12.1
-  home_zoom: 3
+  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