rspec-core 2.5.2 → 2.6.0.rc2

data/spec/rspec/core/world_spec.rb

@@ -138,7 +138,15 @@ module RSpec::Core
       let(:group) do
         RSpec::Core::ExampleGroup.describe("group") do
 
-          example("example") {}
+            example("example") {}
+
+        end
+      end
+
+      let(:second_group) do
+        RSpec::Core::ExampleGroup.describe("second_group") do
+
+          example("second_example") {}
 
         end
       end
@@ -146,26 +154,41 @@ module RSpec::Core
       let(:group_declaration_line) { group.metadata[:example_group][:line_number] }
       let(:example_declaration_line) { group_declaration_line + 2 }
 
-      before { world.register(group) }
+      context "with one example" do
+        before { world.register(group) }
 
-      it "returns nil if no example or group precedes the line" do
-        world.preceding_declaration_line(group_declaration_line - 1).should be_nil
-      end
+        it "returns nil if no example or group precedes the line" do
+          world.preceding_declaration_line(group_declaration_line - 1).should be_nil
+        end
 
-      it "returns the argument line number if a group starts on that line" do
-        world.preceding_declaration_line(group_declaration_line).should eq(group_declaration_line)
-      end
+        it "returns the argument line number if a group starts on that line" do
+          world.preceding_declaration_line(group_declaration_line).should eq(group_declaration_line)
+        end
 
-      it "returns the argument line number if an example starts on that line" do
-        world.preceding_declaration_line(example_declaration_line).should eq(example_declaration_line)
-      end
+        it "returns the argument line number if an example starts on that line" do
+          world.preceding_declaration_line(example_declaration_line).should eq(example_declaration_line)
+        end
 
-      it "returns line number of a group that immediately precedes the argument line" do
-        world.preceding_declaration_line(group_declaration_line + 1).should eq(group_declaration_line)
+        it "returns line number of a group that immediately precedes the argument line" do
+          world.preceding_declaration_line(group_declaration_line + 1).should eq(group_declaration_line)
+        end
+
+        it "returns line number of an example that immediately precedes the argument line" do
+          world.preceding_declaration_line(example_declaration_line + 1).should eq(example_declaration_line)
+        end
       end
 
-      it "returns line number of an example that immediately precedes the argument line" do
-        world.preceding_declaration_line(example_declaration_line + 1).should eq(example_declaration_line)
+      context "with two exaples and the second example is registre first" do
+        let(:second_group_declaration_line) { second_group.metadata[:example_group][:line_number] }
+
+        before do 
+          world.register(second_group)
+          world.register(group)
+        end
+
+        it 'return line number of group if a group start on that line' do
+          world.preceding_declaration_line(second_group_declaration_line).should eq(second_group_declaration_line)
+        end
       end
     end
 

data/spec/rspec/core_spec.rb

@@ -11,6 +11,13 @@ describe RSpec::Core do
   end
 
   describe "#configure" do
+    around(:each) do |example|
+      RSpec.allowing_configure_warning(&example)
+    end
+
+    before(:each) do
+      RSpec.stub(:warn)
+    end
 
     it "yields the current configuration" do
       RSpec.configure do |config|
@@ -18,6 +25,27 @@ describe RSpec::Core do
       end
     end
 
+    context "when an example group has already been defined" do
+      before(:each) do
+        RSpec.world.stub(:example_groups).and_return([double.as_null_object])
+      end
+
+      it "prints a deprecation warning" do
+        RSpec.should_receive(:warn).with(/configuration should happen before the first example group/)
+        RSpec.configure { |c| }
+      end
+    end
+
+    context "when no examples have been defined yet" do
+      before(:each) do
+        RSpec.world.stub(:example_groups).and_return([])
+      end
+
+      it "does not print a deprecation warning" do
+        RSpec.should_not_receive(:warn)
+        RSpec.configure { |c| }
+      end
+    end
   end
 
   describe "#world" do

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

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  hash: 15424049
+  prerelease: 6
   segments: 
   - 2
-  - 5
+  - 6
+  - 0
+  - rc
   - 2
-  version: 2.5.2
+  version: 2.6.0.rc2
 platform: ruby
 authors: 
 - Chad Humphries
@@ -16,12 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -05:00
+date: 2011-04-18 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: RSpec runner and example groups
-email: dchelimsky@gmail.com;chad.humphries@gmail.com
+description: BDD for Ruby. RSpec runner and example groups.
+email: rspec-users@rubyforge.org;
 executables: 
 - autospec
 - rspec
@@ -33,6 +35,7 @@ files:
 - .document
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - License.txt
@@ -55,23 +58,29 @@ files:
 - features/command_line/line_number_option.feature
 - features/command_line/rake_task.feature
 - features/command_line/tag.feature
+- features/configuration/alias_example_to.feature
 - features/configuration/custom_settings.feature
 - features/configuration/fail_fast.feature
 - features/configuration/read_options_from_file.feature
 - features/example_groups/basic_structure.feature
+- features/example_groups/shared_context.feature
 - features/example_groups/shared_example_group.feature
 - features/expectation_framework_integration/configure_expectation_framework.feature
 - features/filtering/exclusion_filters.feature
-- features/filtering/implicit_filters.feature
+- features/filtering/if_and_unless.feature
 - features/filtering/inclusion_filters.feature
 - features/filtering/run_all_when_everything_filtered.feature
 - features/formatters/custom_formatter.feature
+- features/formatters/text_formatter.feature
 - features/helper_methods/arbitrary_methods.feature
 - features/helper_methods/let.feature
+- features/helper_methods/modules.feature
 - features/hooks/around_hooks.feature
 - features/hooks/before_and_after_hooks.feature
 - features/hooks/filtering.feature
+- features/metadata/current_example.feature
 - features/metadata/described_class.feature
+- features/metadata/user_defined.feature
 - features/mock_framework_integration/use_any_framework.feature
 - features/mock_framework_integration/use_flexmock.feature
 - features/mock_framework_integration/use_mocha.feature
@@ -118,6 +127,7 @@ files:
 - lib/rspec/core/let.rb
 - lib/rspec/core/load_path.rb
 - lib/rspec/core/metadata.rb
+- lib/rspec/core/metadata_hash_builder.rb
 - lib/rspec/core/mocking/with_absolutely_nothing.rb
 - lib/rspec/core/mocking/with_flexmock.rb
 - lib/rspec/core/mocking/with_mocha.rb
@@ -142,6 +152,7 @@ files:
 - script/cucumber
 - script/full_build
 - script/spec
+- spec.txt
 - spec/autotest/discover_spec.rb
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
@@ -187,6 +198,7 @@ files:
 - spec/rspec/core/resources/custom_example_group_runner.rb
 - spec/rspec/core/resources/formatter_specs.rb
 - spec/rspec/core/resources/utf8_encoded.rb
+- spec/rspec/core/rspec_matchers_spec.rb
 - spec/rspec/core/ruby_project_spec.rb
 - spec/rspec/core/runner_spec.rb
 - spec/rspec/core/shared_context_spec.rb
@@ -197,8 +209,9 @@ files:
 - spec/ruby_forker.rb
 - spec/spec_helper.rb
 - spec/support/matchers.rb
+- spec/support/shared_example_groups.rb
 has_rdoc: true
-homepage: http://github.com/rspec/rspec-core
+homepage: http://github.com/rspec
 licenses: []
 
 post_install_message: 
@@ -218,19 +231,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.5.2
+summary: rspec-core-2.6.0.rc2
 test_files: 
 - features/Autotest.md
 - features/Changelog.md
@@ -245,23 +260,29 @@ test_files:
 - features/command_line/line_number_option.feature
 - features/command_line/rake_task.feature
 - features/command_line/tag.feature
+- features/configuration/alias_example_to.feature
 - features/configuration/custom_settings.feature
 - features/configuration/fail_fast.feature
 - features/configuration/read_options_from_file.feature
 - features/example_groups/basic_structure.feature
+- features/example_groups/shared_context.feature
 - features/example_groups/shared_example_group.feature
 - features/expectation_framework_integration/configure_expectation_framework.feature
 - features/filtering/exclusion_filters.feature
-- features/filtering/implicit_filters.feature
+- features/filtering/if_and_unless.feature
 - features/filtering/inclusion_filters.feature
 - features/filtering/run_all_when_everything_filtered.feature
 - features/formatters/custom_formatter.feature
+- features/formatters/text_formatter.feature
 - features/helper_methods/arbitrary_methods.feature
 - features/helper_methods/let.feature
+- features/helper_methods/modules.feature
 - features/hooks/around_hooks.feature
 - features/hooks/before_and_after_hooks.feature
 - features/hooks/filtering.feature
+- features/metadata/current_example.feature
 - features/metadata/described_class.feature
+- features/metadata/user_defined.feature
 - features/mock_framework_integration/use_any_framework.feature
 - features/mock_framework_integration/use_flexmock.feature
 - features/mock_framework_integration/use_mocha.feature
@@ -320,6 +341,7 @@ test_files:
 - spec/rspec/core/resources/custom_example_group_runner.rb
 - spec/rspec/core/resources/formatter_specs.rb
 - spec/rspec/core/resources/utf8_encoded.rb
+- spec/rspec/core/rspec_matchers_spec.rb
 - spec/rspec/core/ruby_project_spec.rb
 - spec/rspec/core/runner_spec.rb
 - spec/rspec/core/shared_context_spec.rb
@@ -330,3 +352,4 @@ test_files:
 - spec/ruby_forker.rb
 - spec/spec_helper.rb
 - spec/support/matchers.rb
+- spec/support/shared_example_groups.rb