rspec-core 2.12.2 → 2.13.0

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

@@ -8,13 +8,13 @@ describe RSpec::Core::Formatters::BaseFormatter do
 
   describe "backtrace_line" do
     it "trims current working directory" do
-      formatter.__send__(:backtrace_line, File.expand_path(__FILE__)).should eq("./spec/rspec/core/formatters/base_formatter_spec.rb")
+      expect(formatter.__send__(:backtrace_line, File.expand_path(__FILE__))).to eq("./spec/rspec/core/formatters/base_formatter_spec.rb")
     end
 
     it "leaves the original line intact" do
       original_line = File.expand_path(__FILE__)
       formatter.__send__(:backtrace_line, original_line)
-      original_line.should eq(File.expand_path(__FILE__))
+      expect(original_line).to eq(File.expand_path(__FILE__))
     end
 
     it "deals gracefully with a security error" do
@@ -35,18 +35,18 @@ describe RSpec::Core::Formatters::BaseFormatter do
         "/some/line/of/ruby.rb:14"
       ])
       example = mock(:Example, :file_path => __FILE__)
-      lambda {
+      expect {
         formatter.send(:read_failed_line, exception, example)
-      }.should_not raise_error
+      }.not_to raise_error
     end
 
     it "deals gracefully with a security error" do
       exception = mock(:Exception, :backtrace => [ "#{__FILE__}:#{__LINE__}"])
       example = mock(:Example, :file_path => __FILE__)
       safely do
-        lambda {
+        expect {
           formatter.send(:read_failed_line, exception, example)
-        }.should_not raise_error
+        }.not_to raise_error
       end
     end
 
@@ -78,8 +78,8 @@ describe RSpec::Core::Formatters::BaseFormatter do
         exception = mock(:Exception, :backtrace => [ "#{__FILE__}:#{__LINE__}"])
 
         example = mock(:Example, :file_path => __FILE__)
-        formatter.send(:read_failed_line, exception, example).should
-          eql(%Q{        exception = mock(:Exception, :backtrace => [ "\#{__FILE__}:\#{__LINE__}"])\n})
+        expect(formatter.send(:read_failed_line, exception, example)).to eql(
+          %Q{        exception = mock(:Exception, :backtrace => [ "\#{__FILE__}:\#{__LINE__}"])\n})
       end
 
     end
@@ -101,7 +101,7 @@ describe RSpec::Core::Formatters::BaseFormatter do
     end
 
     it "removes lines from rspec and lines that come before the invocation of the at_exit autorun hook" do
-      formatter.format_backtrace(backtrace, stub.as_null_object).should eq(["./my_spec.rb:5"])
+      expect(formatter.format_backtrace(backtrace, stub.as_null_object)).to eq(["./my_spec.rb:5"])
     end
   end
 

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

@@ -7,15 +7,15 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
 
   describe "#summary_line" do
     it "with 0s outputs pluralized (excluding pending)" do
-      formatter.summary_line(0,0,0).should eq("0 examples, 0 failures")
+      expect(formatter.summary_line(0,0,0)).to eq("0 examples, 0 failures")
     end
 
     it "with 1s outputs singular (including pending)" do
-      formatter.summary_line(1,1,1).should eq("1 example, 1 failure, 1 pending")
+      expect(formatter.summary_line(1,1,1)).to eq("1 example, 1 failure, 1 pending")
     end
 
     it "with 2s outputs pluralized (including pending)" do
-      formatter.summary_line(2,2,2).should eq("2 examples, 2 failures, 2 pending")
+      expect(formatter.summary_line(2,2,2)).to eq("2 examples, 2 failures, 2 pending")
     end
   end
 
@@ -27,7 +27,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
       line = __LINE__ - 2
       group.run(formatter)
       formatter.dump_commands_to_rerun_failed_examples
-      output.string.should include("rspec #{RSpec::Core::Metadata::relative_path("#{__FILE__}:#{line}")} # example group fails")
+      expect(output.string).to include("rspec #{RSpec::Core::Metadata::relative_path("#{__FILE__}:#{line}")} # example group fails")
     end
   end
 
@@ -42,12 +42,12 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
     end
 
     it "preserves formatting" do
-      group.example("example name") { "this".should eq("that") }
+      group.example("example name") { expect("this").to eq("that") }
 
       run_all_and_dump_failures
 
-      output.string.should =~ /group name example name/m
-      output.string.should =~ /(\s+)expected: \"that\"\n\1     got: \"this\"/m
+      expect(output.string).to match /group name example name/m
+      expect(output.string).to match /(\s+)expected: \"that\"\n\1     got: \"this\"/m
     end
 
     context "with an exception without a message" do
@@ -61,7 +61,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
       it "preserves ancestry" do
         example = group.example("example name") { raise "something" }
         run_all_and_dump_failures
-        example.example_group.parent_groups.size.should == 1
+        expect(example.example_group.parent_groups.size).to eq 1
       end
     end
 
@@ -74,19 +74,28 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
       end
     end
 
+    context "with an instance of an anonymous exception class" do
+      it "substitutes '(anonymous error class)' for the missing class name" do
+        exception = Class.new(StandardError).new
+        group.example("example name") { raise exception }
+        run_all_and_dump_failures
+        expect(output.string).to include('(anonymous error class)')
+      end
+    end
+
     context "with an exception class other than RSpec" do
       it "does not show the error class" do
         group.example("example name") { raise NameError.new('foo') }
         run_all_and_dump_failures
-        output.string.should =~ /NameError/m
+        expect(output.string).to match /NameError/m
       end
     end
 
     context "with a failed expectation (rspec-expectations)" do
       it "does not show the error class" do
-        group.example("example name") { "this".should eq("that") }
+        group.example("example name") { expect("this").to eq("that") }
         run_all_and_dump_failures
-        output.string.should_not =~ /RSpec/m
+        expect(output.string).not_to match /RSpec/m
       end
     end
 
@@ -94,7 +103,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
       it "does not show the error class" do
         group.example("example name") { "this".should_receive("that") }
         run_all_and_dump_failures
-        output.string.should_not =~ /RSpec/m
+        expect(output.string).not_to match /RSpec/m
       end
     end
 
@@ -102,7 +111,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
       it 'outputs the name and location' do
 
         share_examples_for 'foo bar' do
-          it("example name") { "this".should eq("that") }
+          it("example name") { expect("this").to eq("that") }
         end
 
         line = __LINE__.next
@@ -110,7 +119,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
 
         run_all_and_dump_failures
 
-        output.string.should include(
+        expect(output.string).to include(
           'Shared Example Group: "foo bar" called from ' +
             "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
         )
@@ -120,7 +129,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
         it 'outputs the name and location' do
           share_examples_for 'foo bar' do
             describe 'nested group' do
-              it("example name") { "this".should eq("that") }
+              it("example name") { expect("this").to eq("that") }
             end
           end
 
@@ -129,7 +138,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
 
           run_all_and_dump_failures
 
-          output.string.should include(
+          expect(output.string).to include(
             'Shared Example Group: "foo bar" called from ' +
               "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
           )
@@ -143,7 +152,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
       it 'outputs the name and location' do
 
         share_as :FooBar do
-          it("example name") { "this".should eq("that") }
+          it("example name") { expect("this").to eq("that") }
         end
 
         line = __LINE__.next
@@ -151,7 +160,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
 
         run_all_and_dump_failures
 
-        output.string.should include(
+        expect(output.string).to include(
           'Shared Example Group: "FooBar" called from ' +
             "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
         )
@@ -163,7 +172,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
           share_as :NestedFoo do
             describe 'nested group' do
               describe 'hell' do
-                it("example name") { "this".should eq("that") }
+                it("example name") { expect("this").to eq("that") }
               end
             end
           end
@@ -173,7 +182,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
 
           run_all_and_dump_failures
 
-          output.string.should include(
+          expect(output.string).to include(
             'Shared Example Group: "NestedFoo" called from ' +
               "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
           )
@@ -196,12 +205,12 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
       before { RSpec.configuration.stub(:show_failures_in_pending_blocks?) { true } }
 
       it "preserves formatting" do
-        group.example("example name") { pending { "this".should eq("that") } }
+        group.example("example name") { pending { expect("this").to eq("that") } }
 
         run_all_and_dump_pending
 
-        output.string.should =~ /group name example name/m
-        output.string.should =~ /(\s+)expected: \"that\"\n\1     got: \"this\"/m
+        expect(output.string).to match /group name example name/m
+        expect(output.string).to match /(\s+)expected: \"that\"\n\1     got: \"this\"/m
       end
 
       context "with an exception without a message" do
@@ -217,15 +226,15 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
         it "does not show the error class" do
           group.example("example name") { pending { raise NameError.new('foo') } }
           run_all_and_dump_pending
-          output.string.should =~ /NameError/m
+          expect(output.string).to match /NameError/m
         end
       end
 
       context "with a failed expectation (rspec-expectations)" do
         it "does not show the error class" do
-          group.example("example name") { pending { "this".should eq("that") } }
+          group.example("example name") { pending { expect("this").to eq("that") } }
           run_all_and_dump_pending
-          output.string.should_not =~ /RSpec/m
+          expect(output.string).not_to match /RSpec/m
         end
       end
 
@@ -233,7 +242,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
         it "does not show the error class" do
           group.example("example name") { pending { "this".should_receive("that") } }
           run_all_and_dump_pending
-          output.string.should_not =~ /RSpec/m
+          expect(output.string).not_to match /RSpec/m
         end
       end
 
@@ -241,7 +250,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
         it 'outputs the name and location' do
 
           share_examples_for 'foo bar' do
-            it("example name") { pending { "this".should eq("that") } }
+            it("example name") { pending { expect("this").to eq("that") } }
           end
 
           line = __LINE__.next
@@ -249,7 +258,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
 
           run_all_and_dump_pending
 
-          output.string.should include(
+          expect(output.string).to include(
             'Shared Example Group: "foo bar" called from ' +
             "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
           )
@@ -259,7 +268,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
           it 'outputs the name and location' do
             share_examples_for 'foo bar' do
               describe 'nested group' do
-                it("example name") { pending { "this".should eq("that") } }
+                it("example name") { pending { expect("this").to eq("that") } }
               end
             end
 
@@ -268,7 +277,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
 
             run_all_and_dump_pending
 
-            output.string.should include(
+            expect(output.string).to include(
               'Shared Example Group: "foo bar" called from ' +
               "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
             )
@@ -282,7 +291,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
         it 'outputs the name and location' do
 
           share_as :FooBar2 do
-            it("example name") { pending { "this".should eq("that") } }
+            it("example name") { pending { expect("this").to eq("that") } }
           end
 
           line = __LINE__.next
@@ -290,7 +299,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
 
           run_all_and_dump_pending
 
-          output.string.should include(
+          expect(output.string).to include(
             'Shared Example Group: "FooBar2" called from ' +
             "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
           )
@@ -302,7 +311,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
             share_as :NestedFoo2 do
               describe 'nested group' do
                 describe 'hell' do
-                  it("example name") { pending { "this".should eq("that") } }
+                  it("example name") { pending { expect("this").to eq("that") } }
                 end
               end
             end
@@ -312,7 +321,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
 
             run_all_and_dump_pending
 
-            output.string.should include(
+            expect(output.string).to include(
               'Shared Example Group: "NestedFoo2" called from ' +
               "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
             )
@@ -325,43 +334,96 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
       before { RSpec.configuration.stub(:show_failures_in_pending_blocks?) { false } }
 
       it "does not output the failure information" do
-        group.example("example name") { pending { "this".should eq("that") } }
+        group.example("example name") { pending { expect("this").to eq("that") } }
         run_all_and_dump_pending
-        output.string.should_not =~ /(\s+)expected: \"that\"\n\1     got: \"this\"/m
+        expect(output.string).not_to match /(\s+)expected: \"that\"\n\1     got: \"this\"/m
       end
     end
   end
 
   describe "#dump_profile" do
+    example_line_number = nil
+
     before do
       group = RSpec::Core::ExampleGroup.describe("group") do
-        example("example") { sleep 0.1 }
+        # Use a sleep so there is some measurable time, to ensure
+        # the reported percent is 100%, not 0%.
+        example("example") { sleep 0.001 }
+        example_line_number = __LINE__ - 1
       end
       group.run(double('reporter').as_null_object)
 
       formatter.stub(:examples) { group.examples }
+      RSpec.configuration.stub(:profile_examples) { 10 }
     end
 
     it "names the example" do
       formatter.dump_profile
-      output.string.should =~ /group example/m
+      expect(output.string).to match /group example/m
     end
 
     it "prints the time" do
       formatter.dump_profile
-      output.string.should =~ /0(\.\d+)? seconds/
+      expect(output.string).to match /0(\.\d+)? seconds/
     end
 
     it "prints the path" do
       formatter.dump_profile
       filename = __FILE__.split(File::SEPARATOR).last
 
-      output.string.should =~ /#{filename}\:#{__LINE__ - 21}/
+      expect(output.string).to match /#{filename}\:#{example_line_number}/
     end
 
     it "prints the percentage taken from the total runtime" do
       formatter.dump_profile
-      output.string.should =~ /, 100.0% of total time\):/
+      expect(output.string).to match /, 100.0% of total time\):/
+    end
+  end
+
+  describe "custom_colors" do
+    it "uses the custom success color" do
+      RSpec.configure do |config|
+        config.color_enabled = true
+        config.tty = true
+        config.success_color = :cyan
+      end
+      formatter.dump_summary(0,1,0,0)
+      expect(output.string).to include("\e[36m")
+    end
+  end
+
+  describe "#colorize" do
+    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
+
+    it "accepts a symbol as a color parameter and translates it to the correct integer code, then formats the text with it" do
+       expect(formatter.colorize('abc', :green)).to eq "\e[32mabc\e[0m"
+    end
+
+    it "accepts a non-default color symbol as a parameter and translates it to the correct integer code, then formats the text with it" do
+       expect(formatter.colorize('abc', :cyan)).to eq "\e[36mabc\e[0m"
     end
   end
+
+  described_class::VT100_COLORS.each do |name, number|
+    next if name == :black
+
+    describe "##{name}" do
+      before do
+        RSpec.configuration.stub(:color_enabled?) { true }
+        RSpec.stub(:warn)
+      end
+
+      it "prints the text using the color code for #{name}" do
+        expect(formatter.send(name, "text")).to eq("\e[#{number}mtext\e[0m")
+      end
+
+      it "prints a deprecation warning" do
+        RSpec.should_receive(:warn).with(/#{name}/)
+        formatter.send(name, "text")
+      end
+    end
+  end
+
 end

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

@@ -23,8 +23,8 @@ module RSpec::Core::Formatters
 
       examples.each {|e| formatter.example_failed(e) }
 
-      output.string.should =~ /first example \(FAILED - 1\)/m
-      output.string.should =~ /second example \(FAILED - 2\)/m
+      expect(output.string).to match /first example \(FAILED - 1\)/m
+      expect(output.string).to match /second example \(FAILED - 2\)/m
     end
 
     it "represents nested group using hierarchy tree" do
@@ -48,7 +48,7 @@ module RSpec::Core::Formatters
 
       group.run(RSpec::Core::Reporter.new(formatter))
 
-      output.string.should eql("
+      expect(output.string).to eql("
 root
   context 1
     nested example 1.1
@@ -76,7 +76,7 @@ root
 
       group.run(RSpec::Core::Reporter.new(formatter))
 
-      output.string.should eql("
+      expect(output.string).to eql("
 root
   nested
     example 1