@@ -1,3 +1,3 @@ module Remarkable - VERSION = '3.1.4' unless self.const_defined?('VERSION') + VERSION = '3.1.6' unless self.const_defined?(:VERSION) end remarkable/lib/remarkable/version.rb @@ -1,6 +1,7 @@ module Remarkable module ActiveRecord class Base < Remarkable::Base + I18N_COLLECTION = [ :attributes, :associations ] # Provides a way to send options to all ActiveRecord matchers. # @@ -206,12 +207,14 @@ module Remarkable @spec.send(:described_class) end - if RAILS_I18N && described_class.respond_to?(:human_attribute_name) && self.class.matcher_arguments[:collection] + if i18n_collection? && described_class.respond_to?(:human_attribute_name) options = {} collection_name = self.class.matcher_arguments[:collection].to_sym if collection = instance_variable_get("@#{collection_name}") - collection.map!{|attr| described_class.human_attribute_name(attr.to_s, :locale => Remarkable.locale).downcase } + collection = collection.map do |attr| + described_class.human_attribute_name(attr.to_s, :locale => Remarkable.locale).downcase + end options[collection_name] = array_to_sentence(collection) end @@ -227,6 +230,12 @@ module Remarkable end end + # Returns true if the given collection should be translated. + # + def i18n_collection? #:nodoc: + RAILS_I18N && I18N_COLLECTION.include?(self.class.matcher_arguments[:collection]) + end + end end end remarkable_activerecord/lib/remarkable_activerecord/base.rb @@ -45,6 +45,19 @@ module Remarkable # Ensures that the attribute can be set on mass update. # + # Beware that when used in the negative form, this matcher fails if any of + # the values fail. For example, let's assume we have a accessible and a + # protected attribute called :accessible and :protected. The following + # assertion WILL pass: + # + # should_not_allow_mass_assignment_of :protected, :accessible + # + # If you want to assert that all values fail, you have to do: + # + # %w(first_protected second_protected).each do |protected| + # should_not_allow_mass_assignment_of protected + # end + # # == Examples # # should_allow_mass_assignment_of :email, :name remarkable_activerecord/lib/remarkable_activerecord/matchers/allow_mass_assignment_of_matcher.rb @@ -65,8 +65,17 @@ module Remarkable # Ensures that the attribute can be set to the given values. # - # Note: this matcher accepts at once just one attribute to test. - # Note: this matcher is also aliased as "validate_format_of". + # Beware that when used in the negative form, this matcher fails if any of + # the values fail. For example, let's assume we have a valid and invalid + # value called "valid" and "invalid". The following assertion WILL pass: + # + # should_not_allow_values_for :attribute, "valid", "invalid" + # + # If you want to assert that all values fail, you have to do: + # + # %w(first_invalid second_invalid).each do |invalid| + # should_not_allow_values_for invalid + # end # # == Options # @@ -78,10 +87,7 @@ module Remarkable # == Examples # # should_allow_values_for :isbn, "isbn 1 2345 6789 0", "ISBN 1-2345-6789-0" - # should_not_allow_values_for :isbn, "bad 1", "bad 2" - # # it { should allow_values_for(:isbn, "isbn 1 2345 6789 0", "ISBN 1-2345-6789-0") } - # it { should_not allow_values_for(:isbn, "bad 1", "bad 2") } # def allow_values_for(attribute, *args, &block) options = args.extract_options! remarkable_activerecord/lib/remarkable_activerecord/matchers/allow_values_for_matcher.rb @@ -9,7 +9,7 @@ module Remarkable optionals :uniq, :readonly, :validate, :autosave, :polymorphic, :counter_cache, :default => true collection_assertions :association_exists?, :macro_matches?, :through_exists?, :source_exists?, - :join_table_exists?, :foreign_key_exists?, :polymorphic_exists?, + :klass_exists?, :join_table_exists?, :foreign_key_exists?, :polymorphic_exists?, :counter_cache_exists?, :options_match? protected @@ -32,6 +32,13 @@ module Remarkable reflection.source_reflection rescue false end + # Polymorphic associations does not have a klass. + # + def klass_exists? + return true if @options[:polymorphic] + reflection.klass rescue nil + end + # has_and_belongs_to_many only works if the tables are in the same # database, so we always look for the table in the subject connection. # @@ -74,11 +81,18 @@ module Remarkable @reflection ||= subject_class.reflect_on_association(@association.to_sym) end - # Rescue nil to avoid raising errors in invalid through associations + def subject_table_name + subject_class.table_name.to_s + end + def reflection_class_name reflection.class_name.to_s rescue nil end + def reflection_table_name + reflection.klass.table_name.to_s rescue nil + end + def reflection_foreign_key reflection.primary_key_name.to_s end @@ -107,9 +121,9 @@ module Remarkable elsif reflection.macro == :has_and_belongs_to_many reflection.options[:join_table] elsif reflection.macro == :belongs_to - subject_class.table_name + subject_table_name else - reflection.klass.table_name + reflection_table_name end end @@ -132,14 +146,14 @@ module Remarkable if @subject && reflection options.merge!( :actual_macro => Remarkable.t(reflection.macro, :scope => matcher_i18n_scope, :default => reflection.macro.to_s), - :subject_table => subject_class.table_name.inspect, - :reflection_table => reflection.klass.table_name.inspect, + :subject_table => subject_table_name.inspect, + :reflection_table => reflection_table_name.inspect, :foreign_key_table => foreign_key_table.inspect, :polymorphic_column => reflection_foreign_key.sub(/_id$/, '_type').inspect, :counter_cache_column => reflection.counter_cache_column.to_s.inspect, :join_table => reflection.options[:join_table].inspect, :foreign_key => reflection_foreign_key.inspect - ) rescue nil # rescue to allow specs to run properly + ) end options remarkable_activerecord/lib/remarkable_activerecord/matchers/association_matcher.rb @@ -53,10 +53,11 @@ en: has_one: have one description: "{{macro}} {{associations}}" expectations: - association_exists: "{{subject_name}} records {{macro}} {{association}}, got no association" + association_exists: "{{subject_name}} records {{macro}} {{association}}, but the association does not exist" macro_matches: "{{subject_name}} records {{macro}} {{association}}, got {{subject_name}} records {{actual_macro}} {{association}}" through_exists: "{{subject_name}} records {{macro}} {{association}} through {{through}}, through association does not exist" source_exists: "{{subject_name}} records {{macro}} {{association}} through {{through}}, source association does not exist" + klass_exists: "{{subject_name}} records {{macro}} {{association}}, but the association class does not exist" join_table_exists: "join table {{join_table}} to exist, but does not" foreign_key_exists: "foreign key {{foreign_key}} to exist on {{foreign_key_table}}, but does not" polymorphic_exists: "{{subject_table}} to have {{polymorphic_column}} as column, but does not" remarkable_activerecord/locale/en.yml @@ -9,10 +9,13 @@ describe 'association_matcher' do def define_and_validate(options={}) columns = options.delete(:association_columns) || { :projects_count => :integer } define_model :company, columns + define_model :super_company, columns columns = options.delete(:model_columns) || { :company_id => :integer, :company_type => :string } @model = define_model :project, columns do belongs_to :company, options + belongs_to :unknown + belongs_to :accountable, :polymorphic => true end belong_to :company @@ -47,7 +50,7 @@ describe 'association_matcher' do define_and_validate matcher = belong_to('whatever') matcher.matches?(@model) - matcher.failure_message.should == 'Expected Project records belong to whatever, got no association' + matcher.failure_message.should == 'Expected Project records belong to whatever, but the association does not exist' end it 'should set macro_matches? message' do @@ -57,6 +60,13 @@ describe 'association_matcher' do matcher.failure_message.should == 'Expected Project records have one company, got Project records belong to company' end + it 'should set klass_exists? message' do + define_and_validate + matcher = belong_to('unknown') + matcher.matches?(@model) + matcher.failure_message.should == 'Expected Project records belong to unknown, but the association class does not exist' + end + it 'should set foreign_key_exists? message' do matcher = define_and_validate(:model_columns => {}) matcher.matches?(@model) @@ -93,6 +103,7 @@ describe 'association_matcher' do before(:each){ define_and_validate } it { should belong_to(:company) } + it { should_not belong_to(:unknown) } it { should_not belong_to(:project) } it { should_not have_one(:company) } it { should_not have_many(:company) } @@ -135,6 +146,11 @@ describe 'association_matcher' do it { should_not define_and_validate(:association_columns => { :association_count => :integer }).counter_cache(:association_count) } end + describe "with polymorphic option" do + before(:each){ define_and_validate(:model_columns => {:accountable_id => :integer, :accountable_type => :string}) } + it { should belong_to(:accountable).polymorphic } + end + create_optional_boolean_specs(:readonly, self) create_optional_boolean_specs(:validate, self) create_optional_boolean_specs(:autosave, self) if RAILS_VERSION =~ /^2.3/ @@ -158,6 +174,7 @@ describe 'association_matcher' do m.foreign_key = :company_id end + should_not_belong_to :unknown should_not_belong_to :project should_not_have_one :company should_not_have_many :companies @@ -174,6 +191,7 @@ describe 'association_matcher' do # Defines a model, create a validation and returns a raw matcher def define_and_validate(options={}) define_model :label + define_model :super_label columns = options.delete(:association_columns) || [ :label_id, :project_id ] create_table(options.delete(:association_table) || :labels_projects) do |table| @@ -209,7 +227,7 @@ describe 'association_matcher' do define_and_validate matcher = have_and_belong_to_many('whatever') matcher.matches?(@model) - matcher.failure_message.should == 'Expected Project records have and belong to many whatever, got no association' + matcher.failure_message.should == 'Expected Project records have and belong to many whatever, but the association does not exist' end it 'should set macro_matches? message' do @@ -365,7 +383,7 @@ describe 'association_matcher' do define_and_validate matcher = have_many('whatever') matcher.matches?(@model) - matcher.failure_message.should == 'Expected Project records have many whatever, got no association' + matcher.failure_message.should == 'Expected Project records have many whatever, but the association does not exist' end it 'should set macro_matches? message' do @@ -503,6 +521,7 @@ describe 'association_matcher' do @model = define_model :project, options.delete(:model_columns) || {} do has_many :project_managers unless options.delete(:skip_through) has_one :manager, options + has_one :unknown end have_one :manager @@ -524,7 +543,14 @@ describe 'association_matcher' do define_and_validate matcher = have_one('whatever') matcher.matches?(@model) - matcher.failure_message.should == 'Expected Project records have one whatever, got no association' + matcher.failure_message.should == 'Expected Project records have one whatever, but the association does not exist' + end + + it 'should set klass_exists? message' do + define_and_validate + matcher = have_one('unknown') + matcher.matches?(@model) + matcher.failure_message.should == 'Expected Project records have one unknown, but the association class does not exist' end it 'should set macro_matches? message' do @@ -571,6 +597,7 @@ describe 'association_matcher' do before(:each){ define_and_validate } it { should have_one(:manager) } + it { should_not have_one(:unknown) } it { should_not belong_to(:manager) } it { should_not have_many(:managers) } it { should_not have_and_belong_to_many(:managers) } @@ -635,6 +662,7 @@ describe 'association_matcher' do m.through = :project_managers end + should_not_have_one :unknown should_not_have_one :manager, :validate => false should_not_have_one :manager, :through => :another_thing end remarkable_activerecord/spec/association_matcher_spec.rb @@ -174,10 +174,11 @@ en: has_one: have one description: "{{macro}} {{associations}}" expectations: - association_exists: "{{subject_name}} records {{macro}} {{association}}, got no association" + association_exists: "{{subject_name}} records {{macro}} {{association}}, but the association does not exist" macro_matches: "{{subject_name}} records {{macro}} {{association}}, got {{subject_name}} records {{actual_macro}} {{association}}" through_exists: "{{subject_name}} records {{macro}} {{association}} through {{through}}, through association does not exist" source_exists: "{{subject_name}} records {{macro}} {{association}} through {{through}}, source association does not exist" + klass_exists: "{{subject_name}} records {{macro}} {{association}}, but the association class does not exist" join_table_exists: "join table {{join_table}} to exist, but does not" foreign_key_exists: "foreign key {{foreign_key}} to exist on {{foreign_key_table}}, but does not" polymorphic_exists: "{{subject_table}} to have {{polymorphic_column}} as column, but does not" remarkable_i18n/en.yml @@ -174,10 +174,11 @@ pt-BR: has_one: possuir um(a) description: "{{macro}} {{associations}}" expectations: - association_exists: "{{subject_name}} pudesse {{macro}} {{association}}, obtive nenhuma associação" + association_exists: "{{subject_name}} pudesse {{macro}} {{association}}, mas associação não existe" macro_matches: "{{subject_name}} pudesse {{macro}} {{association}}, obtive que {{subject_name}} deve {{actual_macro}} {{association}}" through_exists: "{{subject_name}} pudesse {{macro}} {{association}} através de {{through}}, obtive que \"through_association\" não existe" source_exists: "{{subject_name}} pudesse {{macro}} {{association}} através de {{through}}, obtive que \"source association\" não existe" + klass_exists: "{{subject_name}} records {{macro}} {{association}}, mas a classe da associação não existe" join_table_exists: "tabela de junção {{join_table}} existisse, mas não existe" foreign_key_exists: "chave estrangeira {{foreign_key}} existisse em {{foreign_key_table}}, mas não existe" polymorphic_exists: "{{subject_table}} tivesse {{polymorphic_column}} como coluna, mas não tem" remarkable_i18n/pt-BR.yml @@ -1,3 +1,11 @@ +* 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. + +* [DEPRECATION] mock_models now creates model_proc instead of mock_model. + Altough this won't fire any deprecation warning, all the documentation was changed. + * assert_valid_keys on expects * mock_models now creates a second class method to be used on the index action [#71] @@ -70,10 +78,10 @@ specs for a create action rewritten like this: mock_models :task describe :post => :create, :task => { :these => 'params' } do - expects :new, :on => Task, with => {'these' => 'params'}, :returns => mock_task + expects :new, :on => Task, with => {'these' => 'params'}, :returns => task_proc expects :save, :on => mock_task, :returns => true - should_assign_to :task, :with => mock_task + should_assign_to :task, :with => task_proc should_redirect_to { task_url(mock_task) } end end remarkable_rails/CHANGELOG @@ -65,17 +65,17 @@ An equivalent in remarkable would be: mock_models :task describe :post => :create, :task => { :these => 'params' } do - expects :new, :on => Task, :with => {'these' => 'params'}, :returns => mock_task - expects :save, :on => mock_task, :returns => true + expects :new, :on => Task, :with => {'these' => 'params'}, :returns => task_proc + expects :save, :on => task_proc, :returns => true - should_assign_to :task, :with => mock_task - should_redirect_to { task_url(mock_task) } + should_assign_to :task, :with => task_proc + should_redirect_to { task_url(task_proc) } end end -It automatically performs the action before running each macro. In assign_to, -it executes the expects as expectations (:should_receive), and in redirect_to -it executes the expects as stubs (:stub!), just as above. +It automatically performs the action before running each macro. It executes the +expects as expectations (:should_receive), but you can supply :with_stubs => true +if you want it to be executed with stubs. There are also params and mime methods: remarkable_rails/README @@ -22,7 +22,7 @@ module Remarkable elsif @options.key?(:with_expectations) @options[:with_expectations] else - false + true end end remarkable_rails/lib/remarkable_rails/action_controller/base.rb @@ -36,27 +36,16 @@ module Remarkable # assigns(:project).should == mock_project # end # - # On the other hand, should render template is doing something like this: - # - # it 'should render template show' do - # Project.stub!(:find).and_return(mock_project) - # get :show, :id => '37' - # response.should render_template('show') - # end - # - # Now comes the first question: how each macro knows if they should perform - # expectations or stubs? - # - # By default, only should_assign_to macro performs expectations. You can change + # By default, all macros perform expectations. You can change # this behavior sending :with_stubs or :with_expectations as options: # # should_assign_to :project, :with_stubs => true - # should_render_template 'show', :with_expectations => true + # should_render_template 'show', :with_expectations => false # # This also works in the rspec way: # - # it { should assign_to(:project).with_stubs } - # it { should render_template('show').with_expectations } + # it { should assign_to(:project).with_stubs } + # it { should render_template('show').with_expectations(false) } # # == Attention! # @@ -84,12 +73,12 @@ module Remarkable # # And it creates: # - # def self.mock_project + # def self.project_proc # proc { mock_project } # end # # # To be used on index actions - # def self.mock_projects + # def self.projects_proc # proc { [mock_project] } # end # @@ -104,8 +93,8 @@ module Remarkable # # For: # - # expects :find, :on => Project, :with => '37', :returns => mock_project - # should_assign_to :project, :with => mock_project + # expects :find, :on => Project, :with => '37', :returns => project_proc + # should_assign_to :project, :with => project_proc # # = Give me more! # @@ -122,11 +111,11 @@ module Remarkable # params :project_id => '42' #=> define params for all requests # # # Those two expectations get inherited in all describe groups below - # expects :find_by_title, :on => Project, :with => '42', :returns => mock_project + # expects :find_by_title, :on => Project, :with => '42', :returns => project_proc # expects :tasks, :and_return => Task # # describe :get => :show, :id => '37' do - # expects :find, :with => '37', :and_return => mock_task + # expects :find, :with => '37', :and_return => task_proc # # should_assign_to :project, :task # should_render_template 'show' @@ -140,7 +129,7 @@ module Remarkable # expectations with run_action!, run_expectations! and run_stubs!. Examples: # # describe :get => :new do - # expects :new, :on => Project, :returns => mock_project + # expects :new, :on => Project, :returns => project_proc # # it "should do something different" do # run_action! @@ -223,9 +212,9 @@ module Remarkable # # == Example # - # expects :new, :on => Project, :returns => :mock_project, :times => 2 + # expects :new, :on => Project, :returns => :project_proc, :times => 2 # - # expects :new, :find, :on => Project, :returns => :mock_project + # expects :new, :find, :on => Project, :returns => :project_proc # # expects :human_attribute_name, :on => Project, :with => :title do |attr| # attr.to_s.humanize @@ -416,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. # @@ -429,12 +424,12 @@ module Remarkable # # Will create one instance and two class mock methods for you: # - # def self.mock_project + # def self.project_proc # proc { mock_project } # end # # # To be used on index actions - # def self.mock_projects + # def self.projects_procs # proc { [ mock_project ] } # end # @@ -451,16 +446,26 @@ module Remarkable models.each do |model| model = model.to_s - self.class_eval <<-METHOD - #{"def self.mock_#{model}; proc { mock_#{model} }; end" if options[:class_method]} - #{"def self.mock_#{model.pluralize}; proc { [ mock_#{model} ] }; end" if options[:class_method]} + klass = options[:as] || model.classify + + if options[:class_method] + (class << self; self; end).class_eval <<-METHOD + def #{model}_proc; proc { mock_#{model} }; end + def #{model.pluralize}_proc; proc { [ mock_#{model} ] }; end + alias :mock_#{model} :#{model}_proc + alias :mock_#{model.pluralize} :#{model.pluralize}_proc + METHOD + end + + 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 @@ -11,8 +11,6 @@ module Remarkable before_assert :evaluate_expected_value - default_options :with_expectations => true - protected def assigned_value? remarkable_rails/lib/remarkable_rails/action_controller/matchers/assign_to_matcher.rb @@ -11,21 +11,29 @@ describe 'MacroStubs' do describe 'mock_models' do before(:each) do - self.class.metaclass.send(:undef_method, :mock_projects) if self.class.respond_to?(:mock_projects) - self.class.metaclass.send(:undef_method, :mock_project) if self.class.respond_to?(:mock_project) + self.class.metaclass.send(:undef_method, :projects_proc) if self.class.respond_to?(:projects_proc) + self.class.metaclass.send(:undef_method, :project_proc) if self.class.respond_to?(:project_proc) self.class.send(:undef_method, :mock_project) if self.respond_to?(:mock_project) end - it 'should create a class singular mock method' do + it 'should alias model_proc to mock_model' do self.class.respond_to?(:mock_project).should be_false + self.class.respond_to?(:mock_projects).should be_false self.class.mock_models :project self.class.respond_to?(:mock_project).should be_true + self.class.respond_to?(:mock_projects).should be_true end - it 'should create a class plural mock method' do - self.class.respond_to?(:mock_projects).should be_false + 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?(:mock_projects).should be_true + self.class.respond_to?(:project_proc).should be_true + end + + 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 end it 'should create an instance mock method' do @@ -35,15 +43,22 @@ describe 'MacroStubs' do end it 'should create just an instance method when :class_method is false' do - self.class.respond_to?(:mock_project).should be_false + self.class.respond_to?(:project_proc).should be_false self.respond_to?(:mock_project).should be_false self.class.mock_models :project, :class_method => false - self.class.respond_to?(:mock_project).should be_false + self.class.respond_to?(:project_proc).should be_false self.respond_to?(:mock_project).should be_true end - it 'should create procs which evals to a mock dynamically' do - proc = self.class.mock_task + 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) @task.should be_nil @@ -51,8 +66,8 @@ describe 'MacroStubs' do @task.should_not be_nil end - it 'should create procs which evals to an array of mocks dynamically' do - proc = self.class.mock_tasks + it 'should create procs which evals to an array of mocks' do + proc = self.class.tasks_proc proc.should be_kind_of(Proc) @task.should be_nil @@ -62,7 +77,7 @@ describe 'MacroStubs' do end describe 'failures' do - expects :find, :on => Task, :with => proc{ current_id }, :returns => mock_task + expects :find, :on => Task, :with => proc{ current_id }, :returns => task_proc expects :max, :min, :count, :on => Task, :ordered => true get :show, :id => 37 @@ -109,7 +124,7 @@ describe 'MacroStubs' do end describe 'when extending describe group behavior' do - expects :find, :on => Task, :with => proc{ current_id }, :returns => mock_task + expects :find, :on => Task, :with => proc{ current_id }, :returns => task_proc expects :count, :max, :min, :on => Task get :show, :id => 37 @@ -176,7 +191,7 @@ describe 'MacroStubs' do end describe Mime::XML do - expects :to_xml, :on => mock_task, :returns => 'XML' + expects :to_xml, :on => task_proc, :returns => 'XML' it 'should provide a description based on the mime given in describe' do self.class.description.should =~ /with xml$/ @@ -225,9 +240,9 @@ describe 'MacroStubs' do [:delete, :delete!].each do |method| describe method => :destroy, :id => '37' do - expects :find, :on => Task, :with => '37', :returns => mock_task - expects :destroy, :on => mock_task - expects :title, :on => mock_task, :with => false do |boolean| + expects :find, :on => Task, :with => '37', :returns => task_proc + expects :destroy, :on => task_proc + expects :title, :on => task_proc, :with => false do |boolean| if boolean 'This should not appear' else @@ -239,7 +254,7 @@ describe 'MacroStubs' do subject { controller } should_assign_to :task - should_assign_to :task, :with => mock_task + should_assign_to :task, :with => task_proc should_assign_to :task, :with_kind_of => Task should_set_the_flash remarkable_rails/spec/action_controller/macro_stubs_spec.rb @@ -55,10 +55,9 @@ module FunctionalBuilder module ClassMethods def generate_macro_stubs_specs_for(matcher, *args) - stubs_args = args.dup - - options = args.extract_options! - expectations_args = (args << options.merge(:with_expectations => true)) + expectation_args = args.dup + options = args.extract_options! + stub_args = (args << options.merge(:with_stubs => true)) describe 'macro stubs' do before(:each) do @@ -70,21 +69,21 @@ module FunctionalBuilder expects :new, :on => String, :with => 'ola', :returns => 'ola' get :new - it 'should run stubs by default' do - String.should_receive(:stub!).with(:new).and_return(@mock=mock('chain')) - @mock.should_receive(:and_return).with('ola').and_return('ola') - - send(matcher, *stubs_args).matches?(@controller) - end - - it 'should run expectations' do + it 'should run expectations by default' do String.should_receive(:should_receive).with(:new).and_return(@mock=mock('chain')) @mock.should_receive(:with).with('ola').and_return(@mock) @mock.should_receive(:exactly).with(1).and_return(@mock) @mock.should_receive(:times).and_return(@mock) @mock.should_receive(:and_return).with('ola').and_return('ola') - send(matcher, *expectations_args).matches?(@controller) + send(matcher, *expectation_args).matches?(@controller) + end + + it 'should run stubs' do + String.should_receive(:stub!).with(:new).and_return(@mock=mock('chain')) + @mock.should_receive(:and_return).with('ola').and_return('ola') + + send(matcher, *stub_args).matches?(@controller) end end remarkable_rails/spec/functional_builder.rb fe64b4437dd59813d58da62bc08a8419d7f932a2 29595df68e793dd48819d74ebbf432c97f43a886 Lawrence Pit lawrence.pit@gmail.com http://github.com/lawrencepit/remarkable/commit/caaf671a1005c7d73ee922939a364c5ba210535f caaf671a1005c7d73ee922939a364c5ba210535f 2009-06-30T01:13:34-07:00 2009-06-30T01:13:34-07:00 Merge branch 'master' of git://github.com/carlosbrando/remarkable into banana 459b66089621d40ee858ce229c00c22966a2a688 Lawrence Pit lawrence.pit@gmail.com