Cleanup merge breakage

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

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 9802783fd0da0b7dfece5ca063f7ec3013497ad2..ba66d87953e29c3349a903737d3d73c75af5c7eb 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -11,6 +11,7 @@ normal_user:
   home_lat: 12.1
   home_lon: 12.1
   home_zoom: 3
   home_lat: 12.1
   home_lon: 12.1
   home_zoom: 3

+  terms_seen: true

   
 public_user:
   id: 2
   
 public_user:
   id: 2


@@ -24,6 +25,7 @@ public_user:
   home_lat: 12
   home_lon: 12
   home_zoom: 12
   home_lat: 12
   home_lon: 12
   home_zoom: 12

+  terms_seen: true

   
 inactive_user:
   id: 3
   
 inactive_user:
   id: 3


@@ -37,6 +39,7 @@ inactive_user:
   home_lat: 123.4
   home_lon: 12.34
   home_zoom: 15
   home_lat: 123.4
   home_lon: 12.34
   home_zoom: 15

+  terms_seen: true

   
 second_public_user:
   id: 4
   
 second_public_user:
   id: 4


@@ -50,6 +53,7 @@ second_public_user:
   home_lat: 89
   home_lon: 87
   home_zoom: 12
   home_lat: 89
   home_lon: 87
   home_zoom: 12

+  terms_seen: true

 
 moderator_user:
   id: 5
 
 moderator_user:
   id: 5


@@ -59,6 +63,7 @@ moderator_user:
   creation_time: "2008-05-01 01:23:45"
   display_name: moderator
   data_public: true
   creation_time: "2008-05-01 01:23:45"
   display_name: moderator
   data_public: true

+  terms_seen: true

 
 administrator_user:
   id: 6
 
 administrator_user:
   id: 6


@@ -68,9 +73,20 @@ administrator_user:
   creation_time: "2008-05-01 01:23:45"
   display_name: administrator
   data_public: true
   creation_time: "2008-05-01 01:23:45"
   display_name: administrator
   data_public: true

+  terms_seen: true

 
 

-openid_user:
+terms_not_seen_user:

   id: 7
   id: 7

+  email: not_agreed@example.com
+  status: active
+  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
+  creation_time: "2011-03-22 00:23:45"
+  display_name: not_agreed
+  data_public: true
+  terms_seen: false
+
+openid_user:
+  id: 8

   email: openid-user@example.com
   status: active
   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
   email: openid-user@example.com
   status: active
   pass_crypt: <%= Digest::MD5.hexdigest('test') %>


@@ -78,3 +94,4 @@ openid_user:
   display_name: openIDuser
   data_public: true
   openid_url: http://localhost:1123/john.doe?openid.success=true
   display_name: openIDuser
   data_public: true
   openid_url: http://localhost:1123/john.doe?openid.success=true

+  terms_seen: true