Upgrade.txt @@ -1,16 +1,25 @@ === Maintenance -IMPORTANT: rspec-rails supports rails 2.0.2, 2.1.2 and 2.2.2. We are no longer -supporting 1.x versions of rails. +IMPORTANT: This release includes the following backwards-compatibility-breaking changes. -IMPORTANT: expect_render and stub_render have been removed. Both of these -methods were deprecated in rspec-rails-1.1.5, released in Sept, 2008. +* rspec-rails supports rails 2.0.2, 2.1.2 and 2.2.2. + + * We are no longer supporting 1.x versions of rails. + +* expect_render and stub_render have been removed. + + * Both of these methods were deprecated in rspec-rails-1.1.5, released in Sept, 2008. + +* { route_for(args).should == "/path" } now delegates to assert_generates (in rails) + + * see Upgrade.txt for more information -* 3 enhancements +* 4 enhancements * Adding status codes to redirect_to matcher (Damian Janowski). Closes #570. * Initialize current URL before executing any examples in a ViewExampleGroup (Wilson Bilkovich). Closes #654. * Support query strings in params_from (Wilson Bilkovich). Closes #652. + * delegate route_for to assert_recognizes (less brittle) === Version 1.1.12 / 2009-01-11 History.txt @@ -11,19 +11,23 @@ describe <%= controller_class_name %>Controller do end it "should map #show" do - route_for(:controller => "<%= table_name %>", :action => "show", :id => 1).should == "/<%= table_name %>/1" + route_for(:controller => "<%= table_name %>", :action => "show", :id => "1").should == "/<%= table_name %>/1" end it "should map #edit" do - route_for(:controller => "<%= table_name %>", :action => "edit", :id => 1).should == "/<%= table_name %>/1<%= resource_edit_path %>" - end - - it "should map #update" do - route_for(:controller => "<%= table_name %>", :action => "update", :id => 1).should == "/<%= table_name %>/1" + route_for(:controller => "<%= table_name %>", :action => "edit", :id => "1").should == "/<%= table_name %>/1<%= resource_edit_path %>" end + + it "should map #create" do + route_for(:controller => "<%= table_name %>", :action => "create").should == {:path => "/<%= table_name %>", :method => :post} + end + + it "should map #update" do + route_for(:controller => "<%= table_name %>", :action => "update", :id => "1").should == {:path =>"/<%= table_name %>/1", :method => :put} + end it "should map #destroy" do - route_for(:controller => "<%= table_name %>", :action => "destroy", :id => 1).should == "/<%= table_name %>/1" + route_for(:controller => "<%= table_name %>", :action => "destroy", :id => "1").should == {:path =>"/<%= table_name %>/1", :method => :delete} end end generators/rspec_scaffold/templates/routing_spec.rb @@ -115,6 +115,24 @@ module Spec end @integrate_views = self.class.integrate_views? end + + class RouteForMatcher + def initialize(example, options) + @example, @options = example, options + end + + def ==(expected) + if Hash === expected + path, querystring = expected[:path].split('?') + path = expected.merge(:path => path) + else + path, querystring = expected.split('?') + end + params = querystring.blank? ? {} : @example.params_from_querystring(querystring) + @example.assert_recognizes(@options, path, params) + true + end + end # Uses ActionController::Routing::Routes to generate # the correct route for a given set of options. @@ -122,8 +140,7 @@ module Spec # route_for(:controller => 'registrations', :action => 'edit', :id => 1) # => '/registrations/1;edit' def route_for(options) - ensure_that_routes_are_loaded - ActionController::Routing::Routes.generate(options) + RouteForMatcher.new(self, options) end # Uses ActionController::Routing::Routes to parse lib/spec/rails/example/controller_example_group.rb @@ -191,6 +191,9 @@ require 'controller_spec_controller' end end + class CustomRouteSpecController < ActionController::Base; end + class RspecOnRailsSpecsController < ActionController::Base; end + it "should support custom routes" do route_for(:controller => "custom_route_spec", :action => "custom_route"). should == "/custom_route" @@ -205,6 +208,11 @@ require 'controller_spec_controller' route_for(:controller => "controller_spec", :action => "some_action", :param => '1'). should == "/controller_spec/some_action?param=1" end + + it "recognizes routes with methods besides :get" do + route_for(:controller => "rspec_on_rails_specs", :action => "update", :id => "37"). + should == {:path => "/rspec_on_rails_specs/37", :method => :put} + end it "should generate params for custom routes" do params_from(:get, '/custom_route'). spec/spec/rails/example/controller_example_group_spec.rb 2e2ed86f7306dc570bac7ad74951f11e951b7a81 David Chelimsky dchelimsky@gmail.com http://github.com/dchelimsky/rspec-rails/commit/939d745440d70f6a5a8165b29bcfa2bbe2a257e8 939d745440d70f6a5a8165b29bcfa2bbe2a257e8 2009-01-18T19:50:04-08:00 2009-01-18T19:31:20-08:00 Delegate route_for to assert_recognizes. This could break *some* examples out in the wild. See Upgrade.txt for more information. 8d78fbeda76e1289e6f0d4967b7b11061dc41be0 David Chelimsky dchelimsky@gmail.com