@@ -9,14 +9,14 @@ module Spec # methods stubbed out. Additional methods may be easily stubbed (via # add_stubs) if +stubs+ is passed. def mock_model(model_class, options_and_stubs = {}) - id = next_id + id = options_and_stubs[:id] || next_id options_and_stubs.reverse_merge!({ :id => id, :to_param => id.to_s, :new_record? => false, :errors => stub("errors", :count => 0) }) - m = mock("#{model_class.name}_#{options_and_stubs[:id]}", options_and_stubs) + m = mock("#{model_class.name}_#{id}", options_and_stubs) m.send(:__mock_proxy).instance_eval <<-CODE def @target.is_a?(other) #{model_class}.ancestors.include?(other) @@ -123,4 +123,4 @@ module Spec end end -end \ No newline at end of file +end lib/spec/rails/mocks.rb @@ -32,6 +32,9 @@ describe "mock_model with stubbed id", :type => :view do it "should be named using the stubbed id value" do @model.instance_variable_get(:@name).should == "MockableModel_1" end + it "should return string of id value for to_param" do + @model.to_param.should == "1" + end end describe "mock_model with null_object", :type => :view do spec/rails/mocks/mock_model_spec.rb 47350fb4eeabca0cfafc98ca1776772d5dbf240d Adam Meehan adam.meehan@gmail.com http://github.com/dchelimsky/rspec-rails/commit/9a1e10e7b71f7e8e4fb910a9695ee69abec63816 9a1e10e7b71f7e8e4fb910a9695ee69abec63816 2008-07-12T21:33:14-07:00 2008-06-24T16:19:54-07:00 fix to_param in mock_model with stubbed id incorrectly returning autogenerated id 70bf8a8f9d219ad7882054583359003c51d68536 Pat Maddox pat.maddox@gmail.com