rspec-core 2.1.0 → 2.2.0

data/spec/rspec/core/configuration_spec.rb

@@ -7,11 +7,26 @@ module RSpec::Core
     let(:config) { subject }
 
     describe "#load_spec_files" do
+
       it "loads files using load" do
         config.files_to_run = ["foo.bar", "blah_spec.rb"]
         config.should_receive(:load).twice
         config.load_spec_files
       end
+
+      context "with rspec-1 loaded" do
+        before do
+          Object.const_set(:Spec, Module.new)
+          ::Spec::const_set(:VERSION, Module.new)
+          ::Spec::VERSION::const_set(:MAJOR, 1)
+        end
+        after  { Object.__send__(:remove_const, :Spec) }
+        it "raises with a helpful message" do
+          expect {
+            config.load_spec_files
+          }.to raise_error(/rspec-1 has been loaded/)
+        end
+      end
     end
 
     describe "mock_framework" do
@@ -226,12 +241,12 @@ module RSpec::Core
     describe "run_all_when_everything_filtered?" do
 
       it "defaults to false" do
-        config.run_all_when_everything_filtered?.should == false
+        config.run_all_when_everything_filtered?.should be_false
       end
 
       it "can be queried with question method" do
         config.run_all_when_everything_filtered = true
-        config.run_all_when_everything_filtered?.should == true
+        config.run_all_when_everything_filtered?.should be_true
       end
     end
 
@@ -241,7 +256,7 @@ module RSpec::Core
           it "does not set color_enabled" do
             config.output_stream = StringIO.new
             config.output_stream.stub(:tty?) { false }
-            config.autotest = false
+            config.tty = false
             config.color_enabled = true
             config.color_enabled.should be_false
           end
@@ -251,17 +266,17 @@ module RSpec::Core
           it "does not set color_enabled" do
             config.output_stream = StringIO.new
             config.output_stream.stub(:tty?) { true }
-            config.autotest = false
+            config.tty = false
             config.color_enabled = true
             config.color_enabled.should be_true
           end
         end
 
-        context "with autotest output" do
+        context "with tty set" do
           it "does not set color_enabled" do
             config.output_stream = StringIO.new
             config.output_stream.stub(:tty?) { false }
-            config.autotest = true
+            config.tty = true
             config.color_enabled = true
             config.color_enabled.should be_true
           end
@@ -270,75 +285,47 @@ module RSpec::Core
         context "on windows" do
           before do
             @original_host  = RbConfig::CONFIG['host_os']
-            @original_stdout = $stdout
-            @original_stderr = $stderr
-            RbConfig::CONFIG['host_os'] = 'mswin'
+            RbConfig::CONFIG['host_os'] = 'mingw'
             config.stub(:require)
             config.stub(:warn)
           end
 
           after do
             RbConfig::CONFIG['host_os'] = @original_host
-            $stdout = @original_stdout
-            $stderr = @original_stderr
           end
 
-          context "with win32console available" do
-            it "requires win32console" do
-              config.should_receive(:require).
-                with("Win32/Console/ANSI")
-              config.color_enabled = true
+          context "with ANSICON available" do
+            before(:all) do
+              @original_ansicon = ENV['ANSICON']
+              ENV['ANSICON'] = 'ANSICON'
             end
 
-            context "with $stdout/err assigned to config.output/error_stream" do
-              it "reassigns new $stdout to output_stream" do
-                config.output_stream = $stdout
-                substitute_stdout = StringIO.new
-                config.stub(:require) do |what|
-                  $stdout = substitute_stdout if what =~ /Win32/
-                end
-                config.color_enabled = true
-                config.output_stream.should eq(substitute_stdout)
-              end
-
-              it "reassigns new $stderr to error_stream" do
-                config.error_stream = $stderr
-                substitute_stderr = StringIO.new
-                config.stub(:require) do |what|
-                  $stderr = substitute_stderr if what =~ /Win32/
-                end
-                config.color_enabled = true
-                config.error_stream.should eq(substitute_stderr)
-              end
+            after(:all) do
+              ENV['ANSICON'] = @original_ansicon
+            end
+            
+            it "enables colors" do
+              config.output_stream = StringIO.new
+              config.output_stream.stub(:tty?) { true }
+              config.color_enabled = true
+              config.color_enabled.should be_true
             end
 
-            context "without $stdout/err assigned to config.output/error_stream" do
-              it "leaves output stream intact" do
-                config.output_stream = output_stream = StringIO.new
-                config.stub(:require) do |what|
-                  $stdout = StringIO.new if what =~ /Win32/
-                end
-                config.color_enabled = true
-                config.output_stream.should eq(output_stream)
-              end
-
-              it "leaves error stream intact" do
-                config.error_stream = error_stream = StringIO.new
-                config.stub(:require) do |what|
-                  $stderr = StringIO.new if what =~ /Win32/
-                end
-                config.color_enabled = true
-                config.error_stream.should eq(error_stream)
+            it "leaves output stream intact" do
+              config.output_stream = $stdout
+              config.stub(:require) do |what|
+                config.output_stream = 'foo' if what =~ /Win32/
               end
+              config.color_enabled = true
+              config.output_stream.should eq($stdout)
             end
-
           end
 
-          context "with win32console NOT available" do
-            it "warns to install win32console" do
+          context "with ANSICON NOT available" do
+            it "warns to install ANSICON" do
               config.stub(:require) { raise LoadError }
               config.should_receive(:warn).
-                with(/You must 'gem install win32console'/)
+                with(/You must use ANSICON/)
               config.color_enabled = true
             end
 
@@ -516,20 +503,13 @@ module RSpec::Core
       end
     end
 
-    describe "#debug=true" do
-      it "requires 'ruby-debug'" do
-        config.should_receive(:require).with('ruby-debug')
+    describe "#debug=" do
+      it "is deprecated" do
+        RSpec.should_receive(:warn_deprecation)
         config.debug = true
       end
     end
 
-    describe "#debug=false" do
-      it "does not require 'ruby-debug'" do
-        config.should_not_receive(:require).with('ruby-debug')
-        config.debug = false
-      end
-    end
-
     describe "#output=" do
       it "sets the output" do
         output = mock("output")
@@ -623,7 +603,7 @@ module RSpec::Core
     end
 
     describe "#configure_group" do
-      it "extends with modules" do
+      it "extends with 'extend'" do
         mod = Module.new
         group = ExampleGroup.describe("group", :foo => :bar)
 
@@ -632,7 +612,7 @@ module RSpec::Core
         group.should be_a(mod)
       end
 
-      it "includes modules" do
+      it "extends with 'module'" do
         mod = Module.new
         group = ExampleGroup.describe("group", :foo => :bar)
 
@@ -641,6 +621,15 @@ module RSpec::Core
         group.included_modules.should include(mod)
       end
 
+      it "requires only one matching filter" do
+        mod = Module.new
+        group = ExampleGroup.describe("group", :foo => :bar)
+
+        config.include(mod, :foo => :bar, :baz => :bam)
+        config.configure_group(group)
+        group.included_modules.should include(mod)
+      end
+
       it "includes each one before deciding whether to include the next" do
         mod1 = Module.new do
           def self.included(host)

data/spec/rspec/core/example_group_spec.rb

@@ -176,6 +176,21 @@ module RSpec::Core
         end
       end
 
+      context "in a nested group" do
+        it "inherits the described class/module from the outer group" do
+          group = ExampleGroup.describe(String) do
+            describe Array do
+              example "desribes is String" do
+                described_class.should eq(String)
+              end
+            end
+          end
+
+          group.run.should be_true, "expected examples in group to pass"
+        end
+      end
+
+
     end
 
     describe '#described_class' do
@@ -359,7 +374,7 @@ module RSpec::Core
         example = group.example("equality") { 1.should == 2}
         group.run
 
-        example.metadata[:execution_result][:exception_encountered].message.should == "error in before each"
+        example.metadata[:execution_result][:exception].message.should == "error in before each"
       end
 
       it "treats an error in before(:all) as a failure" do
@@ -370,8 +385,8 @@ module RSpec::Core
 
         example.metadata.should_not be_nil
         example.metadata[:execution_result].should_not be_nil
-        example.metadata[:execution_result][:exception_encountered].should_not be_nil
-        example.metadata[:execution_result][:exception_encountered].message.should == "error in before all"
+        example.metadata[:execution_result][:exception].should_not be_nil
+        example.metadata[:execution_result][:exception].message.should == "error in before all"
       end
 
       it "treats an error in before(:all) as a failure for a spec in a nested group" do
@@ -387,8 +402,8 @@ module RSpec::Core
 
         example.metadata.should_not be_nil
         example.metadata[:execution_result].should_not be_nil
-        example.metadata[:execution_result][:exception_encountered].should_not be_nil
-        example.metadata[:execution_result][:exception_encountered].message.should == "error in before all"
+        example.metadata[:execution_result][:exception].should_not be_nil
+        example.metadata[:execution_result][:exception].message.should == "error in before all"
       end
 
       context "when an error occurs in an after(:all) hook" do
@@ -492,8 +507,8 @@ module RSpec::Core
     describe Object, "describing nested example_groups", :little_less_nested => 'yep' do
 
       describe "A sample nested group", :nested_describe => "yep" do
-        it "sets the described class to the constant Object" do
-          example.example_group.describes.should == Object
+        it "sets the described class to the described class of the outer most group" do
+          example.example_group.describes.should eq(ExampleGroup)
         end
 
         it "sets the description to 'A sample nested describe'" do

data/spec/rspec/core/example_spec.rb

@@ -82,7 +82,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
 
         group.run
 
-        example.metadata[:execution_result][:exception_encountered].message.should == "FOO"
+        example.metadata[:execution_result][:exception].message.should == "FOO"
       end
     end
 

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

@@ -8,11 +8,11 @@ module RSpec::Core::Formatters
       examples = [
         double("example 1",
                :description => "first example",
-               :execution_result => {:status => 'failed', :exception_encountered => Exception.new }
+               :execution_result => {:status => 'failed', :exception => Exception.new }
               ),
         double("example 2",
                :description => "second example",
-               :execution_result => {:status => 'failed', :exception_encountered => Exception.new }
+               :execution_result => {:status => 'failed', :exception => Exception.new }
               )
       ]
 

data/spec/rspec/core/kernel_extensions_spec.rb

@@ -1,9 +1,12 @@
 require 'spec_helper'
 
 describe "extensions" do
-  describe "debugger" do
-    it "is defined on Kernel" do
-      Kernel.should respond_to(:debugger)
+  describe "#debugger" do
+    it "warns if ruby-debug is not installed" do
+      object = Object.new
+      object.should_receive(:warn).with(/debugger .* ignored:\n.* ruby-debug/m)
+      object.stub(:require) { raise LoadError }
+      object.__send__ :method_missing, :debugger
     end
   end
 end

data/spec/rspec/core/metadata_spec.rb

@@ -157,6 +157,19 @@ module RSpec
             m[:example_group][:describes].should be(String)
           end
         end
+
+        context "with describes from a superclass metadata" do
+          it "returns the superclass' described class" do
+            sm = Metadata.new
+            sm.process(String)
+
+            m = Metadata.new(sm)
+            m.process(Array)
+
+            m = m.for_example("example", {})
+            m[:example_group][:describes].should be(String)
+          end
+        end
       end
 
       describe ":description" do

data/spec/rspec/core/pending_example_spec.rb

@@ -24,7 +24,7 @@ RSpec::Matchers.define :fail_with do |exception_klass|
     case
       when example.metadata[:pending] then "was pending"
       when result[:status] != 'failed' then result[:status]
-      when !result[:exception_encountered].is_a?(exception_klass) then "failed with a #{result[:exception_encountered].class}"
+      when !result[:exception].is_a?(exception_klass) then "failed with a #{result[:exception].class}"
       else nil
     end
   end

data/spec/rspec/core/rake_task_spec.rb

@@ -97,11 +97,10 @@ module RSpec::Core
           spec_command.should =~ /rcov.*--exclude "mocks"/
         end
 
-        it "ensures that -Ispec and -Ilib are in the resulting command" do
+        it "ensures that -Ispec:lib is in the resulting command" do
           task.rcov = true
           task.rcov_opts = '--exclude "mocks"'
-          spec_command.should =~ /rcov.*-Ispec/
-          spec_command.should =~ /rcov.*-Ilib/
+          spec_command.should =~ /rcov.*-Ispec:lib/
         end
       end
     end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'autotest/rspec2'
 Dir['./spec/support/**/*.rb'].map {|f| require f}
 
 class NullObject
+  private
   def method_missing(method, *args, &block)
     # ignore
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Chad Humphries
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 01:00:00 -05:00
+date: 2010-11-28 00:00:00 -06:00
 default_executable: rspec
 dependencies: []
 
@@ -27,16 +27,15 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
+- README.md
 files: 
 - .document
 - .gitignore
-- .treasure_map.rb
 - Gemfile
 - Guardfile
 - History.markdown
 - License.txt
-- README.markdown
+- README.md
 - Rakefile
 - Upgrade.markdown
 - autotest/discover.rb
@@ -179,7 +178,6 @@ files:
 - spec/ruby_forker.rb
 - spec/spec_helper.rb
 - spec/support/matchers.rb
-- specs.watchr
 has_rdoc: true
 homepage: http://github.com/rspec/rspec-core
 licenses: []
@@ -187,7 +185,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.1.0
+    Thank you for installing rspec-core-2.2.0
   
     Please be sure to look at the upgrade instructions to see what might have
     changed since the last release:
@@ -205,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2874414525307202279
+      hash: -1519645400680950494
       segments: 
       - 0
       version: "0"
@@ -214,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2874414525307202279
+      hash: -1519645400680950494
       segments: 
       - 0
       version: "0"
@@ -224,7 +222,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.1.0
+summary: rspec-core-2.2.0
 test_files: 
 - features/README.markdown
 - features/command_line/configure.feature