rspec-core 2.99.0.beta2 → 2.99.0.rc1

data/spec/rspec/core/formatters/base_text_formatter_spec.rb

@@ -446,7 +446,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
   describe "custom_colors" do
     it "uses the custom success color" do
       RSpec.configure do |config|
-        config.color_enabled = true
+        config.color = true
         config.tty = true
         config.success_color = :cyan
       end
@@ -456,6 +456,10 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
   end
 
   describe "#colorize" do
+    before do
+      allow(RSpec.configuration).to receive(:color_enabled?) { true }
+    end
+
     it "accepts a VT100 integer code and formats the text with it" do
        expect(formatter.colorize('abc', 32)).to eq "\e[32mabc\e[0m"
     end
@@ -469,8 +473,25 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
     end
   end
 
-  described_class::VT100_COLORS.each do |name, number|
-    next if name == :black
+  describe "#const_missing name" do
+
+    it "warns of deprecation for VT100_COLORS" do
+      expect_deprecation_with_call_site __FILE__, __LINE__ + 1
+      expect(described_class::VT100_COLORS).to eq RSpec::Core::Formatters::ConsoleCodes::VT100_CODES
+    end
+
+    it "warns of deprecation for VT100_COLOR_CODES" do
+      expect_deprecation_with_call_site __FILE__, __LINE__ + 1
+      expect(described_class::VT100_COLOR_CODES).to eq RSpec::Core::Formatters::ConsoleCodes::VT100_CODES.to_set
+    end
+
+    it "behaves normally for other constants" do
+      expect { described_class::NoSuchConst }.to raise_error(NameError)
+    end
+  end
+
+  RSpec::Core::Formatters::ConsoleCodes::VT100_CODES.each do |name, number|
+    next if name == :black || name == :bold
 
     describe "##{name}" do
       before do
@@ -490,5 +511,4 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
       end
     end
   end
-
 end

data/spec/rspec/core/formatters/console_codes_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+require 'rspec/core/formatters/console_codes'
+
+RSpec.describe "RSpec::Core::Formatters::ConsoleCodes" do
+  let(:console_codes) { RSpec::Core::Formatters::ConsoleCodes }
+
+  describe "#console_code_for(code_or_symbol)" do
+    context "when given a VT100 integer code" do
+      it "returns the code" do
+         expect(console_codes.console_code_for(32)).to eq 32
+      end
+    end
+
+    context "when given a symbolic name" do
+      it "returns the code" do
+         expect(console_codes.console_code_for(:green)).to eq 32
+      end
+    end
+
+    context "when given a nonexistant code" do
+      it "returns the code for white" do
+         expect(console_codes.console_code_for(:octarine)).to eq 37
+      end
+    end
+  end
+
+  describe "#wrap" do
+    before do
+      allow(RSpec.configuration).to receive(:color_enabled?) { true }
+    end
+
+    context "when given a VT100 integer code" do
+      it "formats the text with it" do
+         expect(console_codes.wrap('abc', 32)).to eq "\e[32mabc\e[0m"
+      end
+    end
+
+    context "when given a symbolic color name" do
+      it "translates it to the correct integer code and formats the text with it" do
+         expect(console_codes.wrap('abc', :green)).to eq "\e[32mabc\e[0m"
+      end
+    end
+
+    context "when given :bold" do
+      it "formats the text as bold" do
+         expect(console_codes.wrap('abc', :bold)).to eq "\e[1mabc\e[0m"
+      end
+    end
+  end
+end

data/spec/rspec/core/formatters/deprecation_formatter_spec.rb

@@ -39,6 +39,23 @@ module RSpec::Core::Formatters
           expect(deprecation_stream.read).to eq "this message\n"
         end
 
+        it "surrounds multiline messages in fenceposts" do
+          multiline_message = <<-EOS.gsub(/^\s+\|/, '')
+            |line one
+            |line two
+          EOS
+          formatter.deprecation(:message => multiline_message)
+          deprecation_stream.rewind
+
+          expected = <<-EOS.gsub(/^\s+\|/, '')
+            |--------------------------------------------------------------------------------
+            |line one
+            |line two
+            |--------------------------------------------------------------------------------
+          EOS
+          expect(deprecation_stream.read).to eq expected
+        end
+
         it "includes the method" do
           formatter.deprecation(:deprecated => "i_am_deprecated")
           deprecation_stream.rewind
@@ -162,7 +179,7 @@ module RSpec::Core::Formatters
             |i_am_deprecated is deprecated. Called from foo.rb:1.
             |i_am_deprecated is deprecated. Called from foo.rb:2.
             |i_am_deprecated is deprecated. Called from foo.rb:3.
-            |Too many uses of deprecated 'i_am_deprecated'. Set config.deprecation_stream to a File for full output.
+            |Too many uses of deprecated 'i_am_deprecated'. #{DeprecationFormatter::DEPRECATION_STREAM_NOTICE}
             |
             |#{DeprecationFormatter::RAISE_ERROR_CONFIG_NOTICE}
           EOS
@@ -186,7 +203,7 @@ module RSpec::Core::Formatters
             |i_am_deprecated 0 is deprecated. Called from foo.rb:1.
             |i_am_deprecated 1 is deprecated. Called from foo.rb:2.
             |i_am_deprecated 2 is deprecated. Called from foo.rb:3.
-            |Too many uses of deprecated 'i_am_deprecated'. Set config.deprecation_stream to a File for full output.
+            |Too many uses of deprecated 'i_am_deprecated'. #{DeprecationFormatter::DEPRECATION_STREAM_NOTICE}
             |
             |#{DeprecationFormatter::RAISE_ERROR_CONFIG_NOTICE}
           EOS
@@ -207,7 +224,7 @@ module RSpec::Core::Formatters
             |This is a long string with some callsite info: /path/0/to/some/file.rb:203.  And some more stuff can come after.
             |This is a long string with some callsite info: /path/1/to/some/file.rb:213.  And some more stuff can come after.
             |This is a long string with some callsite info: /path/2/to/some/file.rb:223.  And some more stuff can come after.
-            |Too many similar deprecation messages reported, disregarding further reports. Set config.deprecation_stream to a File for full output.
+            |Too many similar deprecation messages reported, disregarding further reports. #{DeprecationFormatter::DEPRECATION_STREAM_NOTICE}
             |
             |#{DeprecationFormatter::RAISE_ERROR_CONFIG_NOTICE}
           EOS

data/spec/rspec/core/formatters/documentation_formatter_spec.rb

@@ -3,6 +3,7 @@ require 'rspec/core/formatters/documentation_formatter'
 
 module RSpec::Core::Formatters
   describe DocumentationFormatter do
+
     it "numbers the failures" do
 
       examples = [

data/spec/rspec/core/formatters/html_formatted.html

@@ -387,12 +387,11 @@ expected: 2
     </dd>
   </dl>
 </div>
+
+2 deprecation warnings total
 <script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>n.nnnn seconds</strong>";</script>
 <script type="text/javascript">document.getElementById('totals').innerHTML = "7 examples, 4 failures, 2 pending";</script>
 </div>
 </div>
 </body>
-</html><html><p>
-
-2 deprecation warnings total
-</p></html>
+</html>

data/spec/rspec/core/formatters/html_formatter_spec.rb

@@ -6,7 +6,7 @@ require 'nokogiri'
 module RSpec
   module Core
     module Formatters
-      describe HtmlFormatter, :if => RUBY_VERSION =~ /^(1.8.7|1.9.2|1.9.3|2.0.0)$/ do
+      describe HtmlFormatter do
 
         let(:root) { File.expand_path("#{File.dirname(__FILE__)}/../../../..") }
         let(:expected_file) do
@@ -23,9 +23,15 @@ module RSpec
           err.set_encoding("utf-8") if err.respond_to?(:set_encoding)
           out.set_encoding("utf-8") if out.respond_to?(:set_encoding)
 
-          command_line = RSpec::Core::CommandLine.new(options)
-          command_line.instance_variable_get("@configuration").backtrace_cleaner.inclusion_patterns = []
-          command_line.run(err, out)
+          runner = RSpec::Core::Runner.new(options)
+          configuration = runner.instance_variable_get(:@configuration)
+
+          configuration.backtrace_formatter.inclusion_patterns = []
+          configuration.output_stream = out
+          configuration.deprecation_stream = err
+
+          runner.run(err, out)
+
           html = out.string.gsub(/\d+\.\d+(s| seconds)/, "n.nnnn\\1")
 
           actual_doc = Nokogiri::HTML(html)

data/spec/rspec/core/formatters/text_mate_formatted.html

@@ -387,12 +387,11 @@ expected: 2
     </dd>
   </dl>
 </div>
+
+2 deprecation warnings total
 <script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>n.nnnn seconds</strong>";</script>
 <script type="text/javascript">document.getElementById('totals').innerHTML = "7 examples, 4 failures, 2 pending";</script>
 </div>
 </div>
 </body>
-</html><html><p>
-
-2 deprecation warnings total
-</p></html>
+</html>

data/spec/rspec/core/formatters/text_mate_formatter_spec.rb

@@ -14,6 +14,7 @@ module RSpec
         end
 
         let(:generated_html) do
+          allow(RSpec).to receive(:deprecate)
           options = RSpec::Core::ConfigurationOptions.new(
             %w[spec/rspec/core/resources/formatter_specs.rb --format textmate --order defined]
           )
@@ -23,9 +24,14 @@ module RSpec
           err.set_encoding("utf-8") if err.respond_to?(:set_encoding)
           out.set_encoding("utf-8") if out.respond_to?(:set_encoding)
 
-          command_line = RSpec::Core::CommandLine.new(options)
-          command_line.instance_variable_get("@configuration").backtrace_cleaner.inclusion_patterns = []
-          command_line.run(err, out)
+          runner = RSpec::Core::Runner.new(options)
+          configuration = runner.instance_variable_get(:@configuration)
+
+          configuration.backtrace_formatter.inclusion_patterns = []
+          configuration.output_stream = out
+          configuration.deprecation_stream = err
+
+          runner.run(err, out)
           html = out.string.gsub(/\d+\.\d+(s| seconds)/, "n.nnnn\\1")
 
           actual_doc = Nokogiri::HTML(html)

data/spec/rspec/core/hooks_filtering_spec.rb

@@ -35,7 +35,7 @@ module RSpec::Core
             c.before(:match => true) { filters << "before each in config"}
             c.after(:match => true)  { filters << "after each in config"}
           end
-          group = ExampleGroup.describe(:match => true)
+          group = ExampleGroup.describe("group", :match => true)
           group.example("example") {}
           group.run
           expect(filters).to eq([
@@ -55,7 +55,7 @@ module RSpec::Core
           c.after(:each,  :match => true) { filters << "after each in config"}
           c.after(:all,   :match => true) { filters << "after all in config"}
         end
-        group = ExampleGroup.describe(:match => true)
+        group = ExampleGroup.describe("group", :match => true)
         group.example("example") {}
         group.run
         expect(filters).to eq([
@@ -125,7 +125,7 @@ module RSpec::Core
           c.after(:each,  :match => false) { filters << "after each in config"}
           c.after(:all,   :match => false) { filters << "after all in config"}
         end
-        group = ExampleGroup.describe(:match => true)
+        group = ExampleGroup.describe("group", :match => true)
         group.example("example") {}
         group.run
         expect(filters).to eq([])
@@ -196,7 +196,7 @@ module RSpec::Core
           c.after(:each,  :one => 1, :two => 2, :three => 3) { filters << "after each in config"}
           c.after(:all,   :one => 1, :three => 3)            { filters << "after all in config"}
         end
-        group = ExampleGroup.describe(:one => 1, :two => 2, :three => 3)
+        group = ExampleGroup.describe("group", :one => 1, :two => 2, :three => 3)
         group.example("example") {}
         group.run
         expect(filters).to eq([
@@ -217,7 +217,7 @@ module RSpec::Core
           c.after(:each,  :one => 1, :two => 2, :three => 3, :four => 4) { filters << "after each in config"}
           c.after(:all,   :one => 1, :three => 3, :four => 4)            { filters << "after all in config"}
         end
-        group = ExampleGroup.describe(:one => 1, :two => 2, :three => 3)
+        group = ExampleGroup.describe("group", :one => 1, :two => 2, :three => 3)
         group.example("example") {}
         group.run
         expect(filters).to eq([])

data/spec/rspec/core/memoized_helpers_spec.rb

@@ -37,6 +37,44 @@ module RSpec::Core
         end
       end
 
+      describe "with a symbol" do
+        it "returns the string form and issues a deprecation warning" do
+          the_subject = :unset
+          deprecations = []
+          allow(RSpec).to receive(:warn_deprecation) { |msg| deprecations << msg }
+
+          line = __LINE__ + 1
+          ExampleGroup.describe :symbol do
+            example { the_subject = subject }
+          end.run
+
+          expect(the_subject).to eq("symbol")
+          expect(deprecations.size).to eq(1)
+          deprecation = deprecations.first
+          expect(deprecation).to match(/describe <a Symbol>/)
+          expect(deprecation).to include("#{__FILE__}:#{line}")
+        end
+      end
+
+      describe "with a hash" do
+        it "returns a blank string and issues a deprecation warning" do
+          the_subject = :unset
+          deprecations = []
+          allow(RSpec).to receive(:warn_deprecation) { |msg| deprecations << msg }
+
+          line = __LINE__ + 1
+          ExampleGroup.describe :foo => 3 do
+            example { the_subject = subject }
+          end.run
+
+          expect(the_subject).to eq("")
+          expect(deprecations.size).to eq(1)
+          deprecation = deprecations.first
+          expect(deprecation).to match(/describe <a Hash>/)
+          expect(deprecation).to include("#{__FILE__}:#{line}")
+        end
+      end
+
       it "can be overriden and super'd to from a nested group" do
         outer_subject_value = inner_subject_value = nil
 

data/spec/rspec/core/metadata_spec.rb

@@ -115,6 +115,29 @@ 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
@@ -261,7 +284,7 @@ module RSpec
       end
 
       [:described_class, :describes].each do |key|
-        describe key do
+        describe key.inspect do
           context "with a String" do
             it "returns nil" do
               m = Metadata.new

data/spec/rspec/core/option_parser_spec.rb

@@ -27,7 +27,7 @@ module RSpec::Core
 
     describe "--formatter" do
       it "is deprecated" do
-        RSpec.should_receive(:deprecate)
+        expect_deprecation_with_no_call_site(%r{`--formatter`})
         Parser.parse!(%w[--formatter doc])
       end
 
@@ -38,6 +38,11 @@ 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"
@@ -45,13 +50,17 @@ 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])
@@ -65,6 +74,11 @@ 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
 
@@ -77,6 +91,29 @@ 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']) }