rspec-core 2.10.1 → 2.11.0

data/spec/rspec/core/configuration_options_spec.rb

@@ -95,6 +95,22 @@ describe RSpec::Core::ConfigurationOptions, :fakefs do
       config.should_receive(:debug=).with(true)
       opts.configure(config)
     end
+
+    it "merges --require specified by multiple configuration sources" do
+      ENV['SPEC_OPTS'] = "--require file_from_env"
+      opts = config_options_object(*%w[--require file_from_opts])
+      config = RSpec::Core::Configuration.new
+      config.should_receive(:requires=).with(["file_from_opts", "file_from_env"])
+      opts.configure(config)
+    end
+
+    it "merges --I specified by multiple configuration sources" do
+      ENV['SPEC_OPTS'] = "-I dir_from_env"
+      opts = config_options_object(*%w[-I dir_from_opts])
+      config = RSpec::Core::Configuration.new
+      config.should_receive(:libs=).with(["dir_from_opts", "dir_from_env"])
+      opts.configure(config)
+    end
   end
 
   describe "-c, --color, and --colour" do
@@ -170,8 +186,8 @@ describe RSpec::Core::ConfigurationOptions, :fakefs do
 
   describe "--example" do
     it "sets :full_description" do
-      parse_options('--example','foo').should include(:full_description => /foo/)
-      parse_options('-e','bar').should include(:full_description => /bar/)
+      parse_options('--example','foo').should include(:full_description => [/foo/])
+      parse_options('-e','bar').should include(:full_description => [/bar/])
     end
   end
 
@@ -321,7 +337,7 @@ describe RSpec::Core::ConfigurationOptions, :fakefs do
       options[:color].should be_true
       options[:line_numbers].should eq(["37"])
       options[:debug].should be_true
-      options[:full_description].should eq(/foo\ bar/)
+      options[:full_description].should eq([/foo\ bar/])
       options[:drb].should be_true
     end
 
@@ -354,7 +370,7 @@ describe RSpec::Core::ConfigurationOptions, :fakefs do
       it "parses -e 'full spec description'" do
         File.open("./custom.opts", "w") {|f| f << "-e 'The quick brown fox jumps over the lazy dog'"}
         options = parse_options("-O", "./custom.opts")
-        options[:full_description].should == /The\ quick\ brown\ fox\ jumps\ over\ the\ lazy\ dog/
+        options[:full_description].should eq([/The\ quick\ brown\ fox\ jumps\ over\ the\ lazy\ dog/])
       end
     end
   end

data/spec/rspec/core/configuration_spec.rb

@@ -64,10 +64,37 @@ module RSpec::Core
       end
     end
 
+    shared_examples "a configurable framework adapter" do |m|
+      it "yields a config object if the framework_module supports it" do
+        custom_config = Struct.new(:custom_setting).new
+        mod = Module.new
+        mod.stub(:configuration => custom_config)
+
+        config.send m, mod do |mod_config|
+          mod_config.custom_setting = true
+        end
+
+        custom_config.custom_setting.should be_true
+      end
+
+      it "raises if framework module doesn't support configuration" do
+        mod = Module.new
+
+        lambda do
+          config.send m, mod do |mod_config|
+          end
+        end.should raise_error /must respond to `configuration`/
+      end
+    end
+
     describe "#mock_with" do
+      before { config.stub(:require) }
+
+      it_behaves_like "a configurable framework adapter", :mock_with
+
       [:rspec, :mocha, :rr, :flexmock].each do |framework|
         context "with #{framework}" do
-          it "requires the adapter for #{framework.inspect}" do
+          it "requires the adapter for #{framework}" do
             config.should_receive(:require).with("rspec/core/mocking/with_#{framework}")
             config.mock_with framework
           end
@@ -76,7 +103,6 @@ module RSpec::Core
 
       context "with a module" do
         it "sets the mock_framework_adapter to that module" do
-          config.stub(:require)
           mod = Module.new
           config.mock_with mod
           config.mock_framework.should eq(mod)
@@ -89,8 +115,6 @@ module RSpec::Core
       end
 
       context 'when there are already some example groups defined' do
-        before(:each) { config.stub(:require) }
-
         it 'raises an error since this setting must be applied before any groups are defined' do
           RSpec.world.stub(:example_groups).and_return([double.as_null_object])
           expect {
@@ -129,16 +153,14 @@ module RSpec::Core
     end
 
     describe "#expect_with" do
-      before(:each) do
-        # we need to prevent stdlib from being required because it defines a
-        # `pass` method that conflicts with our `pass` matcher.
-        config.stub(:require)
-      end
+      before { config.stub(:require) }
+
+      it_behaves_like "a configurable framework adapter", :expect_with
 
       [
         [:rspec,  'rspec/expectations'],
         [:stdlib, 'test/unit/assertions']
-      ].each do |(framework, required_file)|
+      ].each do |framework, required_file|
         context "with #{framework}" do
           it "requires #{required_file}" do
             config.should_receive(:require).with(required_file)
@@ -147,6 +169,19 @@ module RSpec::Core
         end
       end
 
+      it "supports multiple calls" do
+        config.expect_with :rspec
+        config.expect_with :stdlib
+        config.expectation_frameworks.should eq [RSpec::Matchers, Test::Unit::Assertions]
+      end
+
+      it "raises if block given with multiple args" do
+        lambda do
+          config.expect_with :rspec, :stdlib do |mod_config|
+          end
+        end.should raise_error /expect_with only accepts/
+      end
+
       it "raises ArgumentError if framework is not supported" do
         expect do
           config.expect_with :not_supported
@@ -178,11 +213,7 @@ module RSpec::Core
     end
 
     describe "#expecting_with_rspec?" do
-      before(:each) do
-        # prevent minitest assertions from being required and included,
-        # as that causes problems in some of our specs.
-        config.stub(:require)
-      end
+      before { config.stub(:require) }
 
       it "returns false by default" do
         config.should_not be_expecting_with_rspec
@@ -215,13 +246,13 @@ module RSpec::Core
         config.files_to_run.should eq([      "spec/rspec/core/resources/a_bar.rb"])
       end
 
-      it "prevents repitition of dir when start of the pattern" do
+      it "prevents repetition of dir when start of the pattern" do
         config.pattern = "spec/**/a_spec.rb"
         config.files_or_directories_to_run = "spec"
         config.files_to_run.should eq(["spec/rspec/core/resources/a_spec.rb"])
       end
 
-      it "does not prevent repitition of dir when later of the pattern" do
+      it "does not prevent repetition of dir when later of the pattern" do
         config.pattern = "rspec/**/a_spec.rb"
         config.files_or_directories_to_run = "spec"
         config.files_to_run.should eq(["spec/rspec/core/resources/a_spec.rb"])
@@ -265,10 +296,14 @@ module RSpec::Core
           config.files_to_run.should eq([      "spec/rspec/core/resources/a_spec.rb"])
         end
 
-        it "loads files in Windows" do
-          file = "C:\\path\\to\\project\\spec\\sub\\foo_spec.rb"
-          config.files_or_directories_to_run = file
-          config.files_to_run.should eq([file])
+        it "loads files in Windows", :if => RSpec.windows_os? do
+          config.files_or_directories_to_run = "C:\\path\\to\\project\\spec\\sub\\foo_spec.rb"
+          config.files_to_run.should eq([      "C:/path/to/project/spec/sub/foo_spec.rb"])
+        end
+
+        it "loads files in Windows when directory is specified", :if => RSpec.windows_os? do
+          config.files_or_directories_to_run = "spec\\rspec\\core\\resources"
+          config.files_to_run.should eq([      "spec/rspec/core/resources/a_spec.rb"])
         end
       end
 
@@ -376,6 +411,11 @@ module RSpec::Core
       config.filter.should eq({:full_description => /foo/})
     end
 
+    it "assigns the example names as the filter on description if description is an array" do
+      config.full_description = [ "foo", "bar" ]
+      config.filter.should eq({:full_description => Regexp.union(/foo/, /bar/)})
+    end
+
     describe "#default_path" do
       it 'defaults to "spec"' do
         config.default_path.should eq('spec')

data/spec/rspec/core/drb_command_line_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require 'rspec/core/drb_command_line'
 
 describe "::DRbCommandLine", :type => :drb, :unless => RUBY_PLATFORM == 'java' do
   let(:config) { RSpec::Core::Configuration.new }

data/spec/rspec/core/drb_options_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require 'rspec/core/drb_options'
 
 describe RSpec::Core::DrbOptions, :fakefs do
   include ConfigOptionsHelper

data/spec/rspec/core/dsl_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+main = self
+describe "The describe method" do
+  it 'is available on the main object' do
+    main.should respond_to(:describe)
+  end
+
+  it 'is available on modules (so example groups can be nested inside them)' do
+    Module.new.should respond_to(:describe)
+  end
+
+  it 'is not available on other types of objects' do
+    Object.new.should_not respond_to(:describe)
+  end
+end
+

data/spec/rspec/core/example_group_spec.rb

@@ -359,15 +359,14 @@ module RSpec::Core
 
     [:focus, :focused].each do |example_alias|
       describe "##{example_alias}" do
-        let(:group) { ExampleGroup.describe }
-        subject { group.send example_alias, "a focused example" }
+        let(:focused_example) { ExampleGroup.describe.send example_alias, "a focused example" }
 
         it 'defines an example that can be filtered with :focused => true' do
-          subject.metadata.should include(:focused => true)
+          focused_example.metadata[:focused].should be_true
         end
 
         it 'defines an example that can be filtered with :focus => true' do
-          subject.metadata.should include(:focus => true)
+          focused_example.metadata[:focus].should be_true
         end
       end
     end
@@ -866,7 +865,7 @@ module RSpec::Core
 
       context "with all examples passing" do
         it "returns true" do
-          group = describe("something") do
+          group = RSpec::Core::ExampleGroup.describe("something") do
             it "does something" do
               # pass
             end
@@ -883,7 +882,7 @@ module RSpec::Core
 
       context "with top level example failing" do
         it "returns false" do
-          group = describe("something") do
+          group = RSpec::Core::ExampleGroup.describe("something") do
             it "does something (wrong - fail)" do
               raise "fail"
             end
@@ -900,7 +899,7 @@ module RSpec::Core
 
       context "with nested example failing" do
         it "returns true" do
-          group = describe("something") do
+          group = RSpec::Core::ExampleGroup.describe("something") do
             it "does something" do
               # pass
             end
@@ -971,10 +970,19 @@ module RSpec::Core
           eval_count.should eq(1)
         end
 
-        it "warns the user that blocks are not supported when given a block" do
-          group = ExampleGroup.describe
-          group.should_receive(:warn).with(/blocks not supported for #{name}/)
-          group.send(name, "named this with block") {}
+        it "evals the block when given" do
+          key = "#{__FILE__}:#{__LINE__}"
+          shared_examples(key) do
+            it("does something") do
+              foo.should eq("bar")
+            end
+          end
+          group = ExampleGroup.describe do
+            send name, key do
+              def foo; "bar"; end
+            end
+          end
+          group.run.should be_true
         end
       end
     end

data/spec/rspec/core/example_spec.rb

@@ -258,6 +258,40 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
         group.run.should be_true
       end
     end
+
+    context "when the example and an around hook raise errors" do
+      it "prints the around hook error rather than silencing it" do
+        group = RSpec::Core::ExampleGroup.describe do
+          around(:each) { |e| e.run; raise "around" }
+          example("e") { raise "example" }
+        end
+
+        reported_msg = nil
+        # We can't use should_receive(:message).with(/.../) here,
+        # because if that fails, it would fail within our example-under-test,
+        # and since there's already two errors, it would just be reported again.
+        RSpec.configuration.reporter.stub(:message) { |msg| reported_msg = msg }
+        group.run
+        reported_msg.should =~ /An error occurred in an around.* hook/i
+      end
+    end
+
+    context "when the example and an after hook raise errors" do
+      it "prints the after hook error rather than silencing it" do
+        group = RSpec::Core::ExampleGroup.describe do
+          after(:each) { raise "after" }
+          example("e") { raise "example" }
+        end
+
+        reported_msg = nil
+        # We can't use should_receive(:message).with(/.../) here,
+        # because if that fails, it would fail within our example-under-test,
+        # and since there's already two errors, it would just be reported again.
+        RSpec.configuration.reporter.stub(:message) { |msg| reported_msg = msg }
+        group.run
+        reported_msg.should =~ /An error occurred in an after.* hook/i
+      end
+    end
   end
 
   describe "#pending" do

data/spec/rspec/core/option_parser_spec.rb

@@ -68,7 +68,8 @@ module RSpec::Core
       describe option do
         it "escapes the arg" do
           options = Parser.parse!([option, "this (and that)"])
-          "this (and that)".should match(options[:full_description])
+          options[:full_description].length.should == 1
+          "this (and that)".should match(options[:full_description].first)
         end
       end
     end

data/spec/rspec/core/shared_example_group_spec.rb

@@ -6,17 +6,17 @@ module RSpec::Core
     ExampleModule = Module.new
     ExampleClass = Class.new
 
-    %w[share_examples_for shared_examples_for].each do |method_name|
-      describe method_name do
+    %w[share_examples_for shared_examples_for shared_examples shared_context].each do |shared_method_name|
+      describe shared_method_name do
         it "is exposed to the global namespace" do
-          Kernel.should respond_to(method_name)
+          Kernel.should respond_to(shared_method_name)
         end
 
         it "raises an ArgumentError when adding a second shared example group with the same name" do
           group = ExampleGroup.describe('example group')
-          group.send(method_name, 'shared group') {}
+          group.send(shared_method_name, 'shared group') {}
           lambda do
-            group.send(method_name, 'shared group') {}
+            group.send(shared_method_name, 'shared group') {}
           end.should raise_error(ArgumentError, "Shared example group 'shared group' already exists")
         end
 
@@ -26,7 +26,7 @@ module RSpec::Core
             it "captures the given #{type} and block in the World's collection of shared example groups" do
               implementation = lambda {}
               RSpec.world.shared_example_groups.should_receive(:[]=).with(object, implementation)
-              send(method_name, object, &implementation)
+              send(shared_method_name, object, &implementation)
             end
           end
         end
@@ -34,7 +34,7 @@ module RSpec::Core
         context "given a hash" do
           it "delegates extend on configuration" do
             implementation = Proc.new { def bar; 'bar'; end }
-            send(method_name, :foo => :bar, &implementation)
+            send(shared_method_name, :foo => :bar, &implementation)
             a = RSpec.configuration.include_or_extend_modules.first
             a[0].should eq(:extend)
             Class.new.extend(a[1]).new.bar.should eq('bar')
@@ -46,12 +46,12 @@ module RSpec::Core
           it "captures the given string and block in the World's collection of shared example groups" do
             implementation = lambda {}
             RSpec.world.shared_example_groups.should_receive(:[]=).with("name", implementation)
-            send(method_name, "name", :foo => :bar, &implementation)
+            send(shared_method_name, "name", :foo => :bar, &implementation)
           end
 
           it "delegates extend on configuration" do
             implementation = Proc.new { def bar; 'bar'; end }
-            send(method_name, "name", :foo => :bar, &implementation)
+            send(shared_method_name, "name", :foo => :bar, &implementation)
             a = RSpec.configuration.include_or_extend_modules.first
             a[0].should eq(:extend)
             Class.new.extend(a[1]).new.bar.should eq('bar')

data/spec/rspec/core/subject_spec.rb

@@ -78,6 +78,20 @@ module RSpec::Core
           doubly_nested_group.subject.call.should eq([4,5,6])
         end
       end
+
+      describe "with a name" do
+        it "defines a method that returns the memoized subject" do
+          group = ExampleGroup.describe do
+            subject(:list) { [1,2,3] }
+            example do
+              list.should equal(list)
+              subject.should equal(subject)
+              subject.should equal(list)
+            end
+          end
+          group.run.should be_true
+        end
+      end
     end
 
     context "using 'self' as an explicit subject" do

data/spec/rspec/core_spec.rb

@@ -1,25 +1,35 @@
 require 'spec_helper'
 
-describe RSpec::Core do
-
-  describe "#configuration" do
+describe RSpec do
+  describe "::configuration" do
     it "returns the same object every time" do
       RSpec.configuration.should equal(RSpec.configuration)
     end
   end
 
-  describe "#configure" do
+  describe "::configure" do
     it "yields the current configuration" do
       RSpec.configure do |config|
-        config.should eq(RSpec::configuration)
+        config.should equal(RSpec::configuration)
       end
     end
   end
 
-  describe "#world" do
-    it "returns the RSpec::Core::World instance the current run is using" do
-      RSpec.world.should be_instance_of(RSpec::Core::World)
+  describe "::world" do
+    it "returns the same object every time" do
+      RSpec.world.should equal(RSpec.world)
     end
   end
 
+  describe "::reset" do
+    it "resets the configuration and world objects" do
+      config_before_reset = RSpec.configuration
+      world_before_reset  = RSpec.world
+
+      RSpec.reset
+
+      RSpec.configuration.should_not equal(config_before_reset)
+      RSpec.world.should_not equal(world_before_reset)
+    end
+  end
 end