@@ -65,7 +65,7 @@ if defined?(Merb::Plugins) # @note prefix your named routes with :merb_auth_slice_activation_ # to avoid potential conflicts with global named routes. def self.setup_router(scope) - scope.match("/:activation_code").to(:controller => "activations", :action => "activate").name(:activate) + scope.match("/activate/:activation_code").to(:controller => "activations", :action => "activate").name(:activate) end end lib/merb-auth-slice-activation.rb @@ -70,12 +70,12 @@ describe "Activation in the controller" do ac = @user.activation_code ac.should_not be_nil @user.should_not be_active - request("/activation/#{ac}") + request("/activation/activate/#{ac}") User.first(:login => "barney").should be_active end it "should redirect after activation" do - r = request("/activation/#{@user.activation_code}") + r = request("/activation/activate/#{@user.activation_code}") r.should redirect end end spec/controllers/activations_spec.rb 8f6fe795fc140eb719ebf41b32a77268a4ab7934 Christian Kebekus christian@kebek.us http://github.com/ck/merb-auth-slice-activation/commit/0c790f47b2cce50f3b5a25717f6f22886ce1ebc4 0c790f47b2cce50f3b5a25717f6f22886ce1ebc4 2008-10-25T06:58:50-07:00 2008-10-25T06:58:50-07:00 Refactored (named) activation route to not collide with password reset route. be6f19ef4457fafa1f7c278c3bf8413d3d379855 Christian Kebekus christian@kebek.us