rspec-core 2.5.0 → 2.6.0

data/spec/spec_helper.rb

@@ -15,7 +15,6 @@ def sandboxed(&block)
     @orig_config = RSpec.configuration
     @orig_world  = RSpec.world
     new_config = RSpec::Core::Configuration.new
-    new_config.include(RSpec::Matchers)
     new_world  = RSpec::Core::World.new(new_config)
     RSpec.instance_variable_set(:@configuration, new_config)
     RSpec.instance_variable_set(:@world, new_world)
@@ -51,6 +50,27 @@ def in_editor?
   ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM')
 end
 
+class << RSpec
+  alias_method :original_warn_about_deprecated_configure, :warn_about_deprecated_configure
+
+  def warn_about_deprecated_configure
+    # no-op: in our specs we don't want to see the warning.
+  end
+
+  alias_method :null_warn_about_deprecated_configure, :warn_about_deprecated_configure
+
+  def allowing_configure_warning
+    (class << self; self; end).class_eval do
+      alias_method :warn_about_deprecated_configure, :original_warn_about_deprecated_configure
+      begin
+        yield
+      ensure
+        alias_method :warn_about_deprecated_configure, :null_warn_about_deprecated_configure
+      end
+    end
+  end
+end
+
 RSpec.configure do |c|
   c.color_enabled = !in_editor?
   c.filter_run :focus => true
@@ -58,7 +78,7 @@ RSpec.configure do |c|
   c.filter_run_excluding :ruby => lambda {|version|
     case version.to_s
     when "!jruby"
-      RUBY_ENGINE != "jruby"
+      RUBY_ENGINE == "jruby"
     when /^> (.*)/
       !(RUBY_VERSION.to_s > $1)
     else

data/spec/support/matchers.rb

@@ -20,25 +20,56 @@ RSpec::Matchers.define :map_specs do |specs|
   end
 end
 
-RSpec::Matchers.define :have_interface_for do |method|
-  match do |object|
-    @method = method
-    @object = object
-    object.respond_to?(method) && actual_arity == @expected_arity
+RSpec::Matchers.define :be_pending_with do |message|
+  match do |example|
+    example.metadata[:pending] && example.metadata[:execution_result][:pending_message] == message
   end
 
-  chain :with do |arity|
-    @expected_arity = arity
+  failure_message_for_should do |example|
+    "expected example to pending with #{message.inspect}, got #{example.metadata[:execution_result][:pending_message].inspect}"
   end
+end
 
-  chain(:argument) {}
-  chain(:arguments) {}
+RSpec::Matchers.define :fail_with do |exception_klass|
+  match do |example|
+    failure_reason(example, exception_klass).nil?
+  end
 
-  failure_message_for_should do
-    "#{@object} should have method :#{@method} with #{@expected_arity} argument(s), but it had #{actual_arity}"
+  failure_message_for_should do |example|
+    "expected example to fail with a #{exception_klass} exception, but #{failure_reason(example, exception_klass)}"
+  end
+
+  def failure_reason(example, exception_klass)
+    result = example.metadata[:execution_result]
+    case
+      when example.metadata[:pending] then "was pending"
+      when result[:status] != 'failed' then result[:status]
+      when !result[:exception].is_a?(exception_klass) then "failed with a #{result[:exception].class}"
+      else nil
+    end
+  end
+end
+
+RSpec::Matchers.define :pass do
+  match do |example|
+    failure_reason(example).nil?
+  end
+
+  failure_message_for_should do |example|
+    "expected example to pass, but #{failure_reason(example)}"
   end
 
-  def actual_arity
-    @object.method(@method).arity
+  def failure_reason(example)
+    result = example.metadata[:execution_result]
+    case
+      when example.metadata[:pending] then "was pending"
+      when result[:status] != 'passed' then result[:status]
+      else nil
+    end
   end
 end
+
+RSpec::Matchers.module_eval do
+  alias have_failed_with fail_with
+  alias have_passed pass
+end

data/spec/support/shared_example_groups.rb

@@ -0,0 +1,41 @@
+shared_examples_for "metadata hash builder" do
+  context "when RSpec.configuration.treat_symbols_as_metadata_keys_with_true_values is set to true" do
+    let(:hash) { metadata_hash(:foo, :bar, :bazz => 23) }
+
+    before(:each) do
+      RSpec.configure { |c| c.treat_symbols_as_metadata_keys_with_true_values = true }
+    end
+
+    it 'treats symbols as metadata keys with a true value' do
+      hash[:foo].should == true
+      hash[:bar].should == true
+    end
+
+    it 'still processes hash values normally' do
+      hash[:bazz].should == 23
+    end
+  end
+
+  context "when RSpec.configuration.treat_symbols_as_metadata_keys_with_true_values is set to false" do
+    let(:warning_receiver) { Kernel }
+
+    before(:each) do
+      RSpec.configure { |c| c.treat_symbols_as_metadata_keys_with_true_values = false }
+      warning_receiver.stub(:warn)
+    end
+
+    it 'prints a deprecation warning about any symbols given as arguments' do
+      warning_receiver.should_receive(:warn).with(/In RSpec 3, these symbols will be treated as metadata keys/)
+      metadata_hash(:foo, :bar, :key => 'value')
+    end
+
+    it 'does not treat symbols as metadata keys' do
+      metadata_hash(:foo, :bar, :key => 'value').should_not include(:foo, :bar)
+    end
+
+    it 'does not print a warning if there are no symbol arguments' do
+      warning_receiver.should_not_receive(:warn)
+      metadata_hash(:foo => 23, :bar => 17)
+    end
+  end
+end

data/spec/support/spec_files.rb

@@ -0,0 +1,44 @@
+shared_context "spec files" do
+  def failing_spec_filename
+    @failing_spec_filename ||= File.expand_path(File.dirname(__FILE__)) + "/_failing_spec.rb"
+  end
+
+  def passing_spec_filename
+    @passing_spec_filename ||= File.expand_path(File.dirname(__FILE__)) + "/_passing_spec.rb"
+  end
+
+  def create_passing_spec_file
+    File.open(passing_spec_filename, 'w') do |f|
+      f.write %q{
+          describe "passing spec" do
+            it "passes" do
+              1.should eq(1)
+            end
+          end
+      }
+    end
+  end
+
+  def create_failing_spec_file
+    File.open(failing_spec_filename, 'w') do |f|
+      f.write %q{
+          describe "failing spec" do
+            it "fails" do
+              1.should eq(2)
+            end
+          end
+      }
+    end
+  end
+
+  before(:all) do
+    create_passing_spec_file
+    create_failing_spec_file
+  end
+
+  after(:all) do
+    File.delete(passing_spec_filename)
+    File.delete(failing_spec_filename)
+  end
+
+end