ateam-merb-auth-old 0.0.5 → 0.0.6

data/lib/merb-auth/controller/sessions_base.rb

@@ -23,7 +23,9 @@ module MerbAuth
               cookies[:auth_token] = { :value => self.current_ma_user.remember_token , :expires => expires }
             end
             #redirect_back_or_default('/')
-            redirect MA[:redirect_after_login] || '/'
+            #redirect MA[:redirect_after_login] || '/'
+
+            redirect_back_or_default(MA[:redirect_after_login] || '/')
           else
             render :new
           end

data/spec/controllers/sessions_spec.rb

@@ -49,7 +49,7 @@ describe MA::Sessions, "Index action" do
   end
   
   it "should have a named route :login" do
-    @controller.url(:login).should == "/merb-auth/login"
+    @controller.url(:merb_auth_login).should == "/merb-auth/login"
   end
   
   it "should have route to Sessions#destroy from '/logout' via delete" do
@@ -78,6 +78,14 @@ describe MA::Sessions, "Index action" do
     controller = post "/merb-auth/login", :email => 'quentin@example.com', :password => 'test'
     controller.should redirect_to("/profile")
   end
+
+  it 'should return to previous uri' do
+    MA[:redirect_after_login] = '/profile'
+    controller = post "/merb-auth/login", :email => 'quentin@example.com', :password => 'test' do |c|
+      c.session[:return_to] = '/login'
+    end
+    controller.should redirect_to("/login")
+  end
    
   it 'fails login and does not redirect' do
     controller = post "/merb-auth/login", :email => 'quentin@example.com', :password => 'bad password'
@@ -103,7 +111,7 @@ describe MA::Sessions, "Index action" do
   
   it 'deletes token on logout' do
     controller = get("/merb-auth/logout") {|request| request.stub!(:current_user).and_return(@quentin) }
-    controller.cookies["auth_token"].should == nil
+    controller.cookies["auth_token"].should be_blank
   end
   
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ateam-merb-auth-old
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - ateam
@@ -9,7 +9,7 @@ autorequire: name
 bindir: bin
 cert_chain: []
 
-date: 2009-02-05 00:00:00 -08:00
+date: 2009-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: []