Word wrap emails.

Fix user id references in test code.

2 files changed, 7 insertions, 7 deletions

diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index 26555aaa0..40a50adac 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -15,7 +15,7 @@ describe RequestController, "when showing the front page" do
     end
 
     it "should have sign out link when signed in" do
-        session[:user] = users(:bob_smith_user)
+        session[:user_id] = users(:bob_smith_user).id
         get :frontpage
         response.should have_tag('a', "Sign out")
     end
@@ -122,7 +122,7 @@ describe RequestController, "when creating a new request" do
     end
 
     it "should create the request and outgoing message and redirect to request page when input is good and somebody is logged in" do
-        session[:user] = users(:bob_smith_user)
+        session[:user_id] = users(:bob_smith_user).id
         post :create, :info_request => { :public_body_id => public_bodies(:geraldine_public_body).id, 
             :title => "Why is your quango called Geraldine?"},
             :outgoing_message => { :body => "This is a silly letter. It is too short to be interesting." }  
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb
index cf73e5d13..76d93a193 100644
--- a/spec/controllers/user_controller_spec.rb
+++ b/spec/controllers/user_controller_spec.rb
@@ -77,7 +77,7 @@ describe UserController, "when signing in" do
         post :signin, { :user => { :email => 'bob@localhost', :password => 'jonespassword' },
             :token => post_redirect.token
         }
-        session[:user].should == users(:bob_smith_user).id
+        session[:user_id].should == users(:bob_smith_user).id
         response.should redirect_to(:controller => 'request', :action => 'list', :post_redirect => 1)
         response.should_not send_email
     end
@@ -147,16 +147,16 @@ describe UserController, "when signing out" do
     fixtures :users
 
     it "should log you out and redirect to the home page" do
-        session[:user] = users(:bob_smith_user).id
+        session[:user_id] = users(:bob_smith_user).id
         get :signout
-        session[:user].should be_nil
+        session[:user_id].should be_nil
         response.should redirect_to(:controller => 'request', :action => 'frontpage')
     end
 
     it "should log you out and redirect you to where you were" do
-        session[:user] = users(:bob_smith_user).id
+        session[:user_id] = users(:bob_smith_user).id
         get :signout, :r => '/list'
-        session[:user].should be_nil
+        session[:user_id].should be_nil
         response.should redirect_to(:controller => 'request', :action => 'list')
     end