@@ -1,3 +1,4 @@ +# encoding: utf-8 current_dir = File.dirname(__FILE__) require File.join(current_dir, "remarkable/lib/remarkable/version.rb") Rakefile @@ -1,3 +1,4 @@ +# encoding: utf-8 current_dir = File.dirname(__FILE__) require File.join(current_dir, "remarkable/lib/remarkable/version.rb") rake_helpers.rb @@ -1,3 +1,4 @@ +# encoding: utf-8 PROJECT_SUMMARY = "Remarkable: a framework for rspec matchers, with support to macros and I18n." PROJECT_DESCRIPTION = PROJECT_SUMMARY remarkable/Rakefile @@ -1,4 +1,5 @@ module Remarkable + module Pending # We cannot put the alias method in the module because it's a Ruby 1.8 bug @@ -6,6 +7,8 @@ module Remarkable # def self.extended(base) #:nodoc: class << base + alias_method :example_without_pending, :example + alias_method :example, :example_with_pending alias :it :example alias :specify :example end @@ -41,7 +44,7 @@ module Remarkable @_pending_group_execute = nil end - def example(description=nil, options={}, backtrace=nil, &implementation) #:nodoc: + def example_with_pending(description=nil, options={}, backtrace=nil, &implementation) #:nodoc: if block_given? && @_pending_group pending_caller = caller.detect{ |c| c !~ /method_missing'/ } pending_description = @_pending_group_description @@ -52,11 +55,12 @@ module Remarkable proc{ pending(pending_description) } end - super(description, options, backtrace || pending_caller, &pending_block) + example_without_pending(description, options, backtrace || pending_caller, &pending_block) else - super(description, options, backtrace || caller(0)[1], &implementation) + example_without_pending(description, options, backtrace || caller(0)[1], &implementation) end end end + end remarkable/lib/remarkable/pending.rb @@ -1,3 +1,4 @@ +# encoding: utf-8 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe Remarkable::DSL::Optionals do remarkable/spec/dsl/optionals_spec.rb @@ -1,3 +1,4 @@ +# encoding: utf-8 require File.expand_path(File.dirname(__FILE__) + '/spec_helper') describe Remarkable::Messages do remarkable/spec/messages_spec.rb @@ -1,7 +1,6 @@ $TESTING=true require 'rubygems' -require 'ruby-debug' dir = File.dirname(__FILE__) require File.join(dir, '..', 'lib', 'remarkable') remarkable/spec/spec_helper.rb @@ -1,3 +1,4 @@ +# encoding: utf-8 PROJECT_SUMMARY = "Remarkable ActiveRecord: collection of matchers and macros with I18n for ActiveRecord" PROJECT_DESCRIPTION = PROJECT_SUMMARY remarkable_activerecord/Rakefile @@ -1,5 +1,5 @@ +# encoding: utf-8 require 'rubygems' -require 'ruby-debug' RAILS_VERSION = ENV['RAILS_VERSION'] || '2.3.2' remarkable_activerecord/spec/spec_helper.rb @@ -161,9 +161,9 @@ describe 'validate_length_of' do it { should_not define_and_validate(:within => 2..6).within(3..6).with_kind_of(Variant) } it { should_not define_and_validate(:within => 3..7).within(3..6).with_kind_of(Variant) } - it "should raise association type mismatch if with_kind_of is not supplied" do + it "should raise association type mismatch if with_kind_of does not match" do lambda { - should_not define_and_validate(:within => 3..6).within(3..6) + should_not define_and_validate(:within => 3..6).within(3..6).with_kind_of(Product) }.should raise_error(ActiveRecord::AssociationTypeMismatch) end end remarkable_activerecord/spec/validate_length_of_matcher_spec.rb @@ -1,3 +1,4 @@ +# encoding: utf-8 PROJECT_SUMMARY = "Remarkable Rails: collection of matchers and macros with I18n for Rails" PROJECT_DESCRIPTION = PROJECT_SUMMARY remarkable_rails/Rakefile @@ -1,5 +1,4 @@ require 'rubygems' -require 'ruby-debug' RAILS_ENV = 'test' RAILS_VERSION = ENV['RAILS_VERSION'] || '2.3.2' remarkable_rails/spec/spec_helper.rb 95c851c28cc20b27789d70ad2df948bc75974e46 Iain Hecker github@iain.nl http://github.com/carlosbrando/remarkable/commit/fb1d24a60fbbc294d4c554d3da2062dc84d863cb fb1d24a60fbbc294d4c554d3da2062dc84d863cb 2009-05-24T06:16:32-07:00 2009-05-24T05:59:25-07:00 Ruby 1.9 compatibility Signed-off-by: José Valim <jose.valim@gmail.com> a949598d9ed50cb8618aff1ab2dcc10416ceeaa9 José Valim jose.valim@gmail.com