Merge branch 'release/0.5' of https://github.com/sebbacon/alaveteli into release/0.5

Conflicts:
	app/controllers/request_controller.rb

1 files changed, 3 insertions, 2 deletions

diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb
index 2560b48c7..30ad61706 100644
--- a/spec/controllers/user_controller_spec.rb
+++ b/spec/controllers/user_controller_spec.rb
@@ -111,15 +111,16 @@ describe UserController, "when signing in" do
 
     it "should not log you in if you use an invalid PostRedirect token, and shouldn't give 500 error either" do
         ActionController::Routing::Routes.filters.clear
-        get :signin, :r => "/list"
-        response.should render_template('sign')
         post_redirect = "something invalid"
         lambda {
             post :signin, { :user_signin => { :email => 'bob@localhost', :password => 'jonespassword' },
                 :token => post_redirect
             }
         }.should_not raise_error(NoMethodError)
+        post :signin, { :user_signin => { :email => 'bob@localhost', :password => 'jonespassword' },
+            :token => post_redirect }
         response.should render_template('sign')
+        assigns[:post_redirect].should == nil
     end
 
 # No idea how to test this in the test framework :(