@@ -29,7 +29,7 @@ module Merb # end # def ensure_authenticated(*strategies) - session.authenticate!(request, params, *strategies) unless session.user + session.authenticate!(request, params, *strategies) unless session.authenticated? auth = session.authentication if auth.halted? self.headers.merge!(auth.headers) merb-auth/merb-auth-core/lib/merb-auth-core/authenticated_helper.rb @@ -30,7 +30,7 @@ module Merb # @return <TrueClass|FalseClass> # def authenticated? - !!user + !!session[:user] end # This method will retrieve the user object stored in the session or nil if there merb-auth/merb-auth-core/lib/merb-auth-core/authentication.rb @@ -40,7 +40,8 @@ describe "Merb::AuthenticationHelper" do it "should run the authentication when testing if it is authenticated" do @controller = ControllerMock.new(fake_request) - @controller.session.should_receive(:user).and_return(nil, "WINNA") + @controller.session.should_receive(:authenticated?).and_return(false) + @controller.session.should_receive(:user).and_return("WINNA") @controller.session.authentication.should_receive(:authenticate!).and_return("WINNA") @controller.send(:ensure_authenticated) end merb-auth/merb-auth-core/spec/helpers/authentication_helper_spec.rb 60fe5e79a5ecf32c2cc1934520cd2b12a4284a6d Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb/commit/9374b602aa0099934ab5f05135b0198139005a76 9374b602aa0099934ab5f05135b0198139005a76 2008-11-06T16:02:58-08:00 2008-11-06T15:59:41-08:00 Updates authenticated? so that it just checks for the user as present in the session rather than reconstituting them. 7104c9b91b6c0e580768649418190e04222867be Daniel Neighman has.sox@gmail.com