rspec 0.9.4 → 1.0.0

data/spec/spec/dsl/configuration_spec.rb

@@ -12,7 +12,7 @@ module Spec
         @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rspec$/
       end
 
-      it "should let you set rspec explicitly" do
+      it "should let you set rspec mocking explicitly" do
         @config.mock_with(:rspec)
         @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rspec$/
       end
@@ -38,6 +38,13 @@ module Spec
         @config.include mod
         @config.included_modules.should include(mod)
       end
+      
+      [:prepend_before, :append_before, :prepend_after, :append_after].each do |m|
+        it "should delegate ##{m} to Behaviour class" do
+          Behaviour.should_receive(m).with(:whatever)
+          @config.__send__(m, :whatever)
+        end
+      end
     end
   end
 end

data/spec/spec/dsl/example_class_spec.rb

@@ -15,7 +15,7 @@ module Spec
       
       it "should report errors in example" do
         error = Exception.new
-        @reporter.should_receive(:example_finished).with("example", error, "example")
+        @reporter.should_receive(:example_finished).with("example", error, "example", false)
 
         run(@example_class.new("example") {raise(error)})
       end

data/spec/spec/dsl/example_instance_spec.rb

@@ -27,7 +27,7 @@ module Spec
 
       it "should report success" do
         example=Example.new("example") {}
-        @reporter.should_receive(:example_finished).with("example", nil, nil)
+        @reporter.should_receive(:example_finished).with("example", nil, nil, false)
         example.run(@reporter, nil, nil, nil, nil)
       end
 
@@ -35,7 +35,7 @@ module Spec
         example=Example.new("example") do
           (2+2).should == 5
         end
-        @reporter.should_receive(:example_finished).with("example", is_a(Spec::Expectations::ExpectationNotMetError), "example")
+        @reporter.should_receive(:example_finished).with("example", is_a(Spec::Expectations::ExpectationNotMetError), "example", false)
         example.run(@reporter, nil, nil, nil, nil)
       end
 
@@ -44,7 +44,7 @@ module Spec
         example=Example.new("example") do
           raise(error)
         end
-        @reporter.should_receive(:example_finished).with("example", error, "example")
+        @reporter.should_receive(:example_finished).with("example", error, "example", false)
         example.run(@reporter, nil, nil, nil, nil)
       end
 
@@ -54,7 +54,7 @@ module Spec
           self.instance_of?(Example).should == false
           self.instance_of?(scope_class).should == true
         end
-        @reporter.should_receive(:example_finished).with("should pass", nil, nil)
+        @reporter.should_receive(:example_finished).with("should pass", nil, nil, false)
         example.run(@reporter, nil, nil, nil, scope_class.new)
       end
 
@@ -148,7 +148,7 @@ module Spec
         example = Example.new(:__generate_description) {
           5.should == 5
         }
-        @reporter.should_receive(:example_finished).with("should == 5", :anything, :anything)
+        @reporter.should_receive(:example_finished).with("should == 5", :anything, :anything, false)
         example.run(@reporter, nil, nil, nil, Object.new)
       end
 

data/spec/spec/dsl/shared_behaviour_spec.rb

@@ -6,7 +6,7 @@ module Spec
       
       before do
         @formatter = Spec::Mocks::Mock.new("formatter", :null_object => true)
-        @behaviour = behaviour_class.new("context") {}
+        @behaviour = behaviour_class.new("behaviour") {}
       end
 
       after do
@@ -66,11 +66,17 @@ module Spec
         shared_behaviour.number_of_examples.should == 1
       end
 
-      it "should complain when adding a shared behaviour with the same description" do
+      it "should complain when adding a second shared behaviour with the same description" do
         make_shared_behaviour("shared behaviour", :shared => true) {}
         lambda { make_shared_behaviour("shared behaviour", :shared => true) {} }.should raise_error(ArgumentError)
       end
 
+      it "should NOT complain when adding a the same shared behaviour again (i.e. file gets reloaded)" do
+        behaviour = behaviour_class.new("shared behaviour", :shared => true) {}
+        behaviour_class.add_shared_behaviour(behaviour)
+        behaviour_class.add_shared_behaviour(behaviour)
+      end
+
       it "should add examples to current behaviour when calling it_should_behave_like" do
         shared_behaviour = make_shared_behaviour("shared behaviour", :shared => true) {}
         shared_behaviour.it("shared example") {}
@@ -166,6 +172,22 @@ module Spec
         mod1_method_called.should be_true
         mod2_method_called.should be_true
       end
+      
+      it "should make methods defined in the shared behaviour available in consuming behaviour" do
+        shared_behaviour = make_shared_behaviour("shared behaviour xyz", :shared => true) do
+          def a_shared_helper_method
+            "this got defined in a shared behaviour"
+          end
+        end
+        @behaviour.it_should_behave_like("shared behaviour xyz")
+        success = false
+        @behaviour.it("should access a_shared_helper_method") do
+          a_shared_helper_method
+          success = true
+        end
+        @behaviour.run(@formatter)
+        success.should be_true
+      end
 
       it "should error if told to inherit from a class" do
         shared_behaviour = make_shared_behaviour("shared behaviour", :shared => true) {}

data/spec/spec/matchers/be_spec.rb

@@ -179,6 +179,26 @@ describe "should be >" do
   end
 end
 
+describe "should be ==" do
+  it "should pass when == operator returns true" do
+    5.should be == 5
+  end
+
+  it "should fail when == operator returns false" do
+    lambda { 3.should be == 4 }.should fail_with("expected == 4, got 3")
+  end
+end
+
+describe "should be ===" do
+  it "should pass when === operator returns true" do
+    Hash.should be === Hash.new
+  end
+
+  it "should fail when === operator returns false" do
+    lambda { Hash.should be === "not a hash" }.should fail_with(%[expected === "not a hash", got Hash])
+  end
+end
+
 describe "should be(value)" do
   it "should pass if actual.equal?(value)" do
     5.should be(5)
@@ -187,5 +207,3 @@ describe "should be(value)" do
     lambda { 5.should be(6) }.should fail_with("expected 6, got 5")
   end
 end
-
-

data/spec/spec/matchers/operator_matcher_spec.rb

@@ -0,0 +1,158 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+require 'spec/expectations/differs/default'
+
+describe "should ==" do
+  
+  it "should delegate message to target" do
+    subject = "apple"
+    subject.should_receive(:==).with("apple").and_return(true)
+    subject.should == "apple"
+  end
+  
+  it "should fail when target.==(actual) returns false" do
+    subject = "apple"
+    Spec::Expectations.should_receive(:fail_with).with(%[expected "orange", got "apple" (using ==)], "orange", "apple")
+    subject.should == "orange"
+  end
+
+end
+
+describe "should_not ==" do
+  
+  it "should delegate message to target" do
+    subject = "orange"
+    subject.should_receive(:==).with("apple").and_return(false)
+    subject.should_not == "apple"
+  end
+  
+  it "should fail when target.==(actual) returns false" do
+    subject = "apple"
+    Spec::Expectations.should_receive(:fail_with).with(%[expected not == "apple", got "apple"], "apple", "apple")
+    subject.should_not == "apple"
+  end
+
+end
+
+describe "should ===" do
+  
+  it "should delegate message to target" do
+    subject = "apple"
+    subject.should_receive(:===).with("apple").and_return(true)
+    subject.should === "apple"
+  end
+  
+  it "should fail when target.===(actual) returns false" do
+    subject = "apple"
+    subject.should_receive(:===).with("orange").and_return(false)
+    Spec::Expectations.should_receive(:fail_with).with(%[expected "orange", got "apple" (using ===)], "orange", "apple")
+    subject.should === "orange"
+  end
+
+end
+
+describe "should_not ===" do
+  
+  it "should delegate message to target" do
+    subject = "orange"
+    subject.should_receive(:===).with("apple").and_return(false)
+    subject.should_not === "apple"
+  end
+  
+  it "should fail when target.===(actual) returns false" do
+    subject = "apple"
+    subject.should_receive(:===).with("apple").and_return(true)
+    Spec::Expectations.should_receive(:fail_with).with(%[expected not === "apple", got "apple"], "apple", "apple")
+    subject.should_not === "apple"
+  end
+
+end
+
+describe "should =~" do
+  
+  it "should delegate message to target" do
+    subject = "foo"
+    subject.should_receive(:=~).with(/oo/).and_return(true)
+    subject.should =~ /oo/
+  end
+  
+  it "should fail when target.=~(actual) returns false" do
+    subject = "fu"
+    subject.should_receive(:=~).with(/oo/).and_return(false)
+    Spec::Expectations.should_receive(:fail_with).with(%[expected =~ /oo/, got "fu"], /oo/, "fu")
+    subject.should =~ /oo/
+  end
+
+end
+
+describe "should_not =~" do
+  
+  it "should delegate message to target" do
+    subject = "fu"
+    subject.should_receive(:=~).with(/oo/).and_return(false)
+    subject.should_not =~ /oo/
+  end
+  
+  it "should fail when target.=~(actual) returns false" do
+    subject = "foo"
+    subject.should_receive(:=~).with(/oo/).and_return(true)
+    Spec::Expectations.should_receive(:fail_with).with(%[expected not =~ /oo/, got "foo"], /oo/, "foo")
+    subject.should_not =~ /oo/
+  end
+
+end
+
+describe "should >" do
+  
+  it "should pass if > passes" do
+    4.should > 3
+  end
+
+  it "should fail if > fails" do
+    Spec::Expectations.should_receive(:fail_with).with(%[expected > 5, got 4], 5, 4)
+    4.should > 5
+  end
+
+end
+
+describe "should >=" do
+  
+  it "should pass if >= passes" do
+    4.should > 3
+    4.should >= 4
+  end
+
+  it "should fail if > fails" do
+    Spec::Expectations.should_receive(:fail_with).with(%[expected >= 5, got 4], 5, 4)
+    4.should >= 5
+  end
+
+end
+
+describe "should <" do
+  
+  it "should pass if < passes" do
+    4.should < 5
+  end
+
+  it "should fail if > fails" do
+    Spec::Expectations.should_receive(:fail_with).with(%[expected < 3, got 4], 3, 4)
+    4.should < 3
+  end
+
+end
+
+describe "should <=" do
+  
+  it "should pass if <= passes" do
+    4.should <= 5
+    4.should <= 4
+  end
+
+  it "should fail if > fails" do
+    Spec::Expectations.should_receive(:fail_with).with(%[expected <= 3, got 4], 3, 4)
+    4.should <= 3
+  end
+
+end
+

data/spec/spec/runner/command_line_spec.rb

@@ -1,4 +1,5 @@
-require 'stringio'
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
 describe "CommandLine" do
   it "should run directory" do
     file = File.dirname(__FILE__) + '/../../../examples'
@@ -7,17 +8,17 @@ describe "CommandLine" do
     Spec::Runner::CommandLine.run([file], err, out, false, true)
     
     out.rewind
-    out.read.should =~ /74 examples, 0 failures/n
+    out.read.should =~ /77 examples, 0 failures/n
   end
 
   it "should run file" do
-    file = File.dirname(__FILE__) + '/../../../examples/io_processor_spec.rb'
+    file = File.dirname(__FILE__) + '/../../../failing_examples/predicate_example.rb'
     err = StringIO.new
     out = StringIO.new
     Spec::Runner::CommandLine.run([file], err, out, false, true)
     
     out.rewind
-    out.read.should =~ /2 examples, 0 failures/n
+    out.read.should =~ /2 examples, 1 failure/n
   end
 
   it "should raise when file does not exist" do

data/spec/spec/runner/drb_command_line_spec.rb

@@ -1,5 +1,4 @@
-require 'stringio'
-require 'rbconfig'
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 describe "DrbCommandLine without running local server" do
   
@@ -18,15 +17,23 @@ end
 describe "DrbCommandLine with local server" do
 
   unless Config::CONFIG['ruby_install_name'] == 'jruby'  
-    before :all do
-      create_dummy_spec_file
+    before(:all) do
       DRb.start_service("druby://localhost:8989", Spec::Runner::CommandLine)
+      $drb_example_file_counter = 0
     end
     
-    after :all do
-      DRb.stop_service      
+    before(:each) do
+      create_dummy_spec_file
+      $drb_example_file_counter = $drb_example_file_counter + 1
+    end
+    
+    after(:each) do
       File.delete(@dummy_spec_filename)
     end
+    
+    after(:all) do
+      DRb.stop_service      
+    end
 
     it "should run against local server" do
       out = run_spec_via_druby(['--version'])
@@ -44,7 +51,7 @@ describe "DrbCommandLine with local server" do
     end
 
     def create_dummy_spec_file
-      @dummy_spec_filename = File.expand_path(File.dirname(__FILE__)) + '/_dummy_spec.rb'
+      @dummy_spec_filename = File.expand_path(File.dirname(__FILE__)) + "/_dummy_spec#{$drb_example_file_counter}.rb"
       File.open(@dummy_spec_filename, 'w') do |f|
         f.write %{
 describe "DUMMY CONTEXT for 'DrbCommandLine with -c option'" do
@@ -53,7 +60,7 @@ describe "DUMMY CONTEXT for 'DrbCommandLine with -c option'" do
   end
 
   it "should be output with red bar" do
-    violated("I wan to see a red bar!")
+    violated("I want to see a red bar!")
   end
 end
 }

data/spec/spec/runner/formatter/html_formatter_spec.rb

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/../../../spec_helper.rb'
-require 'stringio'
+
 describe "HtmlFormatter" do
+  it_should_behave_like "Examples that have to load files"  
+
   ['--diff', '--dry-run'].each do |opt|
     it "should produce HTML identical to the one we designed manually with #{opt}" do
       root = File.expand_path(File.dirname(__FILE__) + '/../../../..')
@@ -8,10 +10,10 @@ describe "HtmlFormatter" do
       expected_file = File.dirname(__FILE__) + "/html_formatted-#{VERSION}#{suffix}.html"
       raise "There is no HTML file with expected content for this platform: #{expected_file}" unless File.file?(expected_file)
       expected_html = File.read(expected_file)
-      raise "There should be no absolute paths in html_formatted.html!!" if expected_html =~ /\/Users/n
+      raise "There should be no absolute paths in html_formatted.html!!" if (expected_html =~ /\/Users/n || expected_html =~ /\/home/n)
 
       Dir.chdir(root) do
-        args = ['failing_examples/mocking_example.rb', 'failing_examples/diffing_spec.rb', 'examples/stubbing_example.rb', '--format', 'html', opt]
+        args = ['failing_examples/mocking_example.rb', 'failing_examples/diffing_spec.rb', 'examples/stubbing_example.rb',  'examples/not_yet_implemented_spec.rb', '--format', 'html', opt]
         err = StringIO.new
         out = StringIO.new
         Spec::Runner::CommandLine.run(
@@ -28,9 +30,24 @@ describe "HtmlFormatter" do
         if opt == '--diff'
           # Uncomment this line temporarily in order to overwrite the expected with actual.
           # Use with care!!!
-          # File.open(expected_file, 'w') {|io| io.write(html)}
+          File.open(expected_file, 'w') {|io| io.write(html)}
+
+          doc = Hpricot(html)
+          backtraces = doc.search("div.backtrace").collect {|e| e.at("/pre").inner_html}
+          doc.search("div.backtrace").remove
+
+          expected_doc = Hpricot(expected_html)
+          expected_backtraces = expected_doc.search("div.backtrace").collect {|e| e.at("/pre").inner_html}
+          expected_doc.search("div.backtrace").remove
+
+          doc.inner_html.should == expected_doc.inner_html
 
-          html.should == expected_html
+          expected_backtraces.each_with_index do |expected_line, i|
+            expected_path, expected_line_number, expected_suffix = expected_line.split(':')
+            actual_path, actual_line_number, actual_suffix = backtraces[i].split(':')
+            File.expand_path(actual_path).should == File.expand_path(expected_path)
+            actual_line_number.should == expected_line_number
+          end
         else
           html.should =~ /This was a dry-run/m
         end

data/spec/spec/runner/formatter/progress_bar_formatter_dry_run_spec.rb

@@ -10,7 +10,7 @@ describe "ProgressBarFormatterDryRun" do
         @formatter.dry_run = true
     end
     it "should not produce summary on dry run" do
-        @formatter.dump_summary(3, 2, 1)
+        @formatter.dump_summary(3, 2, 1, 0)
         @io.string.should eql("")
       
     end