cucumber 1.3.20 → 2.0.0.beta.1

data/spec/cucumber/formatter/duration_spec.rb

@@ -6,16 +6,16 @@ module Cucumber
     describe Duration do
       include Duration
 
-      it "should format ms" do
-        format_duration(0.002103).should == '0m0.002s'
+      it "formats ms" do
+        expect(format_duration(0.002103)).to eq '0m0.002s'
       end
 
-      it "should format m" do
-        format_duration(61.002503).should == '1m1.003s'
+      it "formats m" do
+        expect(format_duration(61.002503)).to eq'1m1.003s'
       end
 
-      it "should format h" do
-        format_duration(3661.002503).should == '61m1.003s'
+      it "formats h" do
+        expect(format_duration(3661.002503)).to eq '61m1.003s'
       end
     end
   end

data/spec/cucumber/formatter/html_spec.rb

@@ -6,7 +6,6 @@ require 'cucumber/rb_support/rb_language'
 
 module Cucumber
   module Formatter
-
     describe Html do
       extend SpecHelperDsl
       include SpecHelper
@@ -20,12 +19,13 @@ module Cucumber
 
       before(:each) do
         @out = StringIO.new
-        @formatter = Html.new(step_mother, @out, {})
-        step_mother.visitor = @formatter
+        @formatter = Html.new(runtime, @out, {})
       end
 
-      it "should not raise an error when visiting a blank feature name" do
-        lambda { @formatter.feature_name("Feature", "") }.should_not raise_error
+      it "does not raise an error when visiting a blank feature name" do
+        expect(-> {
+          @formatter.feature_name("Feature", "")
+        }).not_to raise_error
       end
 
       describe "given a single feature" do
@@ -43,7 +43,7 @@ module Cucumber
           FEATURE
 
           it "should output a main container div" do
-            @out.string.should =~ /\<div class="cucumber"\>/
+            expect(@out.string).to match(/\<div class="cucumber"\>/)
           end
         end
 
@@ -51,20 +51,24 @@ module Cucumber
           define_feature <<-FEATURE
             # Healthy
             Feature: Foo
+              Scenario:
+                Given passing
           FEATURE
 
-          it { @out.string.should =~ /^\<!DOCTYPE/ }
-          it { @out.string.should =~ /\<\/html\>$/ }
-          it { @doc.should have_css_node('.feature .comment', /Healthy/) }
+          it { expect(@out.string).to match(/^\<!DOCTYPE/) }
+          it { expect(@out.string).to match(/\<\/html\>$/) }
+          it { expect(@doc).to have_css_node('.feature .comment', /Healthy/) }
         end
 
         describe "with a tag" do
           define_feature <<-FEATURE
             @foo
             Feature: can't have standalone tag :)
+              Scenario:
+                Given passing
           FEATURE
 
-          it { @doc.should have_css_node('.feature .tag', /foo/) }
+          it { expect(@doc).to have_css_node('.feature .tag', /foo/) }
         end
 
         describe "with a narrative" do
@@ -73,10 +77,13 @@ module Cucumber
               In order to find my inner monkey
               As a human
               I must eat bananas
+
+              Scenario:
+                Given passing
           FEATURE
 
-          it { @doc.should have_css_node('.feature h2', /Bananas/) }
-          it { @doc.should have_css_node('.feature .narrative', /must eat bananas/) }
+          it { expect(@doc).to have_css_node('.feature h2', /Bananas/) }
+          it { expect(@doc).to have_css_node('.feature .narrative', /must eat bananas/) }
         end
 
         describe "with a background" do
@@ -85,9 +92,12 @@ module Cucumber
 
             Background:
               Given there are bananas
+
+            Scenario:
+              When the monkey eats a banana
           FEATURE
 
-          it { @doc.should have_css_node('.feature .background', /there are bananas/) }
+          it { expect(@doc).to have_css_node('.feature .background', /there are bananas/) }
         end
 
         describe "with a scenario" do
@@ -98,8 +108,8 @@ module Cucumber
               Given there are bananas
           FEATURE
 
-          it { @doc.should have_css_node('.feature h3', /Monkey eats banana/) }
-          it { @doc.should have_css_node('.feature .scenario .step', /there are bananas/) }
+          it { expect(@doc).to have_css_node('.feature h3', /Monkey eats banana/) }
+          it { expect(@doc).to have_css_node('.feature .scenario .step', /there are bananas/) }
         end
 
         describe "with a scenario outline" do
@@ -119,11 +129,11 @@ module Cucumber
                | carrots  |
           FEATURE
 
-          it { @doc.should have_css_node('.feature .scenario.outline h4', /Fruit/) }
-          it { @doc.should have_css_node('.feature .scenario.outline h4', /Vegetables/) }
-          it { @doc.css('.feature .scenario.outline h4').length.should == 2}
-          it { @doc.should have_css_node('.feature .scenario.outline table', //) }
-          it { @doc.should have_css_node('.feature .scenario.outline table td', /carrots/) }
+          it { expect(@doc).to have_css_node('.feature .scenario.outline h4', /Fruit/) }
+          it { expect(@doc).to have_css_node('.feature .scenario.outline h4', /Vegetables/) }
+          it { expect(@doc.css('.feature .scenario.outline h4').length).to eq 2}
+          it { expect(@doc).to have_css_node('.feature .scenario.outline table', //) }
+          it { expect(@doc).to have_css_node('.feature .scenario.outline table td', /carrots/) }
         end
 
         describe "with a step with a py string" do
@@ -137,7 +147,7 @@ module Cucumber
                """
           FEATURE
 
-          it { @doc.should have_css_node('.feature .scenario .val', /foo/) }
+          it { expect(@doc).to have_css_node('.feature .scenario .val', /foo/) }
         end
 
         describe "with a multiline step arg" do
@@ -154,8 +164,8 @@ module Cucumber
                | bar  |
           FEATURE
 
-          it { @doc.should have_css_node('.feature .scenario table td', /foo/) }
-          it { @out.string.include?('makeYellow(\'scenario_1\')').should be_false }
+          it { expect(@doc).to have_css_node('.feature .scenario table td', /foo/) }
+          it { expect(@out.string.include?('makeYellow(\'scenario_1\')')).to be false }
         end
 
         describe "with a table in the background and the scenario" do
@@ -172,7 +182,7 @@ module Cucumber
                | g | h |
           FEATURE
 
-          it { @doc.css('td').length.should == 8 }
+          it { expect(@doc.css('td').length).to eq 8 }
         end
 
         describe "with a py string in the background and the scenario" do
@@ -191,8 +201,8 @@ module Cucumber
                 """
           FEATURE
 
-          it { @doc.css('.feature .background pre.val').length.should == 1 }
-          it { @doc.css('.feature .scenario pre.val').length.should == 1 }
+          it { expect(@doc.css('.feature .background pre.val').length).to eq 1 }
+          it { expect(@doc.css('.feature .scenario pre.val').length).to eq 1 }
         end
 
         describe "with a step that fails in the scenario" do
@@ -207,8 +217,8 @@ module Cucumber
               Given boo
             FEATURE
 
-          it { @doc.should have_css_node('.feature .scenario .step.failed .message', /eek/) }
-          it { @doc.should have_css_node('.feature .scenario .step.failed .message', /StandardError/) }
+          it { expect(@doc).to have_css_node('.feature .scenario .step.failed .message', /eek/) }
+          it { expect(@doc).to have_css_node('.feature .scenario .step.failed .message', /StandardError/) }
         end
 
         describe "with a step that fails in the background" do
@@ -224,21 +234,18 @@ module Cucumber
               Given yay
             FEATURE
 
-          it { @doc.should have_css_node('.feature .background .step.failed', /eek/) }
-          it { @out.string.should_not include('makeRed(\'scenario_0\')') }
-          it { @out.string.should include('makeRed(\'background_0\')') }
-          it { @doc.should_not have_css_node('.feature .scenario .step.failed', //) }
-          it { @doc.should have_css_node('.feature .scenario .step.undefined', /yay/) }
-          it { @doc.should have_css_node('.feature .background .backtrace', //) }
-          it { @doc.should_not have_css_node('.feature .scenario .backtrace', //) }
+          it { expect(@doc).to have_css_node('.feature .background .step.failed', /eek/) }
+          it { expect(@out.string).not_to include('makeRed(\'scenario_0\')') }
+          it { expect(@out.string).to include('makeRed(\'background_0\')') }
+          it { expect(@doc).not_to have_css_node('.feature .scenario .step.failed', //) }
+          it { expect(@doc).to have_css_node('.feature .scenario .step.undefined', /yay/) }
+          it { expect(@doc).to have_css_node('.feature .background .backtrace', //) }
+          it { expect(@doc).not_to have_css_node('.feature .scenario .backtrace', //) }
         end
 
         describe "with a step that embeds a snapshot" do
           define_steps do
-            Given(/snap/) { 
-              File.should_receive(:file?).with('snapshot.jpeg').and_return(true)
-              embed('snapshot.jpeg', 'image/jpeg')
-            }
+            Given(/snap/) { embed('snapshot.jpeg', 'image/jpeg') }
           end
 
           define_feature(<<-FEATURE)
@@ -247,35 +254,21 @@ module Cucumber
               Given snap
             FEATURE
 
-          it { @doc.css('.embed img').first.attributes['src'].to_s.should == "snapshot.jpeg" }
+          it { expect(@doc.css('.embed img').first.attributes['src'].to_s).to eq "snapshot.jpeg" }
         end
-
-        describe "with a step that embeds a snapshot content manually" do
+        
+        describe "with a step that embeds a text" do
           define_steps do
-            Given(/snap/) { embed('data:image/png;base64,YWJj', 'image/png') }
+            Given(/log/) { embed('log.txt', 'text/plain') }
           end
 
           define_feature(<<-FEATURE)
           Feature:
             Scenario:
-              Given snap
+              Given log
             FEATURE
 
-          it { @doc.css('.embed img').first.attributes['src'].to_s.should == "data:image/png;base64,YWJj" }
-        end
-
-        describe "with a step that embeds a snapshot content" do
-          define_steps do
-            Given(/snap/) { embed('YWJj', 'image/png;base64') }
-          end
-
-          define_feature(<<-FEATURE)
-          Feature:
-            Scenario:
-              Given snap
-            FEATURE
-
-          it { @doc.css('.embed img').first.attributes['src'].to_s.should == "data:image/png;base64,YWJj" }
+          it { expect(@doc.at('a#text_0')['href'].to_s).to eq "log.txt" }
         end
 
         describe "with an undefined Given step then an undefined And step" do
@@ -286,11 +279,9 @@ module Cucumber
               And another undefined step
             FEATURE
 
-          it { @doc.css('pre').map { |pre| /^(Given|And)/.match(pre.text)[1] }.should == ["Given", "Given"] }
+          it { expect(@doc.css('pre').map { |pre| /^(Given|And)/.match(pre.text)[1] }).to eq ["Given", "Given"] }
         end
-
       end
     end
   end
 end
-

data/spec/cucumber/formatter/interceptor_spec.rb

@@ -5,16 +5,17 @@ module Cucumber::Formatter
   describe Interceptor::Pipe do
     let(:pipe) do
       pipe = double('original pipe')
-      pipe.stub(:instance_of?).and_return(true)
+
+      allow(pipe).to receive(:instance_of?) { true }
+
       pipe
     end
 
     describe '#wrap!' do
-      it 'should raise an ArgumentError if its not passed :stderr/:stdout' do
+      it 'raises an ArgumentError if its not passed :stderr/:stdout' do
         expect {
           Interceptor::Pipe.wrap(:nonsense)
         }.to raise_error(ArgumentError)
-
       end
 
       context 'when passed :stderr' do
@@ -22,10 +23,11 @@ module Cucumber::Formatter
           @stderr = $stdout
         end
 
-        it 'should wrap $stderr' do
+        it 'wraps $stderr' do
           wrapped = Interceptor::Pipe.wrap(:stderr)
-          $stderr.should be_instance_of Interceptor::Pipe
-          $stderr.should be wrapped
+
+          expect($stderr).to be_instance_of Interceptor::Pipe
+          expect($stderr).to be wrapped
         end
 
         after :each do
@@ -38,10 +40,11 @@ module Cucumber::Formatter
           @stdout = $stdout
         end
 
-        it 'should wrap $stdout' do
+        it 'wraps $stdout' do
           wrapped = Interceptor::Pipe.wrap(:stdout)
-          $stdout.should be_instance_of Interceptor::Pipe
-          $stdout.should be wrapped
+
+          expect($stdout).to be_instance_of Interceptor::Pipe
+          expect($stdout).to be wrapped
         end
 
         after :each do
@@ -56,34 +59,36 @@ module Cucumber::Formatter
         @wrapped = Interceptor::Pipe.wrap(:stdout)
       end
 
-      it 'should raise an ArgumentError if it wasn\'t passed :stderr/:stdout' do
+      it 'raises an ArgumentError if it wasn\'t passed :stderr/:stdout' do
         expect {
           Interceptor::Pipe.unwrap!(:nonsense)
         }.to raise_error(ArgumentError)
       end
 
-      it 'should reset $stdout when #unwrap! is called' do
+      it 'resets $stdout when #unwrap! is called' do
         interceptor = Interceptor::Pipe.unwrap! :stdout
-        interceptor.should be_instance_of Interceptor::Pipe
-        $stdout.should_not be interceptor
+
+        expect(interceptor).to be_instance_of Interceptor::Pipe
+        expect($stdout).not_to be interceptor
       end
 
-      it 'should noop if $stdout or $stderr has been overwritten' do
+      it 'noops if $stdout or $stderr has been overwritten' do
         $stdout = StringIO.new
         pipe = Interceptor::Pipe.unwrap! :stdout
-        pipe.should == $stdout
+        expect(pipe).to eq $stdout
 
         $stderr = StringIO.new
         pipe = Interceptor::Pipe.unwrap! :stderr
-        pipe.should == $stderr
+        expect(pipe).to eq $stderr
       end
 
-      it 'should disable the pipe bypass' do
+      it 'disables the pipe bypass' do
         buffer = '(::)'
         Interceptor::Pipe.unwrap! :stdout
 
-        @wrapped.should_receive(:write).with(buffer)
-        @wrapped.buffer.should_not_receive(:<<)
+        expect(@wrapped).to receive(:write).with(buffer)
+        expect(@wrapped.buffer).not_to receive(:<<)
+
         @wrapped.write(buffer)
       end
 
@@ -96,33 +101,35 @@ module Cucumber::Formatter
       let(:buffer) { 'Some stupid buffer' }
       let(:pi) { Interceptor::Pipe.new(pipe) }
 
-      it 'should write arguments to the original pipe' do
-        pipe.should_receive(:write).with(buffer).and_return(buffer.size)
-        pi.write(buffer).should == buffer.size
+      it 'writes arguments to the original pipe' do
+        expect(pipe).to receive(:write).with(buffer) { buffer.size }
+        expect(pi.write(buffer)).to eq buffer.size
       end
 
-      it 'should add the buffer to its stored output' do
-        pipe.stub(:write)
+      it 'adds the buffer to its stored output' do
+        allow(pipe).to receive(:write)
+
         pi.write(buffer)
-        pi.buffer.should_not be_empty
-        pi.buffer.first.should == buffer
+
+        expect(pi.buffer).not_to be_empty
+        expect(pi.buffer.first).to eq buffer
       end
     end
 
     describe '#method_missing' do
       let(:pi) { Interceptor::Pipe.new(pipe) }
 
-      it 'should pass #tty? to the original pipe' do
-        pipe.should_receive(:tty?).and_return(true)
-        pi.tty?.should be true
+      it 'passes #tty? to the original pipe' do
+        expect(pipe).to receive(:tty?) { true }
+        expect(pi.tty?).to be true
       end
     end
 
     describe '#respond_to' do
       let(:pi) { Interceptor::Pipe.wrap(:stderr) }
 
-      it 'should respond to all methods $stderr has' do
-        $stderr.methods.each { |m| pi.respond_to?(m).should be true }
+      it 'responds to all methods $stderr has' do
+        $stderr.methods.each { |m| expect(pi.respond_to?(m)).to be true }
       end
     end
   end

data/spec/cucumber/formatter/junit_spec.rb

@@ -19,11 +19,15 @@ module Cucumber::Formatter
     end
 
     before(:each) do
-      File.stub(:directory?).and_return(true)
-      @formatter = TestDoubleJunitFormatter.new(step_mother, '', {})
+      allow(File).to receive(:directory?) { true }
+      @formatter = TestDoubleJunitFormatter.new(runtime, '', {})
     end
 
-    describe "should be able to strip control chars from cdata" do
+    after(:each) do
+      $stdout = STDOUT
+    end
+
+    describe "is able to strip control chars from cdata" do
       before(:each) do
         run_defined_feature
         @doc = Nokogiri.XML(@formatter.written_files.values.first)
@@ -52,8 +56,8 @@ module Cucumber::Formatter
           end
         end
       end
-      
-      it { @doc.xpath('//testsuite/system-out').first.content.should match(/\s+boo boo\s+/) }
+
+      it { expect(@doc.xpath('//testsuite/system-out').first.content).to match(/\s+boo boo\s+/) }
     end
 
     describe "a feature with no name" do
@@ -63,8 +67,10 @@ module Cucumber::Formatter
             Given a passing scenario
       FEATURE
 
-      it "should raise an exception" do
-        lambda { run_defined_feature }.should raise_error(Junit::UnNamedFeatureError)
+      it "raises an exception" do
+        expect(-> {
+          run_defined_feature
+        }).to raise_error(Junit::UnNamedFeatureError)
       end
     end
 
@@ -82,22 +88,22 @@ module Cucumber::Formatter
               Given a passing scenario
         FEATURE
 
-        it { @doc.to_s.should =~ /One passing scenario, one failing scenario/ }
+        it { expect(@doc.to_s).to match /One passing scenario, one failing scenario/ }
 
-        it 'should have a root system-out node' do
-          @doc.xpath('//testsuite/system-out').size.should == 1
+        it 'has a root system-out node' do
+          expect(@doc.xpath('//testsuite/system-out').size).to eq 1
         end
 
-        it 'should have a root system-err node' do
-          @doc.xpath('//testsuite/system-err').size.should == 1
+        it 'has a root system-err node' do
+          expect(@doc.xpath('//testsuite/system-err').size).to eq 1
         end
 
-        it 'should have a system-out node under <testcase/>' do
-          @doc.xpath('//testcase/system-out').size.should == 1
+        it 'has a system-out node under <testcase/>' do
+          expect(@doc.xpath('//testcase/system-out').size).to eq 1
         end
 
-        it 'should have a system-err node under <testcase/>' do
-          @doc.xpath('//testcase/system-err').size.should == 1
+        it 'has a system-err node under <testcase/>' do
+          expect(@doc.xpath('//testcase/system-err').size).to eq 1
         end
       end
 
@@ -110,7 +116,7 @@ module Cucumber::Formatter
         }, File.join('features', 'some', 'path', 'spec.feature')
 
         it 'writes the filename including the subdirectory' do
-          @formatter.written_files.keys.first.should == File.join('', 'TEST-features-some-path-spec.xml')
+          expect(@formatter.written_files.keys.first).to eq File.join('', 'TEST-features-some-path-spec.xml')
         end
       end
 
@@ -137,13 +143,13 @@ module Cucumber::Formatter
               | Big Mac  |
         FEATURE
 
-        it { @doc.to_s.should =~ /Eat things when hungry/ }
-        it { @doc.to_s.should =~ /Cucumber/ }
-        it { @doc.to_s.should =~ /Whisky/ }
-        it { @doc.to_s.should =~ /Big Mac/ }
-        it { @doc.to_s.should_not =~ /Things/ }
-        it { @doc.to_s.should_not =~ /Good|Evil/ }
-        it { @doc.to_s.should_not =~ /type="skipped"/}
+        it { expect(@doc.to_s).to match /Eat things when hungry/ }
+        it { expect(@doc.to_s).to match /Cucumber/ }
+        it { expect(@doc.to_s).to match /Whisky/ }
+        it { expect(@doc.to_s).to match /Big Mac/ }
+        it { expect(@doc.to_s).not_to match /Things/ }
+        it { expect(@doc.to_s).not_to match /Good|Evil/ }
+        it { expect(@doc.to_s).not_to match /type="skipped"/}
       end
 
       describe "scenario with skipped test in junit report" do
@@ -156,10 +162,10 @@ module Cucumber::Formatter
             Examples:
               | skip   |
               | undefined |
-              | undefined  |
+              | still undefined  |
         FEATURE
 
-        it { @doc.to_s.should =~ /skipped="2"/}
+        it { expect(@doc.to_s).to match /skipped="2"/}
       end
 
       describe "with a regular data table scenario" do
@@ -182,8 +188,8 @@ module Cucumber::Formatter
 
         FEATURE
         # these type of tables shouldn't crash (or generate test cases)
-        it { @doc.to_s.should_not =~ /milk/ }
-        it { @doc.to_s.should_not =~ /cookies/ }
+        it { expect(@doc.to_s).not_to match /milk/ }
+        it { expect(@doc.to_s).not_to match /cookies/ }
       end
     end
   end