rspec-core 2.11.1 → 2.12.0

data/lib/rspec/core/subject.rb

@@ -193,8 +193,12 @@ module RSpec
         # @see ExampleMethods#subject
         # @see ExampleMethods#should
         def subject(name=nil, &block)
-          define_method(name) { subject } if name
-          block ? @explicit_subject_block = block : explicit_subject || implicit_subject
+          if name
+            let(name, &block)
+            subject { send name }
+          else
+            block ? @explicit_subject_block = block : explicit_subject || implicit_subject
+          end
         end
 
         attr_reader :explicit_subject_block

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.11.1'
+      STRING = '2.12.0'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -9,14 +9,14 @@ module RSpec
 
       def initialize(configuration=RSpec.configuration)
         @configuration = configuration
-        @example_groups = [].extend(Extensions::Ordered)
+        @example_groups = [].extend(Extensions::Ordered::ExampleGroups)
         @shared_example_groups = {}
         @filtered_examples = Hash.new { |hash,group|
           hash[group] = begin
             examples = group.examples.dup
             examples = filter_manager.prune(examples)
             examples.uniq
-            examples.extend(Extensions::Ordered)
+            examples.extend(Extensions::Ordered::Examples)
           end
         }
       end

data/spec/autotest/rspec_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Autotest::Rspec2 do
   let(:rspec_autotest) { Autotest::Rspec2.new }
   let(:spec_cmd) { File.expand_path("../../../exe/rspec", __FILE__) }
-  let(:ruby_cmd) { "ruby" }
+  let(:ruby_cmd) { "/path/to/ruby" }
 
   before do
     File.stub(:exist?) { false }
@@ -50,6 +50,11 @@ describe Autotest::Rspec2 do
       end
     end
 
+    it "quotes the path of the ruby executable" do
+      cmd = rspec_autotest.make_test_cmd(@files_to_test)
+      cmd.should match(%r('/path/to/ruby'))
+    end
+
     it "gives '--tty' to #{Autotest::Rspec2::RSPEC_EXECUTABLE}, not '--autotest'" do
       cmd = rspec_autotest.make_test_cmd(@files_to_test)
       cmd.should match(' --tty ')

data/spec/command_line/order_spec.rb

@@ -5,6 +5,32 @@ describe 'command line', :ui do
   let(:stdout) { StringIO.new }
 
   before :all do
+    write_file 'spec/simple_spec.rb', """
+      describe 'group 1' do
+        specify('group 1 example 1') {}
+        specify('group 1 example 2') {}
+        specify('group 1 example 3') {}
+        describe 'group 1-1' do
+          specify('group 1-1 example 1') {}
+          specify('group 1-1 example 2') {}
+          specify('group 1-1 example 3') {}
+        end
+      end
+    """
+
+    write_file 'spec/simple_spec2.rb', """
+      describe 'group 2' do
+        specify('group 2 example 1') {}
+        specify('group 2 example 2') {}
+        specify('group 2 example 3') {}
+        describe 'group 2-1' do
+          specify('group 2-1 example 1') {}
+          specify('group 2-1 example 2') {}
+          specify('group 2-1 example 3') {}
+        end
+      end
+    """
+
     write_file 'spec/order_spec.rb', """
       describe 'group 1' do
         specify('group 1 example 1')  {}
@@ -94,6 +120,14 @@ describe 'command line', :ui do
       examples('group 1')   {|first_run, second_run| first_run.should eq(second_run)}
       examples('group 1-1') {|first_run, second_run| first_run.should eq(second_run)}
     end
+
+    it "runs examples in the same order, regardless of the order in which files are given" do
+      run_command 'tmp/aruba/spec/simple_spec.rb tmp/aruba/spec/simple_spec2.rb --seed 1337 -f doc'
+      run_command 'tmp/aruba/spec/simple_spec2.rb tmp/aruba/spec/simple_spec.rb --seed 1337 -f doc'
+
+      top_level_groups      {|first_run, second_run| first_run.should eq(second_run)}
+      nested_groups         {|first_run, second_run| first_run.should eq(second_run)}
+    end
   end
 
   describe '--order default on CLI with --order rand in .rspec' do
@@ -110,6 +144,39 @@ describe 'command line', :ui do
     end
   end
 
+  context 'when a custom order is configured' do
+    before do
+      write_file 'spec/custom_order_spec.rb', """
+        RSpec.configure do |config|
+          config.order_groups_and_examples do |list|
+            list.sort_by { |item| item.description }
+          end
+        end
+
+        describe 'group B' do
+          specify('group B example D')  {}
+          specify('group B example B')  {}
+          specify('group B example A')  {}
+          specify('group B example C')  {}
+        end
+
+        describe 'group A' do
+          specify('group A example 1')  {}
+        end
+      """
+    end
+
+    it 'orders the groups and examples by the provided strategy' do
+      run_command 'tmp/aruba/spec/custom_order_spec.rb -f doc'
+
+      top_level_groups    { |groups| groups.flatten.should eq(['group A', 'group B']) }
+      examples('group B') do |examples|
+        letters = examples.flatten.map { |e| e[/(.)\z/, 1] }
+        letters.should eq(['A', 'B', 'C', 'D'])
+      end
+    end
+  end
+
   def examples(group)
     yield split_in_half(stdout.string.scan(/^\s+#{group} example.*$/))
   end

data/spec/rspec/core/configuration_options_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 require 'ostruct'
+require 'rspec/core/drb_options'
 
-describe RSpec::Core::ConfigurationOptions, :fakefs do
+describe RSpec::Core::ConfigurationOptions, :isolated_directory => true, :isolated_home => true do
   include ConfigOptionsHelper
 
   it "warns when HOME env var is not set", :unless => (RUBY_PLATFORM == 'java') do
-    begin
-      orig_home = ENV.delete("HOME")
+    without_env_vars 'HOME' do
       coo = RSpec::Core::ConfigurationOptions.new([])
       coo.should_receive(:warn)
       coo.parse_options
-    ensure
-      ENV["HOME"] = orig_home
     end
   end
 
@@ -97,19 +95,21 @@ describe RSpec::Core::ConfigurationOptions, :fakefs do
     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)
+      with_env_vars 'SPEC_OPTS' => "--require file_from_env" do
+        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
     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)
+      with_env_vars 'SPEC_OPTS' => "-I dir_from_env" do
+        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
   end
 
@@ -324,49 +324,56 @@ describe RSpec::Core::ConfigurationOptions, :fakefs do
     end
   end
 
-  describe "sources: ~/.rspec, ./.rspec, custom, CLI, and SPEC_OPTS" do
-    before(:each) do
-      FileUtils.mkpath(File.expand_path("~"))
-    end
-
+  describe "sources: ~/.rspec, ./.rspec, ./.rspec-local, custom, CLI, and SPEC_OPTS" do
     it "merges global, local, SPEC_OPTS, and CLI" do
       File.open("./.rspec", "w") {|f| f << "--line 37"}
-      File.open("~/.rspec", "w") {|f| f << "--color"}
-      ENV["SPEC_OPTS"] = "--debug --example 'foo bar'"
-      options = parse_options("--drb")
-      options[:color].should be_true
-      options[:line_numbers].should eq(["37"])
-      options[:debug].should be_true
-      options[:full_description].should eq([/foo\ bar/])
-      options[:drb].should be_true
+      File.open("./.rspec-local", "w") {|f| f << "--format global"}
+      File.open(File.expand_path("~/.rspec"), "w") {|f| f << "--color"}
+      with_env_vars 'SPEC_OPTS' => "--debug --example 'foo bar'" do
+        options = parse_options("--drb")
+        options[:color].should be_true
+        options[:line_numbers].should eq(["37"])
+        options[:debug].should be_true
+        options[:full_description].should eq([/foo\ bar/])
+        options[:drb].should be_true
+        options[:formatters].should eq([['global']])
+      end
     end
 
     it "prefers SPEC_OPTS over CLI" do
-      ENV["SPEC_OPTS"] = "--format spec_opts"
-      parse_options("--format", "cli")[:formatters].should eq([['spec_opts']])
+      with_env_vars 'SPEC_OPTS' => "--format spec_opts" do
+        parse_options("--format", "cli")[:formatters].should eq([['spec_opts']])
+      end
     end
 
     it "prefers CLI over file options" do
-      File.open("./.rspec", "w") {|f| f << "--format local"}
-      File.open("~/.rspec", "w") {|f| f << "--format global"}
+      File.open("./.rspec", "w") {|f| f << "--format project"}
+      File.open(File.expand_path("~/.rspec"), "w") {|f| f << "--format global"}
       parse_options("--format", "cli")[:formatters].should eq([['cli']])
     end
 
-    it "prefers local file options over global" do
-      File.open("./.rspec", "w") {|f| f << "--format local"}
-      File.open("~/.rspec", "w") {|f| f << "--format global"}
+    it "prefers project file options over global file options" do
+      File.open("./.rspec", "w") {|f| f << "--format project"}
+      File.open(File.expand_path("~/.rspec"), "w") {|f| f << "--format global"}
+      parse_options[:formatters].should eq([['project']])
+    end
+
+    it "prefers local file options over project file options" do
+      File.open("./.rspec-local", "w") {|f| f << "--format local"}
+      File.open("./.rspec", "w") {|f| f << "--format global"}
       parse_options[:formatters].should eq([['local']])
     end
 
     context "with custom options file" do
-      it "ignores local and global options files" do
-        File.open("./.rspec", "w") {|f| f << "--format local"}
-        File.open("~/.rspec", "w") {|f| f << "--format global"}
+      it "ignores project and global options files" do
+        File.open("./.rspec", "w") {|f| f << "--format project"}
+        File.open(File.expand_path("~/.rspec"), "w") {|f| f << "--format global"}
         File.open("./custom.opts", "w") {|f| f << "--color"}
         options = parse_options("-O", "./custom.opts")
         options[:format].should be_nil
         options[:color].should be_true
       end
+
       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")

data/spec/rspec/core/configuration_spec.rb

@@ -1,15 +1,21 @@
 require 'spec_helper'
 require 'tmpdir'
 
-# so the stdlib module is available...
-module Test; module Unit; module Assertions; end; end; end
-
 module RSpec::Core
 
   describe Configuration do
 
     let(:config) { Configuration.new }
 
+    describe "RSpec.configuration with a block" do
+      before { RSpec.stub(:warn_deprecation) }
+
+      it "is deprecated" do
+        RSpec.should_receive(:warn_deprecation)
+        RSpec.configuration {}
+      end
+    end
+
     describe "#load_spec_files" do
 
       it "loads files using load" do
@@ -25,12 +31,8 @@ module RSpec::Core
       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) }
+        before { stub_const("Spec::VERSION::MAJOR", 1) }
+
         it "raises with a helpful message" do
           expect {
             config.load_spec_files
@@ -101,6 +103,16 @@ module RSpec::Core
         end
       end
 
+      it "allows rspec-mocks to be configured with a provided block" do
+        mod = Module.new
+
+        RSpec::Mocks.configuration.should_receive(:add_stub_and_should_receive_to).with(mod)
+
+        config.mock_with :rspec do |c|
+          c.add_stub_and_should_receive_to mod
+        end
+      end
+
       context "with a module" do
         it "sets the mock_framework_adapter to that module" do
           mod = Module.new
@@ -153,7 +165,10 @@ module RSpec::Core
     end
 
     describe "#expect_with" do
-      before { config.stub(:require) }
+      before do
+        stub_const("Test::Unit::Assertions", Module.new)
+        config.stub(:require)
+      end
 
       it_behaves_like "a configurable framework adapter", :expect_with
 
@@ -213,7 +228,10 @@ module RSpec::Core
     end
 
     describe "#expecting_with_rspec?" do
-      before { config.stub(:require) }
+      before do
+        stub_const("Test::Unit::Assertions", Module.new)
+        config.stub(:require)
+      end
 
       it "returns false by default" do
         config.should_not be_expecting_with_rspec
@@ -314,12 +332,68 @@ module RSpec::Core
           config.files_to_run.should_not be_empty
         end
 
+        it "loads files in the default path when run with DRB (e.g., spork)" do
+          config.stub(:command) { 'spork' }
+          RSpec::Core::Runner.stub(:running_in_drb?) { true }
+          config.files_or_directories_to_run = []
+          config.files_to_run.should_not be_empty
+        end
+
         it "does not load files in the default path when run by ruby" do
           config.stub(:command) { 'ruby' }
           config.files_or_directories_to_run = []
           config.files_to_run.should be_empty
         end
       end
+
+      def specify_consistent_ordering_of_files_to_run
+        File.stub(:directory?).with('a') { true }
+
+        orderings = [
+          %w[ a/1.rb a/2.rb a/3.rb ],
+          %w[ a/2.rb a/1.rb a/3.rb ],
+          %w[ a/3.rb a/2.rb a/1.rb ]
+        ].map do |files|
+          Dir.should_receive(:[]).with(/^a/) { files }
+          yield
+          config.files_to_run
+        end
+
+        orderings.uniq.size.should eq(1)
+      end
+
+      context 'when the given directories match the pattern' do
+        it 'orders the files in a consistent ordering, regardless of the underlying OS ordering' do
+          specify_consistent_ordering_of_files_to_run do
+            config.pattern = 'a/*.rb'
+            config.files_or_directories_to_run = 'a'
+          end
+        end
+      end
+
+      context 'when the pattern is given relative to the given directories' do
+        it 'orders the files in a consistent ordering, regardless of the underlying OS ordering' do
+          specify_consistent_ordering_of_files_to_run do
+            config.pattern = '*.rb'
+            config.files_or_directories_to_run = 'a'
+          end
+        end
+      end
+
+      context 'when given multiple file paths' do
+        it 'orders the files in a consistent ordering, regardless of the given order' do
+          File.stub(:directory?) { false } # fake it into thinking these a full file paths
+
+          files = ['a/b/c_spec.rb', 'c/b/a_spec.rb']
+          config.files_or_directories_to_run = *files
+          ordering_1 = config.files_to_run
+
+          config.files_or_directories_to_run = *(files.reverse)
+          ordering_2 = config.files_to_run
+
+          expect(ordering_1).to eq(ordering_2)
+        end
+      end
     end
 
     %w[pattern= filename_pattern=].each do |setter|
@@ -503,33 +577,57 @@ module RSpec::Core
     %w[color color_enabled].each do |color_option|
       describe "##{color_option}=" do
         context "given true" do
-          context "with non-tty output and no autotest" do
+          before { config.send "#{color_option}=", true }
+
+          context "with config.tty? and output.tty?" do
             it "does not set color_enabled" do
-              config.output_stream = StringIO.new
-              config.output_stream.stub(:tty?) { false }
-              config.tty = false
-              config.send "#{color_option}=", true
-              config.send(color_option).should be_false
+              output = StringIO.new
+              config.output_stream = output
+
+              config.tty = true
+              config.output_stream.stub :tty? => true
+
+              config.send(color_option).should be_true
+              config.send(color_option, output).should be_true
             end
           end
 
-          context "with tty output" do
+          context "with config.tty? and !output.tty?" do
+            it "sets color_enabled" do
+              output = StringIO.new
+              config.output_stream = output
+
+              config.tty = true
+              config.output_stream.stub :tty? => false
+
+              config.send(color_option).should be_true
+              config.send(color_option, output).should be_true
+            end
+          end
+
+          context "with config.tty? and !output.tty?" do
             it "does not set color_enabled" do
-              config.output_stream = StringIO.new
-              config.output_stream.stub(:tty?) { true }
+              output = StringIO.new
+              config.output_stream = output
+
               config.tty = false
-              config.send "#{color_option}=", true
+              config.output_stream.stub :tty? => true
+
               config.send(color_option).should be_true
+              config.send(color_option, output).should be_true
             end
           end
 
-          context "with tty set" do
+          context "with !config.tty? and !output.tty?" do
             it "does not set color_enabled" do
-              config.output_stream = StringIO.new
-              config.output_stream.stub(:tty?) { false }
-              config.tty = true
-              config.send "#{color_option}=", true
-              config.send(color_option).should be_true
+              output = StringIO.new
+              config.output_stream = output
+
+              config.tty = false
+              config.output_stream.stub :tty? => false
+
+              config.send(color_option).should be_false
+              config.send(color_option, output).should be_false
             end
           end
 
@@ -546,18 +644,11 @@ module RSpec::Core
             end
 
             context "with ANSICON available" do
-              before(:all) do
-                @original_ansicon = ENV['ANSICON']
-                ENV['ANSICON'] = 'ANSICON'
-              end
-
-              after(:all) do
-                ENV['ANSICON'] = @original_ansicon
-              end
+              around(:each) { |e| with_env_vars('ANSICON' => 'ANSICON', &e) }
 
               it "enables colors" do
                 config.output_stream = StringIO.new
-                config.output_stream.stub(:tty?) { true }
+                config.output_stream.stub :tty? => true
                 config.send "#{color_option}=", true
                 config.send(color_option).should be_true
               end
@@ -631,23 +722,23 @@ module RSpec::Core
       end
 
       it "finds a formatter by class name" do
-        Object.const_set("ACustomFormatter", Class.new(Formatters::BaseFormatter))
-        config.add_formatter "ACustomFormatter"
-        config.formatters.first.should be_an_instance_of(ACustomFormatter)
+        stub_const("CustomFormatter", Class.new(Formatters::BaseFormatter))
+        config.add_formatter "CustomFormatter"
+        config.formatters.first.should be_an_instance_of(CustomFormatter)
       end
 
       it "finds a formatter by class fully qualified name" do
-        RSpec.const_set("CustomFormatter", Class.new(Formatters::BaseFormatter))
+        stub_const("RSpec::CustomFormatter", Class.new(Formatters::BaseFormatter))
         config.add_formatter "RSpec::CustomFormatter"
         config.formatters.first.should be_an_instance_of(RSpec::CustomFormatter)
       end
 
       it "requires a formatter file based on its fully qualified name" do
-        config.should_receive(:require).with('rspec/custom_formatter2') do
-          RSpec.const_set("CustomFormatter2", Class.new(Formatters::BaseFormatter))
+        config.should_receive(:require).with('rspec/custom_formatter') do
+          stub_const("RSpec::CustomFormatter", Class.new(Formatters::BaseFormatter))
         end
-        config.add_formatter "RSpec::CustomFormatter2"
-        config.formatters.first.should be_an_instance_of(RSpec::CustomFormatter2)
+        config.add_formatter "RSpec::CustomFormatter"
+        config.formatters.first.should be_an_instance_of(RSpec::CustomFormatter)
       end
 
       it "raises NameError if class is unresolvable" do
@@ -1128,6 +1219,14 @@ module RSpec::Core
         config.order.should eq("rand")
       end
 
+      it 'can set random ordering' do
+        config.force :seed => "rand:37"
+        RSpec.stub(:configuration => config)
+        list = [1, 2, 3, 4].extend(Extensions::Ordered::Examples)
+        Kernel.should_receive(:rand).and_return(3, 1, 4, 2)
+        list.ordered.should eq([2, 4, 1, 3])
+      end
+
       it "forces 'false' value" do
         config.add_setting :custom_option
         config.custom_option = true
@@ -1175,6 +1274,13 @@ module RSpec::Core
         it 'sets seed to 123' do
           config.seed.should eq(123)
         end
+
+        it 'sets up random ordering' do
+          RSpec.stub(:configuration => config)
+          list = [1, 2, 3, 4].extend(Extensions::Ordered::Examples)
+          Kernel.should_receive(:rand).and_return(3, 1, 4, 2)
+          list.ordered.should eq([2, 4, 1, 3])
+        end
       end
 
       context 'given "default"' do
@@ -1190,6 +1296,75 @@ module RSpec::Core
         it "sets the seed to nil" do
           config.seed.should be_nil
         end
+
+        it 'clears the random ordering' do
+          RSpec.stub(:configuration => config)
+          list = [1, 2, 3, 4].extend(Extensions::Ordered::Examples)
+          Kernel.should_not_receive(:rand)
+          list.ordered.should eq([1, 2, 3, 4])
+        end
+      end
+    end
+
+    describe "#order_examples" do
+      before { RSpec.stub(:configuration => config) }
+
+      it 'sets a block that determines the ordering of a collection extended with Extensions::Ordered::Examples' do
+        examples = [1, 2, 3, 4]
+        examples.extend Extensions::Ordered::Examples
+        config.order_examples { |examples| examples.reverse }
+        examples.ordered.should eq([4, 3, 2, 1])
+      end
+
+      it 'sets #order to "custom"' do
+        config.order_examples { |examples| examples.reverse }
+        config.order.should eq("custom")
+      end
+    end
+
+    describe "#example_ordering_block" do
+      it 'defaults to a block that returns the passed argument' do
+        config.example_ordering_block.call([1, 2, 3]).should eq([1, 2, 3])
+      end
+    end
+
+    describe "#order_groups" do
+      before { RSpec.stub(:configuration => config) }
+
+      it 'sets a block that determines the ordering of a collection extended with Extensions::Ordered::ExampleGroups' do
+        groups = [1, 2, 3, 4]
+        groups.extend Extensions::Ordered::ExampleGroups
+        config.order_groups { |groups| groups.reverse }
+        groups.ordered.should eq([4, 3, 2, 1])
+      end
+
+      it 'sets #order to "custom"' do
+        config.order_groups { |groups| groups.reverse }
+        config.order.should eq("custom")
+      end
+    end
+
+    describe "#group_ordering_block" do
+      it 'defaults to a block that returns the passed argument' do
+        config.group_ordering_block.call([1, 2, 3]).should eq([1, 2, 3])
+      end
+    end
+
+    describe "#order_groups_and_examples" do
+      let(:examples) { [1, 2, 3, 4].extend Extensions::Ordered::Examples }
+      let(:groups)   { [1, 2, 3, 4].extend Extensions::Ordered::ExampleGroups }
+
+      before do
+        RSpec.stub(:configuration => config)
+        config.order_groups_and_examples { |list| list.reverse }
+      end
+
+      it 'sets a block that determines the ordering of a collection extended with Extensions::Ordered::Examples' do
+        examples.ordered.should eq([4, 3, 2, 1])
+      end
+
+      it 'sets a block that determines the ordering of a collection extended with Extensions::Ordered::ExampleGroups' do
+        groups.ordered.should eq([4, 3, 2, 1])
       end
     end
   end