@@ -1,3 +1,5 @@ +* Allow mock model class to be set using :as option. + * [DEPRECATION] By default all matchers perform expectations, use with_stubs => true if you want otherwise. remarkable_rails/CHANGELOG @@ -405,6 +405,12 @@ module Remarkable # # == Options # + # * <tt>:as</tt> - Used to set the model . For example, if you have + # Admin::Task model, you have to tell the name of the class to be + # mocked: + # + # mock_models :admin_task, :as => "Admin::Task" + # # * <tt>:class_method</tt> - When set to false, does not create the # class method which returns a proc. # @@ -440,6 +446,8 @@ module Remarkable models.each do |model| model = model.to_s + klass = options[:as] || model.classify + if options[:class_method] (class << self; self; end).class_eval <<-METHOD def #{model}_proc; proc { mock_#{model} }; end @@ -452,11 +460,12 @@ module Remarkable self.class_eval <<-METHOD def mock_#{model}(stubs={}) - @#{model} ||= mock_model(#{model.classify}, stubs) + @#{model} ||= mock_model(#{klass}, stubs) end METHOD end end + alias :mock_model :mock_models end remarkable_rails/lib/remarkable_rails/action_controller/macro_stubs.rb @@ -24,13 +24,13 @@ describe 'MacroStubs' do self.class.respond_to?(:mock_projects).should be_true end - it 'should create a class singular mock method' do + it 'should create a class singular proc method' do self.class.respond_to?(:project_proc).should be_false self.class.mock_models :project self.class.respond_to?(:project_proc).should be_true end - it 'should create a class plural mock method' do + it 'should create a class plural proc method' do self.class.respond_to?(:projects_proc).should be_false self.class.mock_models :project self.class.respond_to?(:projects_proc).should be_true @@ -50,7 +50,14 @@ describe 'MacroStubs' do self.respond_to?(:mock_project).should be_true end - it 'should create procs which evals to a mock dynamically' do + it 'should allow the mock class to be set' do + self.class.mock_model :project, :as => "::Admin::Project" + lambda{ + mock_project + }.should raise_error(NameError, "uninitialized constant Admin") + end + + it 'should create procs which evals to a mock' do proc = self.class.task_proc proc.should be_kind_of(Proc) @@ -59,7 +66,7 @@ describe 'MacroStubs' do @task.should_not be_nil end - it 'should create procs which evals to an array of mocks dynamically' do + it 'should create procs which evals to an array of mocks' do proc = self.class.tasks_proc proc.should be_kind_of(Proc) remarkable_rails/spec/action_controller/macro_stubs_spec.rb f824ea527f787a5b65aabd19b2ccfa1e0ff5ecbf José Valim jose.valim@gmail.com http://github.com/lawrencepit/remarkable/commit/0a55a73606df779f9fd6fc60b66b8c808983ee4e 0a55a73606df779f9fd6fc60b66b8c808983ee4e 2009-06-06T02:03:47-07:00 2009-06-06T02:03:47-07:00 Allow mock class to be given using the :as option. f63773c37b3e488a1cda6e393a9994f8b0ad7691 José Valim jose.valim@gmail.com