ateam-merb-auth-old 0.0.4 → 0.0.5

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

@@ -40,8 +40,10 @@ module MerbAuth
           if logged_in? && !current_ma_user.activated?
             Merb.logger.info "Activated #{current_ma_user}"
             current_ma_user.activate
+            redirect url(:merb_auth_activated)
+          else
+            redirect url(:merb_auth_activated, :fail => 'true')
           end
-          redirect url(:merb_auth_activated)
         end
 
         private

data/spec/controllers/users_spec.rb

@@ -90,6 +90,13 @@ describe MA::Users do
      User.authenticate('aaron@example.com', 'test').should_not be_nil
    end
 
+   it 'should fail activation because of invalid or not existing code' do
+     controller = create_user(:email => "aaron@example.com", :password => "test", :password_confirmation => "test")
+     @user = controller.assigns(:user)
+     controller = get "/merb-auth/users/activate/#{@user.activation_code}__"
+     controller.headers['Location'].should == "/merb-auth/activated?fail=true"
+   end
+
   it "should log the user in automatically on creation if :use_activation is false" do
     MA[:use_activation] = false
     dispatch_to(MA::Users, :create, :user => {:email => "aaron@example.com", :password => "test", :password_confirmation => "test"}) do |c|

metadata

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