@@ -25,7 +25,7 @@ module Spec end def session - @response.session + response.session end # :call-seq: lib/spec/rails/example/functional_example_group.rb @@ -30,6 +30,29 @@ module Spec def protect_against_forgery? false end + + def session=(session) + @session = session + end + + def request=(request) + @request = request + end + + def flash=(flash) + @flash = flash + end + + def params=(params) + @params = params + end + + def controller=(controller) + @controller = controller + end + + private + attr_reader :session, :request, :flash, :params, :controller end class << self @@ -81,7 +104,7 @@ module Spec end before(:all) do - @controller_class_name = 'Spec::Rails::Example::HelperBehaviourController' + @controller_class_name = 'Spec::Rails::Example::HelperExampleGroupController' end before(:each) do @@ -93,8 +116,11 @@ module Spec ActionView::Helpers::AssetTagHelper::reset_javascript_include_default - helper_controller = @controller - helper.instance_eval { @controller = helper_controller } + helper.session = session + helper.request = @request + helper.flash = flash + helper.params = params + helper.controller = @controller end def flash @@ -122,7 +148,7 @@ module Spec end - class HelperBehaviourController < ApplicationController #:nodoc: + class HelperExampleGroupController < ApplicationController #:nodoc: attr_accessor :request, :url # Re-raise errors lib/spec/rails/example/helper_example_group.rb @@ -36,6 +36,30 @@ module Spec lambda { non_existent_helper_method }.should raise_error(NameError) lambda { helper.non_existent_helper_method }.should raise_error(NameError) end + + it "should have access to session" do + session[:foo] = 'bar' + session_foo.should == 'bar' + helper.session_foo.should == 'bar' + end + + it "should have access to params" do + params[:foo] = 'bar' + params_foo.should == 'bar' + helper.params_foo.should == 'bar' + end + + it "should have access to request" do + request.stub!(:thing).and_return('bar') + request_thing.should == 'bar' + helper.request_thing.should == 'bar' + end + + it "should have access to flash" do + flash[:thing] = 'camera' + flash_thing.should == 'camera' + helper.flash_thing.should == 'camera' + end end spec/rails/example/helper_spec_spec.rb @@ -15,4 +15,20 @@ module ExplicitHelper def named_path rspec_on_rails_specs_path end + + def params_foo + params[:foo] + end + + def session_foo + session[:foo] + end + + def request_thing + request.thing + end + + def flash_thing + flash[:thing] + end end spec_resources/helpers/explicit_helper.rb a46a78d752a68814851db5111dfa957886ef9da8 David Chelimsky dchelimsky@gmail.com http://github.com/dchelimsky/rspec-rails/commit/40a0916325dbe9a1631849146d078e330fca71f2 40a0916325dbe9a1631849146d078e330fca71f2 2008-06-10T22:33:36-07:00 2008-06-10T22:33:36-07:00 give helper object access to session, request, params, flash 71665014fcb9e7080081b4c3d960f2bea0154ba8 David Chelimsky dchelimsky@gmail.com