Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 4004

Show
Ignore:
Timestamp:
03/20/06 18:16:48 (2 years ago)
Author:
minam
Message:

Fix assert_redirected_to so it works with symbols

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/lib/action_controller/assertions.rb

    r3969 r4004  
    8686            assert_equal(epath, path, msg) if epath && path  
    8787          else 
    88             @response_diff = options.diff(@response.redirected_to) if @response.redirected_to 
    89             msg = build_message(message, "response is not a redirection to all of the options supplied (redirection is <?>), difference: <?>",  
     88            @response_diff = options.diff(@response.redirected_to) if options.is_a?(Hash) && @response.redirected_to.is_a?(Hash) 
     89            msg = build_message(message, "response is not a redirection to all of the options supplied (redirection is <?>)#{', difference: <?>' if @response_diff}",  
    9090                                @response.redirected_to || @response.redirect_url, @response_diff) 
    9191 

  • trunk/actionpack/test/controller/test_test.rb

    r3939 r4004  
    88      render :text => 'ignore me' 
    99    end 
    10      
     10 
    1111    def render_raw_post 
    1212      raise Test::Unit::AssertionFailedError, "#raw_post is blank" if request.raw_post.blank? 
    …… 
    5555    end 
    5656 
    57     def rescue_action(e) 
    58       raise e 
    59     end 
     57    def redirect_to_symbol 
     58      redirect_to :generate_url, :id => 5 
     59    end 
     60 
     61    private 
     62     
     63      def rescue_action(e) 
     64        raise e 
     65      end 
     66 
     67      def generate_url(opts) 
     68        url_for(opts.merge(:action => "test_uri")) 
     69      end 
    6070  end 
    6171 
    …… 
    394404    assert_raise(RuntimeError) { ActionController::TestUploadedFile.new('non_existent_file') } 
    395405  end 
     406 
     407  def test_assert_redirected_to_symbol 
     408    get :redirect_to_symbol 
     409    assert_redirected_to :generate_url 
     410  end 
    396411end