lib/merb-core/controller/mixins/authentication.rb spec/public/controller/authentication_spec.rb spec/public/controller/controllers/authentication.rb @@ -1,21 +1,23 @@ module Merb - autoload :AbstractController, "merb-core/controller/abstract_controller" - autoload :BootLoader, "merb-core/bootloader" - autoload :Config, "merb-core/config" - autoload :Const, "merb-core/constants" - autoload :ControllerMixin, "merb-core/controller/mixins/controller" - autoload :ControllerExceptions, "merb-core/controller/exceptions" - autoload :Cookies, "merb-core/dispatch/cookies" - autoload :Dispatcher, "merb-core/dispatch/dispatcher" - autoload :ErubisCaptureMixin, "merb-core/controller/mixins/erubis_capture" - autoload :Plugins, "merb-core/plugins" - autoload :Rack, "merb-core/rack" - autoload :RenderMixin, "merb-core/controller/mixins/render" - autoload :Request, "merb-core/dispatch/request" - autoload :ResponderMixin, "merb-core/controller/mixins/responder" - autoload :Router, "merb-core/dispatch/router" - autoload :SessionMixin, "merb-core/dispatch/session" - autoload :Test, "merb-core/test" + autoload :AbstractController, "merb-core/controller/abstract_controller" + autoload :BootLoader, "merb-core/bootloader" + autoload :Config, "merb-core/config" + autoload :Const, "merb-core/constants" + autoload :ControllerMixin, "merb-core/controller/mixins/controller" + autoload :ControllerExceptions, "merb-core/controller/exceptions" + autoload :Cookies, "merb-core/dispatch/cookies" + autoload :Dispatcher, "merb-core/dispatch/dispatcher" + autoload :AuthenticationMixin, "merb-core/controller/mixins/authentication" + autoload :BasicAuthenticationMixin, "merb-core/controller/mixins/authentication/basic" + autoload :ErubisCaptureMixin, "merb-core/controller/mixins/erubis_capture" + autoload :Plugins, "merb-core/plugins" + autoload :Rack, "merb-core/rack" + autoload :RenderMixin, "merb-core/controller/mixins/render" + autoload :Request, "merb-core/dispatch/request" + autoload :ResponderMixin, "merb-core/controller/mixins/responder" + autoload :Router, "merb-core/dispatch/router" + autoload :SessionMixin, "merb-core/dispatch/session" + autoload :Test, "merb-core/test" end # Require this rather than autoloading it so we can be sure the default template lib/merb-core/autoload.rb @@ -12,6 +12,7 @@ class Merb::Controller < Merb::AbstractController include Merb::ResponderMixin include Merb::ControllerMixin + include Merb::AuthenticationMixin attr_accessor :route lib/merb-core/controller/merb_controller.rb @@ -104,6 +104,46 @@ module Merb dispatch_request(request, controller_klass, action, &blk) end + + + # Dispatches an action to the given class and using HTTP Basic Authentication + # This bypasses the router and is suitable for unit testing of controllers. + # + # ==== Parameters + # controller_klass<Controller>:: + # The controller class object that the action should be dispatched to. + # action<Symbol>:: The action name, as a symbol. + # username<String>:: The username. + # password<String>:: The password. + # params<Hash>:: + # An optional hash that will end up as params in the controller instance. + # env<Hash>:: + # An optional hash that is passed to the fake request. Any request options + # should go here (see +fake_request+), including :req or :post_body + # for setting the request body itself. + # &blk:: + # The controller is yielded to the block provided for actions *prior* to + # the action being dispatched. + # + # ==== Example + # dispatch_with_basic_authentication_to(MyController, :create, 'Fred', 'secret', :name => 'Homer' ) do + # self.stub!(:current_user).and_return(@user) + # end + # + # ==== Note + # Does not use routes. + # + #--- + # @public + def dispatch_with_basic_authentication_to(controller_klass, action, username, password, params = {}, env = {}, &blk) + action = action.to_s + request_body = { :post_body => env[:post_body], :req => env[:req] } + env["X_HTTP_AUTHORIZATION"] = "Basic #{Base64.encode64("#{username}:#{password}")}" + request = fake_request(env.merge( + :query_string => Merb::Request.params_to_query_string(params)), request_body) + + dispatch_request(request, controller_klass, action, &blk) + end # An HTTP GET request that operates through the router. # lib/merb-core/test/helpers/request_helper.rb @@ -1,39 +1,60 @@ -desc "Run all specs" -Spec::Rake::SpecTask.new('specs') do |t| - t.spec_opts = ["--format", "specdoc", "--colour"] - t.spec_files = Dir['spec/**/*_spec.rb'].sort -end +desc "Run specs, run a specific spec with TASK=spec/path_to_spec.rb" +task :spec => [ "spec:default" ] -desc "Run all model specs" -Spec::Rake::SpecTask.new('model_specs') do |t| - t.spec_opts = ["--format", "specdoc", "--colour"] - t.spec_files = Dir['spec/models/**/*_spec.rb'].sort -end +namespace :spec do + Spec::Rake::SpecTask.new('default') do |t| + t.spec_opts = ["--format", "specdoc", "--colour"] + if(ENV['TASK']) + t.spec_files = [ENV['TASK']] + else + t.spec_files = Dir['spec/**/*_spec.rb'].sort + end + end -desc "Run all controller specs" -Spec::Rake::SpecTask.new('controller_specs') do |t| - t.spec_opts = ["--format", "specdoc", "--colour"] - t.spec_files = Dir['spec/controllers/**/*_spec.rb'].sort -end + desc "Run all model specs, run a spec for a specific Model with MODEL=MyModel" + Spec::Rake::SpecTask.new('model') do |t| + t.spec_opts = ["--format", "specdoc", "--colour"] + if(ENV['MODEL']) + t.spec_files = Dir["spec/models/**/#{ENV['MODEL']}_spec.rb"].sort + else + t.spec_files = Dir['spec/models/**/*_spec.rb'].sort + end + end -desc "Run a specific spec with TASK=xxxx" -Spec::Rake::SpecTask.new('spec') do |t| - t.spec_opts = ["--format", "specdoc", "--colour"] - t.libs = ['lib', 'server/lib' ] - t.spec_files = ["spec/#{ENV['TASK']}_spec.rb"] -end + desc "Run all controller specs, run a spec for a specific Controller with CONTROLLER=MyController" + Spec::Rake::SpecTask.new('controller') do |t| + t.spec_opts = ["--format", "specdoc", "--colour"] + if(ENV['CONTROLLER']) + t.spec_files = Dir["spec/controllers/**/#{ENV['CONTROLLER']}_spec.rb"].sort + else + t.spec_files = Dir['spec/controllers/**/*_spec.rb'].sort + end + end + + desc "Run all view specs, run specs for a specific controller (and view) with CONTROLLER=MyController (VIEW=MyView)" + Spec::Rake::SpecTask.new('view') do |t| + t.spec_opts = ["--format", "specdoc", "--colour"] + if(ENV['CONTROLLER'] and ENV['VIEW']) + t.spec_files = Dir["spec/views/**/#{ENV['CONTROLLER']}/#{ENV['VIEW']}*_spec.rb"].sort + elsif(ENV['CONTROLLER']) + t.spec_files = Dir["spec/views/**/#{ENV['CONTROLLER']}/*_spec.rb"].sort + else + t.spec_files = Dir['spec/views/**/*_spec.rb'].sort + end + end -desc "Run all specs output html" -Spec::Rake::SpecTask.new('specs_html') do |t| - t.spec_opts = ["--format", "html"] - t.libs = ['lib', 'server/lib' ] - t.spec_files = Dir['spec/**/*_spec.rb'].sort -end + desc "Run all specs and output the result in html" + Spec::Rake::SpecTask.new('html') do |t| + t.spec_opts = ["--format", "html"] + t.libs = ['lib', 'server/lib' ] + t.spec_files = Dir['spec/**/*_spec.rb'].sort + end -desc "RCov" -Spec::Rake::SpecTask.new('rcov') do |t| - t.spec_opts = ["--format", "specdoc", "--colour"] - t.spec_files = Dir['spec/**/*_spec.rb'].sort - t.libs = ['lib', 'server/lib' ] - t.rcov = true + desc "Run specs and check coverage with rcov" + Spec::Rake::SpecTask.new('coverage') do |t| + t.spec_opts = ["--format", "specdoc", "--colour"] + t.spec_files = Dir['spec/**/*_spec.rb'].sort + t.libs = ['lib', 'server/lib' ] + t.rcov = true + end end \ No newline at end of file lib/merb-core/test/tasks/spectasks.rb @@ -5,5 +5,6 @@ require File.join(__DIR__, "..", "..", "spec_helper") require File.join(__DIR__, "controllers", "base") require File.join(__DIR__, "controllers", "responder") require File.join(__DIR__, "controllers", "display") +require File.join(__DIR__, "controllers", "authentication") Merb.start :environment => 'test' \ No newline at end of file spec/public/controller/spec_helper.rb @@ -31,6 +31,41 @@ describe Merb::Test::RequestHelper do dispatch_to(@controller_klass, :index) end end + + describe "#dispatch_with_basic_authentication_to" do + + before(:all) do + @controller_klass = Merb::Test::DispatchController + end + + it "should dispatch to the given controller and action" do + Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index) + + dispatch_with_basic_authentication_to(@controller_klass, :index, "Fred", "secret") + end + + it "should dispatch to the given controller and action with authentication token" do + Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show) + + controller = dispatch_with_basic_authentication_to(@controller_klass, :show, "Fred", "secret") + + controller.request.env["X_HTTP_AUTHORIZATION"].should == "Basic #{Base64.encode64("Fred:secret")}" + end + + it "should dispatch to the given controller and action with authentication token and params" do + Merb::Test::ControllerAssertionMock.should_receive(:called).with(:show) + + controller = dispatch_with_basic_authentication_to(@controller_klass, :show, "Fred", "secret", :name => "Fred") + + controller.request.env["X_HTTP_AUTHORIZATION"].should == "Basic #{Base64.encode64("Fred:secret")}" + controller.params[:name].should == "Fred" + end + + it "should not hit the router to match it's route" do + Merb::Router.should_not_receive(:match) + dispatch_with_basic_authentication_to(@controller_klass, :index, "Fred", "secret") + end + end describe "#get" do before(:each) do spec/public/test/request_helper_spec.rb 07fc6048093c4122cac22ea6068c0f06ef3984c5 0b4d0b3baebb773b199d0e6e3a167bb441122319 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/e690bb81bb550e58dad519712de050141b8552d8 e690bb81bb550e58dad519712de050141b8552d8 2008-04-07T13:26:38-07:00 2008-04-07T13:26:38-07:00 Merge branch 'http_basic_auth' of git://github.com/jnicklas/merb-core 3618665bfc6919d05e04d583896c1953ab7dc7b4 Ezra Zygmuntowicz ez@engineyard.com