rspec-core 2.14.8 → 2.99.0.beta1

data/spec/rspec/core/metadata_spec.rb

@@ -69,27 +69,27 @@ module RSpec
           it "matches the group when the line_number is the example group line number" do
             # this call doesn't really make sense since filter_applies? is only called
             # for example metadata not group metadata
-            expect(group_metadata.filter_applies?(condition_key, group_condition)).to be_true
+            expect(group_metadata.filter_applies?(condition_key, group_condition)).to be_truthy
           end
 
           it "matches the example when the line_number is the grandparent example group line number" do
-            expect(example_metadata.filter_applies?(condition_key, parent_group_condition)).to be_true
+            expect(example_metadata.filter_applies?(condition_key, parent_group_condition)).to be_truthy
           end
 
           it "matches the example when the line_number is the parent example group line number" do
-            expect(example_metadata.filter_applies?(condition_key, group_condition)).to be_true
+            expect(example_metadata.filter_applies?(condition_key, group_condition)).to be_truthy
           end
 
           it "matches the example when the line_number is the example line number" do
-            expect(example_metadata.filter_applies?(condition_key, example_condition)).to be_true
+            expect(example_metadata.filter_applies?(condition_key, example_condition)).to be_truthy
           end
 
           it "matches when the line number is between this example and the next" do
-            expect(example_metadata.filter_applies?(condition_key, between_examples_condition)).to be_true
+            expect(example_metadata.filter_applies?(condition_key, between_examples_condition)).to be_truthy
           end
 
           it "does not match when the line number matches the next example" do
-            expect(example_metadata.filter_applies?(condition_key, next_example_condition)).to be_false
+            expect(example_metadata.filter_applies?(condition_key, next_example_condition)).to be_falsey
           end
         end
 
@@ -136,25 +136,25 @@ module RSpec
           it_has_behavior "matching by line number"
 
           it "ignores location filters for other files" do
-            expect(example_metadata.filter_applies?(:locations, {"/path/to/other_spec.rb" => [3,5,7]})).to be_true
+            expect(example_metadata.filter_applies?(:locations, {"/path/to/other_spec.rb" => [3,5,7]})).to be_truthy
           end
         end
 
         it "matches a proc with no arguments that evaluates to true" do
-          expect(example_metadata.filter_applies?(:if, lambda { true })).to be_true
+          expect(example_metadata.filter_applies?(:if, lambda { true })).to be_truthy
         end
 
         it "matches a proc that evaluates to true" do
-          expect(example_metadata.filter_applies?(:if, lambda { |v| v })).to be_true
+          expect(example_metadata.filter_applies?(:if, lambda { |v| v })).to be_truthy
         end
 
         it "does not match a proc that evaluates to false" do
-          expect(example_metadata.filter_applies?(:if, lambda { |v| !v })).to be_false
+          expect(example_metadata.filter_applies?(:if, lambda { |v| !v })).to be_falsey
         end
 
         it "matches a proc with an arity of 2" do
           example_metadata[:foo] = nil
-          expect(example_metadata.filter_applies?(:foo, lambda { |v, m| m == example_metadata })).to be_true
+          expect(example_metadata.filter_applies?(:foo, lambda { |v, m| m == example_metadata })).to be_truthy
         end
 
         it "raises an error when the proc has an incorrect arity" do
@@ -169,35 +169,35 @@ module RSpec
           }
 
           it "matches a symbol" do
-            expect(metadata_with_array.filter_applies?(:tag, 'one')).to be_true
-            expect(metadata_with_array.filter_applies?(:tag, :one)).to be_true
-            expect(metadata_with_array.filter_applies?(:tag, 'two')).to be_false
+            expect(metadata_with_array.filter_applies?(:tag, 'one')).to be_truthy
+            expect(metadata_with_array.filter_applies?(:tag, :one)).to be_truthy
+            expect(metadata_with_array.filter_applies?(:tag, 'two')).to be_falsey
           end
 
           it "matches a string" do
-            expect(metadata_with_array.filter_applies?(:tag, 'three')).to be_true
-            expect(metadata_with_array.filter_applies?(:tag, :three)).to be_true
-            expect(metadata_with_array.filter_applies?(:tag, 'tree')).to be_false
+            expect(metadata_with_array.filter_applies?(:tag, 'three')).to be_truthy
+            expect(metadata_with_array.filter_applies?(:tag, :three)).to be_truthy
+            expect(metadata_with_array.filter_applies?(:tag, 'tree')).to be_falsey
           end
 
           it "matches an integer" do
-            expect(metadata_with_array.filter_applies?(:tag, '2')).to be_true
-            expect(metadata_with_array.filter_applies?(:tag, 2)).to be_true
-            expect(metadata_with_array.filter_applies?(:tag, 3)).to be_false
+            expect(metadata_with_array.filter_applies?(:tag, '2')).to be_truthy
+            expect(metadata_with_array.filter_applies?(:tag, 2)).to be_truthy
+            expect(metadata_with_array.filter_applies?(:tag, 3)).to be_falsey
           end
 
           it "matches a regexp" do
-            expect(metadata_with_array.filter_applies?(:tag, 'four')).to be_true
-            expect(metadata_with_array.filter_applies?(:tag, 'fourtune')).to be_true
-            expect(metadata_with_array.filter_applies?(:tag, 'fortune')).to be_false
+            expect(metadata_with_array.filter_applies?(:tag, 'four')).to be_truthy
+            expect(metadata_with_array.filter_applies?(:tag, 'fourtune')).to be_truthy
+            expect(metadata_with_array.filter_applies?(:tag, 'fortune')).to be_falsey
           end
 
           it "matches a proc that evaluates to true" do
-            expect(metadata_with_array.filter_applies?(:tag, lambda { |values| values.include? 'three' })).to be_true
+            expect(metadata_with_array.filter_applies?(:tag, lambda { |values| values.include? 'three' })).to be_truthy
           end
 
           it "does not match a proc that evaluates to false" do
-            expect(metadata_with_array.filter_applies?(:tag, lambda { |values| values.include? 'nothing' })).to be_false
+            expect(metadata_with_array.filter_applies?(:tag, lambda { |values| values.include? 'nothing' })).to be_falsey
           end
         end
       end

data/spec/rspec/core/option_parser_spec.rb

@@ -5,7 +5,6 @@ module RSpec::Core
     let(:output_file){ mock File }
 
     before do
-      RSpec.stub(:deprecate)
       File.stub(:open).with("foo.txt",'w') { (output_file) }
     end
 
@@ -196,6 +195,25 @@ module RSpec::Core
           end
         end
       end
+
+      context "with default" do
+        it 'defines the order as defined' do
+          options = Parser.parse!(['--order', 'default'])
+          expect(options[:order]).to eq('defined')
+        end
+
+        it 'prints a deprecation warning' do
+          expect_deprecation_with_no_call_site(/default/)
+          Parser.parse!(['--order', 'default'])
+        end
+      end
+
+      context "with defined" do
+        it 'defines the order as defined' do
+          options = Parser.parse!(['--order', 'defined'])
+          expect(options[:order]).to eq('defined')
+        end
+      end
     end
 
     describe "--seed" do

data/spec/rspec/core/project_initializer_spec.rb

@@ -82,13 +82,13 @@ module RSpec::Core
           it "removes it if confirmed" do
             command_line_config.stub(:gets => 'yes')
             command_line_config.run
-            expect(File.exist?('autotest/discover.rb')).to be_false
+            expect(File.exist?('autotest/discover.rb')).to be_falsey
           end
 
           it "leaves it if not confirmed" do
             command_line_config.stub(:gets => 'no')
             command_line_config.run
-            expect(File.exist?('autotest/discover.rb')).to be_true
+            expect(File.exist?('autotest/discover.rb')).to be_truthy
           end
         end
 
@@ -106,13 +106,13 @@ module RSpec::Core
           it "removes it if confirmed" do
             command_line_config.stub(:gets => 'yes')
             command_line_config.run
-            expect(File.exist?('lib/tasks/rspec.rake')).to be_false
+            expect(File.exist?('lib/tasks/rspec.rake')).to be_falsey
           end
 
           it "leaves it if not confirmed" do
             command_line_config.stub(:gets => 'no')
             command_line_config.run
-            expect(File.exist?('lib/tasks/rspec.rake')).to be_true
+            expect(File.exist?('lib/tasks/rspec.rake')).to be_truthy
           end
         end
       end

data/spec/rspec/core/rake_task_spec.rb

@@ -34,7 +34,7 @@ module RSpec::Core
         end
 
         task.should_receive(:run_task) { true }
-        expect(Rake.application.invoke_task("rake_task_args[first_spec.rb]")).to be_true
+        expect(Rake.application.invoke_task("rake_task_args[first_spec.rb]")).to be_truthy
       end
     end
 
@@ -45,26 +45,40 @@ module RSpec::Core
     end
 
     context "with rcov" do
+      before { allow(RSpec).to receive(:deprecate) }
+
       it "renders rcov" do
         with_rcov do
           expect(spec_command).to match(/^#{ruby} -S rcov/)
         end
       end
+
+      it 'warns of deprecation' do
+        expect(RSpec).to receive(:deprecate)
+        with_rcov { spec_command }
+      end
     end
 
     context "with ruby options" do
       it "renders them before -S" do
-          task.ruby_opts = "-w"
-          expect(spec_command).to match(/^#{ruby} -w -S rspec/)
+        task.ruby_opts = "-w"
+        expect(spec_command).to match(/^#{ruby} -w -S rspec/)
       end
     end
 
     context "with rcov_opts" do
+      before { allow(RSpec).to receive(:deprecate) }
+
       context "with rcov=false (default)" do
         it "does not add the rcov options to the command" do
           task.rcov_opts = '--exclude "mocks"'
           expect(spec_command).not_to match(/--exclude "mocks"/)
         end
+
+        it 'warns of deprecation' do
+          expect(RSpec).to receive(:deprecate)
+          task.rcov_opts = '--exclude "mocks"'
+        end
       end
 
       context "with rcov=true" do
@@ -79,10 +93,17 @@ module RSpec::Core
           task.rcov_opts = '--exclude "mocks"'
           expect(spec_command).to match(/rcov.*-Ispec:lib/)
         end
+
+        it 'warns of deprecation' do
+          expect(RSpec).to receive(:deprecate)
+          task.rcov_opts = '--exclude "mocks"'
+        end
       end
     end
 
     context "with rspec_opts" do
+      before { allow(RSpec).to receive(:deprecate) }
+
       context "with rcov=true" do
         it "adds the rspec_opts after the rcov_opts and files" do
           task.stub(:files_to_run) { "this.rb that.rb" }
@@ -134,7 +155,7 @@ module RSpec::Core
       # since the config block is deferred til task invocation, must fake
       # calling the task so the expected pattern is picked up
       task.should_receive(:run_task) { true }
-      expect(Rake.application.invoke_task(task.name)).to be_true
+      expect(Rake.application.invoke_task(task.name)).to be_truthy
 
       specify_consistent_ordering_of_files_to_run('a/*.rb', task)
     end

data/spec/rspec/core/shared_context_spec.rb

@@ -28,10 +28,10 @@ describe RSpec::SharedContext do
 
     group.run
 
-    expect(before_all_hook).to be_true
-    expect(before_each_hook).to be_true
-    expect(after_each_hook).to be_true
-    expect(after_all_hook).to be_true
+    expect(before_all_hook).to be_truthy
+    expect(before_each_hook).to be_truthy
+    expect(after_each_hook).to be_truthy
+    expect(after_all_hook).to be_truthy
   end
 
   it "runs the before each hooks in configuration before those of the shared context" do

data/spec/rspec/core/shared_example_group_spec.rb

@@ -51,7 +51,7 @@ module RSpec::Core
 
         it 'works with top level defined examples in modules' do
           expect(RSpec::configuration.reporter).to_not receive(:deprecation)
-          group = ExampleGroup.describe('example group') { include_context 'top level in module' }
+          ExampleGroup.describe('example group') { include_context 'top level in module' }
         end
 
         ["name", :name, ExampleModule, ExampleClass].each do |object|

data/spec/rspec/core_spec.rb

@@ -41,6 +41,16 @@ describe RSpec do
     end
   end
 
+  describe ".current_example" do
+    it "sets the example being executed" do
+      group = RSpec::Core::ExampleGroup.describe("an example group")
+      example = group.example("an example")
+
+      RSpec.current_example = example
+      expect(RSpec.current_example).to be(example)
+    end
+  end
+
   describe "::reset" do
     it "resets the configuration and world objects" do
       config_before_reset = RSpec.configuration
@@ -53,6 +63,12 @@ describe RSpec do
     end
   end
 
+  describe "::Core.path_to_executable" do
+    it 'returns the absolute location of the exe/rspec file' do
+      expect(RSpec::Core.path_to_executable).to eq File.expand_path('../../../exe/rspec',__FILE__)
+    end
+  end
+
   # This is hard to test :(. Best way I could come up with was starting
   # fresh ruby process w/o this stuff already loaded.
   it "loads mocks and expectations when the constants are referenced" do
@@ -68,7 +84,25 @@ describe RSpec do
   it 'correctly raises an error when an invalid const is referenced' do
     expect {
       RSpec::NotAConst
-    }.to raise_error(NameError, /uninitialized constant RSpec::NotAConst/)
+    }.to raise_error(NameError, /RSpec::NotAConst/)
   end
-end
 
+  describe "::Core::PendingExampleFixedError" do
+    before { allow_deprecation }
+
+    it 'is an alternate reference to RSpec::Core::Pending::PendingExampleFixedError' do
+      expect(::RSpec::Core::PendingExampleFixedError).to be(::RSpec::Core::Pending::PendingExampleFixedError)
+    end
+
+    it 'prints a deprecation warning' do
+      expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /PendingExampleFixedError/)
+      ::RSpec::Core::PendingExampleFixedError
+    end
+
+    specify 'the const_missing hook allows other undefined consts to raise errors as normal' do
+      expect {
+        ::RSpec::Core::SomeUndefinedConst
+      }.to raise_error(NameError, /uninitialized constant RSpec::Core::SomeUndefinedConst/)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -39,6 +39,7 @@ Spork.prefork do
     def self.sandboxed(&block)
       @orig_config = RSpec.configuration
       @orig_world  = RSpec.world
+      @orig_example = RSpec.current_example
       new_config = RSpec::Core::Configuration.new
       new_world  = RSpec::Core::World.new(new_config)
       RSpec.configuration = new_config
@@ -49,6 +50,7 @@ Spork.prefork do
       (class << RSpec::Core::ExampleGroup; self; end).class_eval do
         alias_method :orig_run, :run
         def run(reporter=nil)
+          RSpec.current_example = nil
           orig_run(reporter || NullObject.new)
         end
       end
@@ -65,6 +67,7 @@ Spork.prefork do
 
       RSpec.configuration = @orig_config
       RSpec.world = @orig_world
+      RSpec.current_example = @orig_example
     end
   end
 

data/spec/support/helper_methods.rb

@@ -23,9 +23,24 @@ module RSpecHelpers
     end
   end
 
-  def expect_deprecation_with_call_site(file, line)
+  def expect_deprecation_with_call_site(file, line, deprecated = //)
     expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
       expect(options[:call_site]).to include([file, line].join(':'))
+      expect(options[:deprecated]).to match(deprecated)
+    end
+  end
+
+  def expect_deprecation_with_no_call_site(deprecated)
+    expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
+      expect(options).to include(:call_site => nil)
+      expect(options[:deprecated]).to match(deprecated)
+    end
+  end
+
+  def expect_warn_deprecation_with_call_site(file, line, deprecated = //)
+    expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
+      expect(options[:message]).to include([file, line].join(':'))
+      expect(options[:message]).to match(deprecated)
     end
   end
 

data/spec/support/shared_example_groups.rb

@@ -20,6 +20,7 @@ shared_examples_for "metadata hash builder" do
     let(:warning_receiver) { Kernel }
 
     before(:each) do
+      allow_deprecation
       RSpec.configure { |c| c.treat_symbols_as_metadata_keys_with_true_values = false }
       warning_receiver.stub(:warn)
     end

data/spec/support/silence_dsl_deprecations.rb

@@ -0,0 +1,32 @@
+module SilenceDSLDeprecations
+  class Reporter
+    def initialize(reporter)
+      @reporter = reporter
+    end
+
+    def deprecation(*)
+      # do nothing
+    end
+
+    def respond_to?(*args)
+      @repoter.respond_to?(*args) || super
+    end
+
+    def method_missing(*args, &block)
+      @reporter.__send__(*args, &block)
+    end
+  end
+
+  def silence_dsl_deprecations
+    old_reporter = RSpec.configuration.reporter
+    replace_reporter(Reporter.new(old_reporter))
+    yield
+  ensure
+    replace_reporter(old_reporter)
+  end
+
+  def replace_reporter(new_reporter)
+    RSpec.configuration.instance_variable_set(:@reporter, new_reporter)
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  version: 2.14.8
+  version: 2.99.0.beta1
 platform: ruby
 authors:
 - Steven Baker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -152,6 +152,7 @@ files:
 - lib/rspec/core.rb
 - lib/rspec/core/backtrace_cleaner.rb
 - lib/rspec/core/backward_compatibility.rb
+- lib/rspec/core/caller_filter.rb
 - lib/rspec/core/command_line.rb
 - lib/rspec/core/configuration.rb
 - lib/rspec/core/configuration_options.rb
@@ -275,6 +276,7 @@ files:
 - spec/autotest/rspec_spec.rb
 - spec/command_line/order_spec.rb
 - spec/rspec/core/backtrace_cleaner_spec.rb
+- spec/rspec/core/caller_filter_spec.rb
 - spec/rspec/core/command_line_spec.rb
 - spec/rspec/core/command_line_spec_output.txt
 - spec/rspec/core/configuration_options_spec.rb
@@ -312,7 +314,6 @@ files:
 - spec/rspec/core/formatters/text_mate_formatted-1.9.3-rbx.html
 - spec/rspec/core/formatters/text_mate_formatted-1.9.3.html
 - spec/rspec/core/formatters/text_mate_formatted-2.0.0.html
-- spec/rspec/core/formatters/text_mate_formatted-2.1.0.html
 - spec/rspec/core/formatters/text_mate_formatter_spec.rb
 - spec/rspec/core/hooks_filtering_spec.rb
 - spec/rspec/core/hooks_spec.rb
@@ -349,6 +350,7 @@ files:
 - spec/support/mathn_integration_support.rb
 - spec/support/sandboxed_mock_space.rb
 - spec/support/shared_example_groups.rb
+- spec/support/silence_dsl_deprecations.rb
 - spec/support/spec_files.rb
 - exe/autospec
 - exe/rspec
@@ -368,15 +370,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
-summary: rspec-core-2.14.8
+summary: rspec-core-2.99.0.beta1
 test_files:
 - features/Autotest.md
 - features/README.md
@@ -449,6 +451,7 @@ test_files:
 - spec/autotest/rspec_spec.rb
 - spec/command_line/order_spec.rb
 - spec/rspec/core/backtrace_cleaner_spec.rb
+- spec/rspec/core/caller_filter_spec.rb
 - spec/rspec/core/command_line_spec.rb
 - spec/rspec/core/command_line_spec_output.txt
 - spec/rspec/core/configuration_options_spec.rb
@@ -486,7 +489,6 @@ test_files:
 - spec/rspec/core/formatters/text_mate_formatted-1.9.3-rbx.html
 - spec/rspec/core/formatters/text_mate_formatted-1.9.3.html
 - spec/rspec/core/formatters/text_mate_formatted-2.0.0.html
-- spec/rspec/core/formatters/text_mate_formatted-2.1.0.html
 - spec/rspec/core/formatters/text_mate_formatter_spec.rb
 - spec/rspec/core/hooks_filtering_spec.rb
 - spec/rspec/core/hooks_spec.rb
@@ -523,5 +525,6 @@ test_files:
 - spec/support/mathn_integration_support.rb
 - spec/support/sandboxed_mock_space.rb
 - spec/support/shared_example_groups.rb
+- spec/support/silence_dsl_deprecations.rb
 - spec/support/spec_files.rb
 has_rdoc: