rspec 1.2.8 → 1.2.9

data/lib/spec/version.rb

@@ -3,12 +3,12 @@ module Spec # :nodoc:
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 2
-      TINY   = 8
+      TINY   = 9
       PRE    = nil
-      
+
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 
       SUMMARY = "rspec #{STRING}"
     end
   end
-end
+end

data/resources/helpers/cmdline.rb

@@ -1,4 +1,3 @@
-$:.push File.join(File.dirname(__FILE__), *%w[.. .. lib])
 require 'spec'
 
 # Uncommenting next line will break the output feature (no output!!)

data/spec/autotest/autotest_helper.rb

@@ -1,10 +1,8 @@
+require 'spec_helper'
 begin
   require 'autotest'
 rescue LoadError
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-  require 'autotest'
+  raise "You must install ZenTest to use autotest"
 end
-dir = File.dirname(__FILE__)
-require File.expand_path("#{dir}/../spec_helper")
-require File.expand_path("#{dir}/../../lib/autotest/rspec")
-require File.expand_path("#{dir}/autotest_matchers")
+require 'autotest/rspec'
+require 'spec/autotest/autotest_matchers'

data/spec/autotest/discover_spec.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + "/autotest_helper"
+require 'spec/autotest/autotest_helper'
 
 describe Autotest::Rspec, "discovery" do
   it "adds the rspec autotest plugin" do
     Autotest.should_receive(:add_discovery)
-    require File.dirname(__FILE__) + "/../../lib/autotest/discover"
+    load File.expand_path(File.dirname(__FILE__) + "/../../lib/autotest/discover.rb")
   end
 end  

data/spec/autotest/failed_results_re_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/autotest_helper"
+require 'spec/autotest/autotest_helper'
 
 describe "failed_results_re" do
   it "should match a failure" do

data/spec/autotest/rspec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/autotest_helper"
+require 'spec/autotest/autotest_helper'
 
 describe Autotest::Rspec do
   describe "adding spec.opts --options" do 

data/spec/spec/dsl/main_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module DSL

data/spec/spec/example/example_group_class_definition_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Example

data/spec/spec/example/example_group_factory_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 module Spec
   module Example

data/spec/spec/example/example_group_methods_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Example
@@ -732,6 +732,26 @@ module Spec
           end
         end
 
+        describe "#define" do
+          let(:counter) do
+            Class.new do
+              def initialize
+                @count = 0
+              end
+              def count
+                @count += 1
+              end
+            end.new
+          end
+          it "generates an instance method" do
+            counter.count.should == 1
+          end
+          
+          it "caches the value" do
+            counter.count.should == 1
+            counter.count.should == 2
+          end
+        end
       end
     end
   end

data/spec/spec/example/example_group_proxy_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Example

data/spec/spec/example/example_group_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Example

data/spec/spec/example/example_matcher_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Example

data/spec/spec/example/example_methods_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 class Thing
   attr_reader :arg

data/spec/spec/example/example_proxy_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Example

data/spec/spec/example/helper_method_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 # This was added to prove that http://rspec.lighthouseapp.com/projects/5645/tickets/211
 # was fixed in ruby 1.9.1

data/spec/spec/example/nested_example_group_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Example

data/spec/spec/example/predicate_matcher_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Example

data/spec/spec/example/shared_example_group_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Example

data/spec/spec/example/subclassing_example_group_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Example

data/spec/spec/example/subject_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Example
@@ -83,5 +83,21 @@ module Spec
         end
       end
     end
+
+    describe ".its (to access subject's attributes)" do
+      with_sandboxed_options do
+        it "passes when expectation should pass" do
+          group = Class.new(ExampleGroupDouble).describe(Array)
+          child = group.its(:length) { should == 0 }
+          child.run(options).should == true
+        end
+        
+        it "fails when expectation should fail" do
+          group = Class.new(ExampleGroupDouble).describe(Array)
+          child = group.its(:length) { should == 1 }
+          child.run(options).should == false
+        end
+      end
+    end
   end
 end

data/spec/spec/expectations/differs/default_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Fixtures
@@ -111,7 +111,20 @@ EOD
     expected = { "foo" => "bar", "fizz" => [1, 2, 3] }
     actual   = { "foo" => "baz", "fizz" => [1, 2] }
 
-    expected_diff = <<'EOD'
+    # UGH - 1.8.7 seems to order hash keys differently than the others
+    if RUBY_VERSION =~ /^1.8.7/
+      expected_diff = <<'EOD'
+
+Expected the key "fizz" to be [1, 2, 3], but was [1, 2]
+Expected the key "foo" to be "bar", but was "baz"
+
+
+@@ -1,2 +1,2 @@
+-{"fizz"=>[1, 2, 3], "foo"=>"bar"}
++{"fizz"=>[1, 2], "foo"=>"baz"}
+EOD
+    else
+      expected_diff = <<'EOD'
 
 Expected the key "fizz" to be [1, 2, 3], but was [1, 2]
 Expected the key "foo" to be "bar", but was "baz"
@@ -121,7 +134,7 @@ Expected the key "foo" to be "bar", but was "baz"
 -{"foo"=>"bar", "fizz"=>[1, 2, 3]}
 +{"foo"=>"baz", "fizz"=>[1, 2]}
 EOD
-
+    end
 
     diff = @differ.diff_as_hash(actual, expected)
     diff.should == expected_diff

data/spec/spec/expectations/extensions/kernel_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+require 'spec_helper'
 
 describe Object, "#should" do
   before(:each) do

data/spec/spec/expectations/fail_with_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe Spec::Expectations, "#fail_with with no diff" do
   before(:each) do

data/spec/spec/expectations/handler_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module ExampleExpectations
   

data/spec/spec/expectations/wrap_expectation_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Matchers

data/spec/spec/interop/test/unit/resources/test_case_with_various_names.rb

@@ -0,0 +1,22 @@
+rspec_lib = File.dirname(__FILE__) + "/../../../../../../lib"
+$:.unshift rspec_lib unless $:.include?(rspec_lib)
+require 'spec/autorun'
+require 'spec/test/unit'
+
+class TestCaseThatPasses < Test::Unit::TestCase
+  def test_should_allow_underscore
+    assert true
+  end
+
+  def testShouldAllowUppercaseLetter
+    assert true
+  end
+
+  def testshouldallowlowercaseletter
+    assert true
+  end
+
+  define_method :"test: should allow punctuation" do
+    assert true
+  end
+end

data/spec/spec/interop/test/unit/spec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_unit_spec_helper'
+require 'spec/interop/test/unit/test_unit_spec_helper'
 
 describe "ExampleGroup with test/unit/interop" do
   include TestUnitSpecHelper

data/spec/spec/interop/test/unit/test_unit_spec_helper.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../../ruby_forker'
+require 'spec_helper'
+require 'ruby_forker'
 
 module TestUnitSpecHelper
   include RubyForker

data/spec/spec/interop/test/unit/testcase_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_unit_spec_helper'
+require 'spec/interop/test/unit/test_unit_spec_helper'
 
 describe "Test::Unit::TestCase" do
   include TestUnitSpecHelper
@@ -42,4 +42,9 @@ describe "Test::Unit::TestCase" do
       $?.should == 256
     end
   end
-end
+
+  it "should find all Test::Unit test methods" do
+    output = ruby("#{@dir}/test_case_with_various_names.rb")
+    output.should include("4 examples, 0 failures")
+  end
+end

data/spec/spec/interop/test/unit/testsuite_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_unit_spec_helper'
+require 'spec/interop/test/unit/test_unit_spec_helper'
 
 describe "TestSuiteAdapter" do
   include TestUnitSpecHelper

data/spec/spec/matchers/be_close_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 module Spec
   module Matchers
     describe "[actual.should] be_close(expected, delta)" do

data/spec/spec/matchers/be_instance_of_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Matchers

data/spec/spec/matchers/be_kind_of_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Matchers

data/spec/spec/matchers/be_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should be_predicate" do  
   it "should pass when actual returns true for :predicate?" do
@@ -18,6 +18,13 @@ describe "should be_predicate" do
     }.should fail_with("expected happy? to return true, got false")
   end
   
+  it "should fail when actual returns false for :predicate?" do
+    actual = stub("actual", :happy? => nil)
+    lambda {
+      actual.should be_happy
+    }.should fail_with("expected happy? to return true, got nil")
+  end
+  
   it "should fail when actual does not respond to :predicate?" do
     lambda {
       Object.new.should be_happy
@@ -47,6 +54,11 @@ describe "should_not be_predicate" do
     actual.should_not be_happy
   end
   
+  it "should pass when actual returns nil for :sym?" do
+    actual = stub("actual", :happy? => nil)
+    actual.should_not be_happy
+  end
+  
   it "should fail when actual returns true for :sym?" do
     actual = stub("actual", :happy? => true)
     lambda {

data/spec/spec/matchers/change_spec.rb

@@ -1,6 +1,6 @@
 #Based on patch from Wilson Bilkovich
 
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 class SomethingExpected
   attr_accessor :some_value
 end

data/spec/spec/matchers/compatibility_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 Spec::Matchers.define :have_public_instance_method do |method|
   match do |klass|

data/spec/spec/matchers/description_generation_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "Matchers should be able to generate their own descriptions" do
   after(:each) do

data/spec/spec/matchers/dsl_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Matchers

data/spec/spec/matchers/eql_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Matchers