rspec-core 2.99.2 → 3.0.0.beta1

data/spec/rspec/core/metadata_spec.rb

@@ -115,29 +115,6 @@ module RSpec
           it_has_behavior "matching by line number"
         end
 
-        context "with a :line_numbers filter" do
-          before(:each)  { Metadata.line_number_filter_deprecation_issued = false }
-          after(:all)    { Metadata.line_number_filter_deprecation_issued = false }
-          let(:metadata) { Metadata.new.process("group") }
-
-          context "when a line number filter is applied manually (e.g. not from the command line)" do
-            it 'issues a deprecation warning' do
-              expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /:line_numbers/)
-              metadata.filter_applies?(:line_numbers, [2])
-            end
-          end
-
-          context "when a line number filter is applied from the command line" do
-            it "does not issue an additional deprecation" do
-              allow_deprecation
-              Parser.parse!(["--line-number", "3"])
-
-              expect_no_deprecation
-              metadata.filter_applies?(:line_numbers, [2])
-            end
-          end
-        end
-
         context "with locations" do
           let(:condition_key){ :locations }
           let(:parent_group_condition) do
@@ -284,7 +261,7 @@ module RSpec
       end
 
       [:described_class, :describes].each do |key|
-        describe key.inspect do
+        describe key do
           context "with a String" do
             it "returns nil" do
               m = Metadata.new

data/spec/rspec/core/option_parser_spec.rb

@@ -5,6 +5,7 @@ module RSpec::Core
     let(:output_file){ mock File }
 
     before do
+      RSpec.stub(:deprecate)
       File.stub(:open).with("foo.txt",'w') { (output_file) }
     end
 
@@ -27,7 +28,7 @@ module RSpec::Core
 
     describe "--formatter" do
       it "is deprecated" do
-        expect_deprecation_with_no_call_site(%r{`--formatter`})
+        RSpec.should_receive(:deprecate)
         Parser.parse!(%w[--formatter doc])
       end
 
@@ -38,11 +39,6 @@ module RSpec::Core
     end
 
     describe "--default_path" do
-      it "is deprecated" do
-        expect_deprecation_with_no_call_site(%r{`--default_path`})
-        Parser.parse!(%w[--default_path foo])
-      end
-
       it "gets converted to --default-path" do
         options = Parser.parse!(%w[--default_path foo])
         expect(options[:default_path]).to eq "foo"
@@ -50,17 +46,13 @@ module RSpec::Core
     end
 
     describe "--line_number" do
-      it "is deprecated" do
-        expect_deprecation_with_no_call_site(%r{`--line-number`/`-l`})
-        Parser.parse!(%w[--line_number 3])
-      end
-
       it "gets converted to --line-number" do
         options = Parser.parse!(%w[--line_number 3])
         expect(options[:line_numbers]).to eq ["3"]
       end
     end
 
+
     describe "--default-path" do
       it "sets the default path where RSpec looks for examples" do
         options = Parser.parse!(%w[--default-path foo])
@@ -74,11 +66,6 @@ module RSpec::Core
           options = Parser.parse!([option, "3"])
           expect(options[:line_numbers]).to eq ["3"]
         end
-
-        it "is deprecated" do
-          expect_deprecation_with_no_call_site(%r{`--line-number`/`-l`})
-          Parser.parse!([option, "3"])
-        end
       end
     end
 
@@ -91,29 +78,6 @@ module RSpec::Core
       end
     end
 
-    describe "--deprecation-out" do
-      it 'configures the deprecation stream' do
-        expect {
-          Parser.parse!(['--deprecation-out', 'path/to/file.log'])
-        }.to change { RSpec.configuration.deprecation_stream }.to('path/to/file.log')
-      end
-
-      it 'sets the deprecation stream before processing other options that issue deprecations' do
-        expect(RSpec).to receive(:deprecate) do
-          expect(RSpec.configuration.deprecation_stream).to eq('path/to/file.log')
-        end
-
-        Parser.parse!(['--line-number', '3', '--deprecation-out', 'path/to/file.log'])
-      end
-
-      it 'issues an appropriate error when no file arg is provided' do
-        out_error = Parser.parse!(['--out']) rescue $!
-        expect {
-          Parser.parse!(['--deprecation-out'])
-        }.to raise_error(out_error.class, out_error.message.gsub('--out', '--deprecation-out'))
-      end
-    end
-
     %w[--out -o].each do |option|
       describe option do
         let(:options) { Parser.parse!([option, 'out.txt']) }
@@ -193,6 +157,21 @@ module RSpec::Core
             options = Parser.parse!([option, 'foo:any_string'])
             expect(options[:inclusion_filter]).to eq(:foo => 'any_string')
           end
+
+          it "treats ':any_sym' as :any_sym" do
+            options = Parser.parse!([option, 'foo::any_sym'])
+            expect(options[:inclusion_filter]).to eq(:foo => :any_sym)
+          end
+
+          it "treats '42' as 42" do
+            options = Parser.parse!([option, 'foo:42'])
+            expect(options[:inclusion_filter]).to eq(:foo => 42)
+          end
+
+          it "treats '3.146' as 3.146" do
+            options = Parser.parse!([option, 'foo:3.146'])
+            expect(options[:inclusion_filter]).to eq(:foo => 3.146)
+          end
         end
 
         context "with ~" do
@@ -232,25 +211,6 @@ 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
@@ -272,15 +232,13 @@ module RSpec::Core
       end
 
       it 'sets profile_examples to true when accidentally combined with path' do
-        allow(Kernel).to receive(:warn)
+        allow_warning
         options = Parser.parse!(%w[--profile some/path])
         expect(options[:profile_examples]).to eq true
       end
 
       it 'warns when accidentally combined with path' do
-        expect(Kernel).to receive(:warn) do |msg|
-          expect(msg).to match "Non integer specified as profile count"
-        end
+        expect_warning_without_call_site "Non integer specified as profile count"
         options = Parser.parse!(%w[--profile some/path])
         expect(options[:profile_examples]).to eq true
       end

data/spec/rspec/core/ordering_spec.rb

@@ -0,0 +1,102 @@
+require "spec_helper"
+
+module RSpec
+  module Core
+    module Ordering
+      describe Identity do
+        it "does not affect the ordering of the items" do
+          expect(Identity.new.order([1, 2, 3])).to eq([1, 2, 3])
+        end
+      end
+
+      describe Random do
+        describe '.order' do
+          subject { described_class.new(configuration) }
+
+          let(:configuration)  { RSpec::Core::Configuration.new }
+          let(:items)          { 10.times.map { |n| n } }
+          let(:shuffled_items) { subject.order items }
+
+          it 'shuffles the items randomly' do
+            expect(shuffled_items).to match_array items
+            expect(shuffled_items).to_not eq items
+          end
+
+          context 'given multiple calls' do
+            it 'returns the items in the same order' do
+              expect(subject.order(items)).to eq shuffled_items
+            end
+          end
+
+          context 'given randomization has been seeded explicitly' do
+            before { @seed = srand }
+            after  { srand @seed }
+
+            it "does not affect the global random number generator" do
+              srand 123
+              val1, val2 = rand(1_000), rand(1_000)
+
+              subject
+
+              srand 123
+              subject.order items
+              expect(rand(1_000)).to eq(val1)
+              subject.order items
+              expect(rand(1_000)).to eq(val2)
+            end
+          end
+        end
+      end
+
+      describe Custom do
+        it 'uses the block to order the list' do
+          strategy = Custom.new(proc { |list| list.reverse })
+
+          expect(strategy.order([1, 2, 3, 4])).to eq([4, 3, 2, 1])
+        end
+      end
+
+      describe Registry do
+        let(:configuration) { Configuration.new }
+        subject(:registry) { Registry.new(configuration) }
+
+        describe "#used_random_seed?" do
+          it 'returns false if the random orderer has not been used' do
+            expect(registry.used_random_seed?).to be false
+          end
+
+          it 'returns false if the random orderer has been fetched but not used' do
+            expect(registry.fetch(:random)).to be_a(Random)
+            expect(registry.used_random_seed?).to be false
+          end
+
+          it 'returns true if the random orderer has been used' do
+            registry.fetch(:random).order([1, 2])
+            expect(registry.used_random_seed?).to be true
+          end
+        end
+
+        describe "#fetch" do
+          it "gives the registered ordering when called with a symbol" do
+            ordering = Object.new
+            subject.register(:falcon, ordering)
+
+            expect(subject.fetch(:falcon)).to be ordering
+          end
+
+          context "when given an unrecognized symbol" do
+            it 'invokes the given block and returns its value' do
+              expect(subject.fetch(:falcon) { :fallback }).to eq(:fallback)
+            end
+
+            it 'raises an error if no block is given' do
+              expect {
+                subject.fetch(:falcon)
+              }.to raise_error(IndexError)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/rspec/core/pending_example_spec.rb

@@ -55,19 +55,6 @@ describe "an example" do
       example.run(group.new, double.as_null_object)
       expect(example).to be_pending_with(RSpec::Core::Pending::NO_REASON_GIVEN)
     end
-
-    it 'shows upgrade warning' do
-      expect_warn_deprecation_with_call_site(
-        "pending_example_spec.rb", __LINE__ + 4
-      )
-      group = RSpec::Core::ExampleGroup.describe('group') do
-        it "does something" do
-          pending
-        end
-      end
-      example = group.examples.first
-      example.run(group.new, double.as_null_object)
-    end
   end
 
   context "with no docstring" do
@@ -117,20 +104,6 @@ describe "an example" do
     end
   end
 
-  context "skip with a block" do
-    it "does not execute the block" do
-      called = false
-      group = RSpec::Core::ExampleGroup.describe('group') do
-        it "does something" do
-          skip { called = true }
-        end
-      end
-      example = group.examples.first
-      example.run(group.new, double.as_null_object)
-      expect(called).to eq(false)
-    end
-  end
-
   context "with a block" do
     def run_example(*pending_args, &block)
       group = RSpec::Core::ExampleGroup.describe('group') do
@@ -143,19 +116,6 @@ describe "an example" do
       example
     end
 
-    it 'shows upgrade warning' do
-      expect_warn_deprecation_with_call_site(
-        "pending_example_spec.rb", __LINE__ + 4
-      )
-      group = RSpec::Core::ExampleGroup.describe('group') do
-        it "does something" do
-          pending {}
-        end
-      end
-      example = group.examples.first
-      example.run(group.new, double.as_null_object)
-    end
-
     context "that fails" do
       def run_example(*pending_args)
         super(*pending_args) { raise ArgumentError.new }

data/spec/rspec/core/project_initializer_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require 'rspec/core/project_initializer'
 
 module RSpec::Core
   describe ProjectInitializer, :isolated_directory => true do
@@ -8,7 +9,6 @@ module RSpec::Core
         let(:command_line_config) { ProjectInitializer.new }
 
         before do
-          command_line_config.stub(:warn)
           command_line_config.stub(:puts)
           command_line_config.stub(:gets => 'no')
         end
@@ -68,30 +68,6 @@ module RSpec::Core
           end
         end
 
-        context "with autotest/discover.rb" do
-          before do
-            FileUtils.mkdir('autotest')
-            FileUtils.touch 'autotest/discover.rb'
-          end
-
-          it "asks whether to delete the file" do
-            command_line_config.should_receive(:puts).with(/delete/)
-            command_line_config.run
-          end
-
-          it "removes it if confirmed" do
-            command_line_config.stub(:gets => 'yes')
-            command_line_config.run
-            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_truthy
-          end
-        end
-
         context "with lib/tasks/rspec.rake" do
           before do
             FileUtils.mkdir_p('lib/tasks')

data/spec/rspec/core/rake_task_spec.rb

@@ -10,11 +10,6 @@ module RSpec::Core
       FileUtils::RUBY
     end
 
-    def with_rcov
-      task.rcov = true
-      yield
-    end
-
     def spec_command
       task.__send__(:spec_command)
     end
@@ -44,79 +39,17 @@ module RSpec::Core
       end
     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/)
-      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
-        it "renders them after rcov" do
-          task.rcov = true
-          task.rcov_opts = '--exclude "mocks"'
-          expect(spec_command).to match(/rcov.*--exclude "mocks"/)
-        end
-
-        it "ensures that -Ispec:lib is in the resulting command" do
-          task.rcov = true
-          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
+          task.ruby_opts = "-w"
+          expect(spec_command).to match(/^#{ruby} -w -S rspec/)
       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" }
-          task.rcov = true
-          task.rspec_opts = "-Ifoo"
-          expect(spec_command).to match(/this.rb that.rb -- -Ifoo/)
-        end
-      end
-      context "with rcov=false (default)" do
-        it "adds the rspec_opts" do
-          task.rspec_opts = "-Ifoo"
-          expect(spec_command).to match(/rspec.*-Ifoo/)
-        end
+      it "adds the rspec_opts" do
+        task.rspec_opts = "-Ifoo"
+        expect(spec_command).to match(/rspec.*-Ifoo/)
       end
     end