Merge branch 'master' into openstreetbugs

Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb

test/fixtures/diary_comments.yml

@@ -5,3 +5,19 @@ comment_for_geo_post:
   body: Some comment text
   created_at: "2008-11-08 09:45:34"
   updated_at: "2008-11-08 10:34:34"
+
+comment_by_suspended_user:
+  id: 2
+  diary_entry_id: 2
+  user_id: 10
+  body: Some comment text
+  created_at: "2008-11-08 09:45:34"
+  updated_at: "2008-11-08 10:34:34"
+
+comment_by_deleted_user:
+  id: 3
+  diary_entry_id: 2
+  user_id: 11
+  body: Some comment text
+  created_at: "2008-11-08 09:45:34"
+  updated_at: "2008-11-08 10:34:34"

test/fixtures/diary_entries.yml

@@ -8,7 +8,8 @@ normal_user_entry_1:
   latitude: 
   longitude: 
   language_code: en
-  
+  visible: true
+
 normal_user_geo_entry:
   id: 2
   user_id: 1
@@ -19,3 +20,17 @@ normal_user_geo_entry:
   latitude: 51.50763
   longitude: -0.10781
   language_code: de
+  visible: true
+
+deleted_entry:
+
+  id: 3
+  user_id: 1
+  title: Deleted Entry 1
+  body: This is the body of a deleted diary entry.
+  created_at: "2008-11-07 17:43:34"
+  updated_at: "2008-11-07 17:43:34"
+  latitude: 
+  longitude: 
+  language_code: en
+  visible: false

test/fixtures/users.yml

@@ -118,7 +118,46 @@ 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
+  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