rspec-core 2.10.1 → 2.11.0

data/lib/rspec/core/let.rb

@@ -105,7 +105,6 @@ module RSpec
         mod.extend ExampleGroupMethods
         mod.__send__ :include, ExampleMethods
       end
-
     end
   end
 end

data/lib/rspec/core/mocking/with_mocha.rb

@@ -4,7 +4,6 @@ require 'mocha/object'
 module RSpec
   module Core
     module MockFrameworkAdapter
-      
       def self.framework_name; :mocha end
 
       # Mocha::Standalone was deprecated as of Mocha 0.9.7.
@@ -14,10 +13,17 @@ module RSpec
         include Mocha::Standalone
       end
 
-      alias :setup_mocks_for_rspec :mocha_setup
-      alias :verify_mocks_for_rspec :mocha_verify
-      alias :teardown_mocks_for_rspec :mocha_teardown
+      def setup_mocks_for_rspec
+        mocha_setup
+      end
+
+      def verify_mocks_for_rspec
+        mocha_verify
+      end
 
+      def teardown_mocks_for_rspec
+        mocha_teardown
+      end
     end
   end
 end

data/lib/rspec/core/option_parser.rb

@@ -134,8 +134,9 @@ FILTERING
           options[:pattern] = o
         end
 
-        parser.on('-e', '--example STRING', "Run examples whose full nested names include STRING") do |o|
-          options[:full_description] = Regexp.compile(Regexp.escape(o))
+        parser.on('-e', '--example STRING', "Run examples whose full nested names include STRING (may be',
+                                              '  used more than once)") do |o|
+          (options[:full_description] ||= []) << Regexp.compile(Regexp.escape(o))
         end
 
         parser.on('-l', '--line_number LINE', 'Specify line number of an example or group (may be',

data/lib/rspec/core/project_initializer.rb

@@ -44,7 +44,7 @@ CONTENT
             f.write <<-CONTENT
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper.rb"` to ensure that it is only
+# Require this file using `require "spec_helper"` to ensure that it is only
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
@@ -52,6 +52,12 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
 end
 CONTENT
           end

data/lib/rspec/core/runner.rb

@@ -1,5 +1,3 @@
-require 'drb/drb'
-
 module RSpec
   module Core
     class Runner
@@ -25,6 +23,7 @@ module RSpec
       end
 
       def self.running_in_drb?
+        defined?(DRb) &&
         (DRb.current_server rescue false) &&
          DRb.current_server.uri =~ /druby\:\/\/127.0.0.1\:/
       end
@@ -59,6 +58,7 @@ module RSpec
         options.parse_options
 
         if options.options[:drb]
+          require 'rspec/core/drb_command_line'
           begin
             DRbCommandLine.new(options).run(err, out)
           rescue DRb::DRbConnError

data/lib/rspec/core/shared_context.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
-    # Exposes [ExampleGroup](ExampleGroup)-level methods to a module, so you
-    # can include that module in an [ExampleGroup](ExampleGroup).
+    # Exposes {ExampleGroup}-level methods to a module, so you can include that
+    # module in an {ExampleGroup}.
     #
     # @example
     #

data/lib/rspec/core/shared_example_group.rb

@@ -1,27 +1,46 @@
 module RSpec
   module Core
     module SharedExampleGroup
-
       # @overload shared_examples(name, &block)
       # @overload shared_examples(name, tags, &block)
       #
-      # Creates and stores (but does not evaluate) the block.
+      # Wraps the `block` in a module which can then be included in example
+      # groups using `include_examples`, `include_context`, or
+      # `it_behaves_like`.
+      #
+      # @param [String] name to match when looking up this shared group
+      # @param block to be eval'd in a nested example group generated by `it_behaves_like`
+      #
+      # @example
+      #
+      #   shared_examples "auditable" do
+      #     it "stores an audit record on save!" do
+      #       lambda { auditable.save! }.should change(Audit, :count).by(1)
+      #     end
+      #   end
+      #
+      #   class Account do
+      #     it_behaves_like "auditable" do
+      #       def auditable; Account.new; end
+      #     end
+      #   end
       #
+      # @see ExampleGroup.it_behaves_like
       # @see ExampleGroup.include_examples
       # @see ExampleGroup.include_context
-      def shared_examples(*args, &block)
-        if [String, Symbol, Module].any? {|cls| cls === args.first }
-          object = args.shift
-          ensure_shared_example_group_name_not_taken(object)
-          RSpec.world.shared_example_groups[object] = block
+      def shared_examples *args, &block
+        if key? args.first
+          key = args.shift
+          raise_key_taken key if key_taken? key
+          RSpec.world.shared_example_groups[key] = block
         end
 
         unless args.empty?
           mod = Module.new
-          (class << mod; self; end).send(:define_method, :extended) do |host|
-            host.class_eval(&block)
+          (class << mod; self; end).send :define_method, :extended  do |host|
+            host.class_eval &block
           end
-          RSpec.configuration.extend(mod, *args)
+          RSpec.configuration.extend mod, *args
         end
       end
 
@@ -55,16 +74,21 @@ module RSpec
 
     private
 
+      def key? candidate
+        [String, Symbol, Module].any? { |cls| cls === candidate }
+      end
+
       def raise_name_error
         raise NameError, "The first argument (#{name}) to share_as must be a legal name for a constant not already in use."
       end
 
-      def ensure_shared_example_group_name_not_taken(name)
-        if RSpec.world.shared_example_groups.has_key?(name)
-          raise ArgumentError.new("Shared example group '#{name}' already exists")
-        end
+      def raise_key_taken key
+        raise ArgumentError, "Shared example group '#{key}' already exists"
       end
 
+      def key_taken? key
+        RSpec.world.shared_example_groups.has_key?(key)
+      end
     end
   end
 end

data/lib/rspec/core/subject.rb

@@ -2,14 +2,7 @@ module RSpec
   module Core
     module Subject
       module ExampleMethods
-
-        # Returns the subject defined by the example group. The subject block
-        # is only executed once per example, the result of which is cached and
-        # returned by any subsequent calls to `subject`.
-        #
-        # If a class is passed to `describe` and no subject is explicitly
-        # declared in the example group, then `subject` will return a new
-        # instance of that class.
+        # Returns the example group's `subject`.
         #
         # @note `subject` was contributed by Joe Ferris to support the one-liner
         #   syntax embraced by shoulda matchers:
@@ -19,9 +12,8 @@ module RSpec
         #       end
         #
         #   While the examples below demonstrate how to use `subject`
-        #   explicitly in specs, we think it works best for extensions like
-        #   shoulda, custom matchers, and shared example groups, where it is
-        #   not referenced explicitly in specs.
+        #   explicitly in examples, we recommend that you define a method with
+        #   an intention revealing name instead.
         #
         # @example
         #
@@ -30,6 +22,7 @@ module RSpec
         #     subject { Person.new(:birthdate => 19.years.ago) }
         #     it "should be eligible to vote" do
         #       subject.should be_eligible_to_vote
+        #       # ^ ^ explicit reference to subject not recommended
         #     end
         #   end
         #
@@ -37,13 +30,17 @@ module RSpec
         #   describe Person do
         #     it "should be eligible to vote" do
         #       subject.should be_eligible_to_vote
+        #       # ^ ^ explicit reference to subject not recommended
         #     end
         #   end
         #
+        #   # one-liner syntax - should is invoked on subject
         #   describe Person do
-        #     # one liner syntax - should is invoked on subject
         #     it { should be_eligible_to_vote }
         #   end
+        #
+        # @see ExampleGroupMethods#subject
+        # @see #should
         def subject
           if defined?(@original_subject)
             @original_subject
@@ -52,37 +49,37 @@ module RSpec
           end
         end
 
-        begin
-          require 'rspec/expectations/handler'
-
-          # When +should+ is called with no explicit receiver, the call is
-          # delegated to the object returned by +subject+. Combined with
-          # an implicit subject (see +subject+), this supports very concise
-          # expressions.
-          #
-          # @example
-          #
-          #   describe Person do
-          #     it { should be_eligible_to_vote }
-          #   end
-          def should(matcher=nil, message=nil)
-            RSpec::Expectations::PositiveExpectationHandler.handle_matcher(subject, matcher, message)
-          end
+        # When `should` is called with no explicit receiver, the call is
+        # delegated to the object returned by `subject`. Combined with an
+        # implicit subject this supports very concise expressions.
+        #
+        # @example
+        #
+        #   describe Person do
+        #     it { should be_eligible_to_vote }
+        #   end
+        #
+        # @see #subject
+        def should(matcher=nil, message=nil)
+          RSpec::Expectations::PositiveExpectationHandler.handle_matcher(subject, matcher, message)
+        end
 
-          # Just like +should+, +should_not+ delegates to the subject (implicit or
-          # explicit) of the example group.
-          #
-          # @example
-          #
-          #   describe Person do
-          #     it { should_not be_eligible_to_vote }
-          #   end
-          def should_not(matcher=nil, message=nil)
-            RSpec::Expectations::NegativeExpectationHandler.handle_matcher(subject, matcher, message)
-          end
-        rescue LoadError
+        # Just like `should`, `should_not` delegates to the subject (implicit or
+        # explicit) of the example group.
+        #
+        # @example
+        #
+        #   describe Person do
+        #     it { should_not be_eligible_to_vote }
+        #   end
+        #
+        # @see #subject
+        def should_not(matcher=nil, message=nil)
+          RSpec::Expectations::NegativeExpectationHandler.handle_matcher(subject, matcher, message)
         end
 
+        private
+
         def _attribute_chain(attribute)
           attribute.to_s.split('.')
         end
@@ -95,7 +92,7 @@ module RSpec
       end
 
       module ExampleGroupMethods
-        # Creates a nested example group named by the submitted +attribute+,
+        # Creates a nested example group named by the submitted `attribute`,
         # and then generates an example using the submitted block.
         #
         # @example
@@ -114,8 +111,8 @@ module RSpec
         #     end
         #   end
         #
-        # The attribute can be a +Symbol+ or a +String+. Given a +String+
-        # with dots, the result is as though you concatenated that +String+
+        # The attribute can be a `Symbol` or a `String`. Given a `String`
+        # with dots, the result is as though you concatenated that `String`
         # onto the subject in an expression.
         #
         # @example
@@ -130,8 +127,8 @@ module RSpec
         #     its("phone_numbers.first") { should eq("555-1212") }
         #   end
         #
-        # When the subject is a +Hash+, you can refer to the Hash keys by
-        # specifying a +Symbol+ or +String+ in an array.
+        # When the subject is a `Hash`, you can refer to the Hash keys by
+        # specifying a `Symbol` or `String` in an array.
         #
         # @example
         #
@@ -165,19 +162,38 @@ module RSpec
           end
         end
 
-        # Defines an explicit subject for an example group which can then be the
-        # implicit receiver (through delegation) of calls to +should+.
+        # Declares a `subject` for an example group which can then be the
+        # implicit receiver (through delegation) of calls to `should`.
+        #
+        # Given a `name`, defines a method with that name which returns the
+        # `subject`. This lets you declare the subject once and access it
+        # implicitly in one-liners and explicitly using an intention revealing
+        # name.
+        #
+        # @param [String,Symbol] name used to define an accessor with an
+        #   intention revealing name
+        # @param block defines the value to be returned by `subject` in examples
         #
         # @example
         #
         #   describe CheckingAccount, "with $50" do
-        #     subject { CheckingAccount.new(:amount => 50, :currency => :USD) }
-        #     it { should have_a_balance_of(50, :USD) }
+        #     subject { CheckingAccount.new(Money.new(50, :USD)) }
+        #     it { should have_a_balance_of(Money.new(50, :USD)) }
         #     it { should_not be_overdrawn }
         #   end
         #
-        # See +ExampleMethods#should+ for more information about this approach.
-        def subject(&block)
+        #   describe CheckingAccount, "with a non-zero starting balance" do
+        #     subject(:account) { CheckingAccount.new(Money.new(50, :USD)) }
+        #     it { should_not be_overdrawn }
+        #     it "has a balance equal to the starting balance" do
+        #       account.balance.should eq(Money.new(50, :USD))
+        #     end
+        #   end
+        #
+        # @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
         end
 
@@ -198,7 +214,6 @@ module RSpec
           Class === described ? proc { described.new } : proc { described }
         end
       end
-
     end
   end
 end

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.10.1'
+      STRING = '2.11.0'
     end
   end
 end

data/spec/rspec/core/command_line_spec.rb

@@ -5,162 +5,104 @@ require 'tmpdir'
 module RSpec::Core
   describe CommandLine do
 
-    describe "#run" do
-      include_context "spec files"
-
-      let(:out)    { StringIO.new }
-      let(:err)    { StringIO.new }
+    let(:out)    { StringIO.new         }
+    let(:err)    { StringIO.new         }
+    let(:config) { RSpec::configuration }
+    let(:world)  { RSpec::world         }
 
-      def command_line(args)
-        RSpec::Core::CommandLine.new(config_options(args))
-      end
+    before { config.stub :run_hook }
 
-      def config_options(argv=[])
-        options = RSpec::Core::ConfigurationOptions.new(argv)
-        options.parse_options
-        options
-      end
+    it "configures streams before command line options" do
+      config.stub :load_spec_files
 
-      it "returns 0 if spec passes" do
-        result = command_line([passing_spec_filename]).run(err, out)
-        result.should be(0)
-      end
+      # this is necessary to ensure that color works correctly on windows
+      config.should_receive(:error_stream=).ordered
+      config.should_receive(:output_stream=).ordered
+      config.should_receive(:force).at_least(:once).ordered
 
-      it "returns 1 if spec fails" do
-        result = command_line([failing_spec_filename]).run(err, out)
-        result.should be(1)
-      end
-
-      it "returns 2 if spec fails and --failure-exit-code is 2" do
-        result = command_line([failing_spec_filename, "--failure-exit-code", "2"]).run(err, out)
-        result.should be(2)
-      end
+      command_line = build_command_line
+      command_line.run err, out
     end
 
-    context "given an Array of options" do
-      it "assigns ConfigurationOptions built from Array to @options" do
-        config_options = ConfigurationOptions.new(%w[--color])
-        config_options.parse_options
-
-        array_options = %w[--color]
-        command_line = CommandLine.new(array_options)
-        command_line.instance_eval { @options.options }.should eq(config_options.options)
-      end
+    it "assigns ConfigurationOptions built from Array of options to @options" do
+      config_options = ConfigurationOptions.new(%w[--color])
+      command_line   = CommandLine.new(%w[--color])
+      command_line.instance_eval { @options.options }.should eq(config_options.parse_options)
     end
 
-    context "given a ConfigurationOptions object" do
-      it "assigns it to @options" do
-        config_options = ConfigurationOptions.new(%w[--color])
-        config_options.parse_options
-        command_line = CommandLine.new(config_options)
-        command_line.instance_eval { @options }.should be(config_options)
-      end
+    it "assigns submitted ConfigurationOptions to @options" do
+      config_options = ConfigurationOptions.new(%w[--color])
+      command_line   = CommandLine.new(config_options)
+      command_line.instance_eval { @options }.should be(config_options)
     end
 
     describe "#run" do
-      let(:config_options) do
-        config_options = ConfigurationOptions.new(%w[--color])
-        config_options.parse_options
-        config_options
-      end
-
-      let(:config) do
-        RSpec::Core::Configuration.new
-      end
-
-      let(:world) do
-        RSpec::Core::World.new
-      end
+      context "running files" do
+        include_context "spec files"
 
-      let(:command_line) do
-        CommandLine.new(config_options, config, world)
-      end
-
-      let(:out) { ::StringIO.new }
-      let(:err) { ::StringIO.new }
-
-      before do
-        config.stub(:run_hook)
+        it "returns 0 if spec passes" do
+          command_line = build_command_line passing_spec_filename
+          command_line.run(err, out).should eq 0
+        end
 
-        config.should_receive(:load_spec_files)
+        it "returns 1 if spec fails" do
+          command_line = build_command_line failing_spec_filename
+          command_line.run(err, out).should eq 1
+        end
 
-        world.should_receive(:announce_inclusion_filter)
-        world.should_receive(:announce_exclusion_filter)
+        it "returns 2 if spec fails and --failure-exit-code is 2" do
+          command_line = build_command_line failing_spec_filename, "--failure-exit-code", "2"
+          command_line.run(err, out).should eq 2
+        end
       end
 
-      it "configures streams before command line options" do
-        # this is necessary to ensure that color works correctly on windows
-        config.should_receive(:error_stream=).ordered
-        config.should_receive(:output_stream=).ordered
-        config.should_receive(:force).any_number_of_times.ordered
-        command_line.run(err, out) rescue nil
-      end
+      context "running hooks" do
+        before { config.stub :load_spec_files }
 
-      it "runs before suite hooks" do
-        config.should_receive(:run_hook).with(:before, :suite)
-        command_line.run(err, out)
-      end
+        it "runs before suite hooks" do
+          config.should_receive(:run_hook).with(:before, :suite)
+          command_line = build_command_line
+          command_line.run err, out
+        end
 
-      it "runs after suite hooks" do
-        config.should_receive(:run_hook).with(:after, :suite)
-        command_line.run(err, out)
-      end
+        it "runs after suite hooks" do
+          config.should_receive(:run_hook).with(:after, :suite)
+          command_line = build_command_line
+          command_line.run err, out
+        end
 
-      it "runs after suite hooks even after an error" do
-        after_suite_called = false
-        config.stub(:run_hook) do |*args|
-          case args.first
-          when :before
-            raise "this error"
-          when :after
-            after_suite_called = true
-          end
+        it "runs after suite hooks even after an error" do
+          config.should_receive(:run_hook).with(:before, :suite).and_raise "this error"
+          config.should_receive(:run_hook).with(:after , :suite)
+          expect do
+            command_line = build_command_line
+            command_line.run err, out
+          end.to raise_error
         end
-        expect do
-          command_line.run(err, out)
-        end.to raise_error
-        after_suite_called.should be_true
       end
-
     end
 
     describe "#run with custom output" do
-      let(:config_options) do
-        config_options = ConfigurationOptions.new(%w[--color])
-        config_options.parse_options
-        config_options
-      end
+      before { config.stub :files_to_run => [] }
 
-      let(:command_line) do
-        CommandLine.new(config_options, config)
-      end
-
-      let(:output_file_path) do
-        Dir.tmpdir + "/command_line_spec_output.txt"
-      end
+      let(:output_file) { File.new("#{Dir.tmpdir}/command_line_spec_output.txt", 'w') }
 
-      let(:output_file) do
-        File.new(output_file_path, 'w')
-      end
-
-      let(:config) do
-        config = RSpec::Core::Configuration.new
+      it "doesn't override output_stream" do
         config.output_stream = output_file
-        config
-      end
-
-      let(:out) { ::StringIO.new }
-
-      before do
-        config.stub(:run_hook)
-        config.stub(:files_to_run) { [] }
+        command_line = build_command_line
+        command_line.run err, out
+        command_line.instance_eval { @configuration.output_stream }.should eq output_file
       end
+    end
 
-      it "doesn't override output_stream" do
-        command_line.run(out, out)
-        command_line.instance_eval { @configuration.output_stream }.should eql(output_file)
-      end
+    def build_command_line *args
+      CommandLine.new build_config_options(*args)
     end
 
+    def build_config_options *args
+      options = ConfigurationOptions.new args
+      options.parse_options
+      options
+    end
   end
 end