ateam-merb-auth-old 0.0.2 → 0.0.3

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

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

data/spec/controllers/sessions_spec.rb

@@ -31,6 +31,7 @@ describe MA::Sessions, "Index action" do
     @quentin = User.create(valid_user_hash.with(:email => "quentin@example.com", :password => "test", :password_confirmation => "test"))
     @controller = MA::Sessions.new(fake_request)
     @quentin.activate
+    MA[:redirect_after_login] = nil
   end
   
   it "should have a route to Sessions#new from '/login'" do
@@ -71,6 +72,12 @@ describe MA::Sessions, "Index action" do
     controller.session[:user].should == @quentin.id
     controller.should redirect_to("/")
   end
+
+  it 'logins and redirects to profile' do
+    MA[:redirect_after_login] = '/profile'
+    controller = post "/merb-auth/login", :email => 'quentin@example.com', :password => 'test'
+    controller.should redirect_to("/profile")
+  end
    
   it 'fails login and does not redirect' do
     controller = post "/merb-auth/login", :email => 'quentin@example.com', :password => 'bad password'
@@ -115,4 +122,4 @@ describe MA::Sessions, "Index action" do
   def cookie_for(user)
     auth_token user.remember_token
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ateam-merb-auth-old
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - ateam