rspec-core 2.3.1 → 2.4.0

data/features/step_definitions/additional_cli_steps.rb

@@ -14,3 +14,7 @@ Then /^the example(s)? should( all)? pass$/ do |*|
   Then %q{the output should contain "0 failures"}
   Then %q{the exit status should be 0}
 end
+
+Then /^the file "([^"]*)" should contain:$/ do |file, partial_content|
+  check_file_content(file, partial_content, true)
+end

data/features/subject/attribute_of_subject.feature

@@ -1,29 +1,43 @@
 Feature: attribute of subject
 
   Use the its() method as a short-hand to generate a nested example group with
-  a single example that specifies the expected value of an attribute of the subject.
-  This can be used with an implicit or explicit subject.
+  a single example that specifies the expected value of an attribute of the
+  subject.  This can be used with an implicit or explicit subject.
 
-  its() accepts a symbol or a string, and a block representing the example. Use
-  a string with dots to specify a nested attribute (i.e. an attribute of the
-  attribute of the subject).
+  its() accepts a symbol or a string, and a block representing the example.
 
-  Scenario: simple attribute
+      its(:size)    { should eq(1) }
+      its("length") { should eq(1) }
+
+  You can use a string with dots to specify a nested attribute (i.e. an
+  attribute of the attribute of the subject).
+
+      its("phone_numbers.size") { should eq(2) }
+
+  When the subject is a hash, you can pass in an array with a single key to
+  access the value at that key in the hash.
+
+      its([:key]) { should eq(value) }
+
+  Scenario: specify value of an attribute
     Given a file named "example_spec.rb" with:
       """
       describe Array do
-        its(:size) { should == 0 }
+        context "when first created" do
+          its(:size) { should eq(0) }
+        end
       end
       """
     When I run "rspec example_spec.rb --format documentation"
     Then the output should contain:
       """
       Array
-        size
-          should == 0
+        when first created
+          size
+            should == 0
       """
 
-  Scenario: nested attribute
+  Scenario: specify value of a nested attribute
     Given a file named "example_spec.rb" with:
       """
       class Person
@@ -34,19 +48,55 @@ Feature: attribute of subject
       end
 
       describe Person do
-        subject do
-          person = Person.new
-          person.phone_numbers << "555-1212"
-          person
-        end
+        context "with one phone number (555-1212)"do
+          subject do
+            person = Person.new
+            person.phone_numbers << "555-1212"
+            person
+          end
 
-        its("phone_numbers.first") { should == "555-1212" }
+          its("phone_numbers.first") { should eq("555-1212") }
+        end
       end
       """
     When I run "rspec example_spec.rb --format documentation"
     Then the output should contain:
       """
       Person
-        phone_numbers.first
-          should == "555-1212"
+        with one phone number (555-1212)
+          phone_numbers.first
+            should == 555-1212
+      """
+
+  Scenario: specify value of an attribute of a hash
+    Given a file named "example_spec.rb" with:
+      """
+      describe Hash do
+        context "with two items" do
+          subject do
+            {:one => 'one', :two => 'two'}
+          end
+
+          its(:size) { should eq(2) }
+        end
+      end
+      """
+    When I run "rspec example_spec.rb"
+    Then the output should contain "1 example, 0 failures"
+
+  Scenario: specify value for key in a hash
+    Given a file named "example_spec.rb" with:
+      """
+      describe Hash do
+        context "with keys :one and 'two'" do
+          subject do
+            {:one => 1, "two" => 2}
+          end
+
+          its([:one]) { should eq(1) }
+          its(["two"]) { should eq(2) }
+        end
+      end
       """
+    When I run "rspec example_spec.rb"
+    Then the output should contain "2 examples, 0 failures"

data/lib/rspec/core/command_line_configuration.rb

@@ -16,7 +16,7 @@ module RSpec
 "#{@command}" is not valid a valid argument to "rspec --configure".
 Supported options are:
 
-  rspec --configure autotest # generates configuration to run autotest with rspec
+  rspec --configure autotest # generates .rspec file
 
 #{"*"*50}
 MESSAGE
@@ -26,26 +26,26 @@ MESSAGE
       class Autotest
         class << self
           def generate
-            create_autotest_directory
-            create_discover_file
-            puts "autotest/discover.rb has been added"
+            create_dot_rspec_file
+            remove_autotest_dir_if_present
           end
 
-          def create_autotest_directory
-            Dir.mkdir('autotest') unless File.exist?('autotest')
-          end
-
-          def create_discover_file
-            optionally_remove_discover_file if discover_file_exists?
-            File.open(discover_file_path, 'w') do |file|
-              file << 'Autotest.add_discovery { "rspec2" }'
+          def create_dot_rspec_file
+            puts "Autotest loads RSpec's Autotest subclass when there is a .rspec file in the project's root directory."
+            if File.exist?('./.rspec')
+              puts ".rspec file already exists, so nothing was changed."
+            else
+              FileUtils.touch('./.rspec')
+              puts ".rspec file did not exist, so it was created."
             end
           end
 
-          def optionally_remove_discover_file
-            print "Discover file already exists, overwrite [y/N]? "
-            exit if gets !~ /y/i
-            FileUtils.rm_rf(discover_file_path)
+          def remove_autotest_dir_if_present
+            if discover_file_exists?
+              print "Delete obsolete autotest/discover.rb [y/n]? "
+              exit if gets !~ /y/i
+              FileUtils.rm_rf(discover_file_path)
+            end
           end
 
           def discover_file_exists?

data/lib/rspec/core/configuration.rb

@@ -24,7 +24,7 @@ module RSpec
       add_setting :drb
       add_setting :drb_port
       add_setting :profile_examples
-      add_setting :fail_fast, :default => false
+      add_setting :fail_fast
       add_setting :run_all_when_everything_filtered
       add_setting :filter
       add_setting :exclusion_filter
@@ -240,6 +240,7 @@ module RSpec
         return unless bool
         begin
           require 'ruby-debug'
+          Debugger.start
         rescue LoadError
           raise <<-EOM
 
@@ -262,28 +263,26 @@ EOM
         filter_run({ :full_description => /#{description}/ }, true)
       end
 
-      attr_writer :formatter_class
-
-      def formatter_class
-        @formatter_class ||= begin
-                               require 'rspec/core/formatters/progress_formatter'
-                               RSpec::Core::Formatters::ProgressFormatter
-                             end
-      end
-
-      def formatter=(formatter_to_use)
-        self.formatter_class =
+      def add_formatter(formatter_to_use, output=nil)
+        formatter_class =
           built_in_formatter(formatter_to_use) ||
           custom_formatter(formatter_to_use) ||
           (raise ArgumentError, "Formatter '#{formatter_to_use}' unknown - maybe you meant 'documentation' or 'progress'?.")
+
+        formatters << formatter_class.new(output ? File.new(output, 'w') : self.output)
       end
 
-      def formatter
-        @formatter ||= formatter_class.new(output)
+      alias_method :formatter=, :add_formatter
+
+      def formatters
+        @formatters ||= []
       end
 
       def reporter
-        @reporter ||= Reporter.new(formatter)
+        @reporter ||= begin
+                        add_formatter('progress') if formatters.empty?
+                        Reporter.new(*formatters)
+                      end
       end
 
       def files_or_directories_to_run=(*files)

data/lib/rspec/core/configuration_options.rb

@@ -1,5 +1,5 @@
-require 'optparse'
 # http://www.ruby-doc.org/stdlib/libdoc/optparse/rdoc/classes/OptionParser.html
+require 'optparse'
 
 module RSpec
   module Core
@@ -18,8 +18,14 @@ module RSpec
         keys = options.keys
         keys.unshift(:requires) if keys.delete(:requires)
         keys.unshift(:libs)     if keys.delete(:libs)
+        formatters = options[:formatters] if keys.delete(:formatters)
         keys.each do |key|
-          config.send("#{key}=", options[key])
+          config.send("#{key}=", options[key]) if config.respond_to?("#{key}=")
+        end
+        if formatters
+          formatters.each do |pair|
+            config.add_formatter(*pair)
+          end
         end
       end
 
@@ -30,9 +36,17 @@ module RSpec
         argv << "--backtrace" if options[:full_backtrace]
         argv << "--tty"       if options[:tty]
         argv << "--fail-fast"  if options[:fail_fast]
-        argv << "--format"       << options[:formatter]               if options[:formatter]
         argv << "--line_number"  << options[:line_number]             if options[:line_number]
+        argv << "--options"      << options[:custom_options_file]            if options[:custom_options_file]
         argv << "--example"      << options[:full_description].source if options[:full_description]
+        if options[:formatters]
+          options[:formatters].each do |pair|
+            argv << "--format" << pair.shift
+            unless pair.empty?
+              argv << "--out" << pair.shift
+            end
+          end
+        end
         (options[:libs] || []).each do |path|
           argv << "-I" << path
         end
@@ -44,12 +58,17 @@ module RSpec
 
       def parse_options
         @options = begin
-                     command_line_options = parse_command_line_options
-                     local_options        = parse_local_options(command_line_options)
-                     global_options       = parse_global_options
-                     env_options          = parse_env_options
+                     options_to_merge = []
+                     if custom_options_file
+                       options_to_merge << custom_options
+                     else
+                       options_to_merge << global_options
+                       options_to_merge << local_options
+                     end
+                     options_to_merge << env_options
+                     options_to_merge << command_line_options
 
-                     [global_options, local_options, command_line_options, env_options].inject do |merged, options|
+                     options_to_merge.inject do |merged, options|
                        merged.merge(options)
                      end
                    end
@@ -57,28 +76,34 @@ module RSpec
 
     private
 
-      def parse_env_options
+      def env_options
         ENV["SPEC_OPTS"] ? Parser.parse!(ENV["SPEC_OPTS"].split) : {}
       end
 
-      def parse_command_line_options
-        options = Parser.parse!(@args)
-        options[:files_or_directories_to_run] = @args
-        options
+      def command_line_options
+        @command_line_options ||= begin
+                                    options = Parser.parse!(@args)
+                                    options[:files_or_directories_to_run] = @args
+                                    options
+                                  end
       end
 
-      def parse_local_options(options)
-        parse_options_file(local_options_file(options))
+      def custom_options
+        options_from(custom_options_file)
       end
 
-      def parse_global_options
-        parse_options_file(GLOBAL_OPTIONS_FILE)
+      def local_options
+        @local_options ||= options_from(LOCAL_OPTIONS_FILE)
       end
 
-      def parse_options_file(path)
+      def global_options
+        @global_options ||= options_from(GLOBAL_OPTIONS_FILE)
+      end
+
+      def options_from(path)
         Parser.parse(args_from_options_file(path))
       end
-      
+
       def args_from_options_file(path)
         return [] unless File.exist?(path)
         config_string = options_file_as_erb_string(path)
@@ -90,9 +115,8 @@ module RSpec
         ERB.new(IO.read(path)).result(binding)
       end
 
-      def local_options_file(options)
-        return options[:options_file] if options[:options_file]
-        LOCAL_OPTIONS_FILE
+      def custom_options_file
+        command_line_options[:custom_options_file]
       end
     end
   end

data/lib/rspec/core/example.rb

@@ -2,7 +2,7 @@ module RSpec
   module Core
     class Example
 
-      attr_reader :metadata, :options
+      attr_reader :metadata, :options, :example_group_instance
 
       def self.delegate_to_metadata(*keys)
         keys.each do |key|
@@ -23,6 +23,15 @@ module RSpec
         @example_group_class
       end
 
+      def around_hooks
+        @around_hooks ||= example_group.around_hooks_for(self)
+      end
+
+      def apply?(predicate, filters)
+        @metadata.apply?(predicate, filters) ||
+        @example_group_class.apply?(predicate, filters)
+      end
+
       alias_method :pending?, :pending
 
       def run(example_group_instance, reporter)
@@ -69,8 +78,9 @@ module RSpec
       class Procsy < Proc
         attr_reader :metadata
         alias_method :run, :call
-        def initialize(metadata)
+        def initialize(metadata, &block)
           @metadata = metadata
+          super(&block)
         end
       end
 
@@ -84,10 +94,10 @@ module RSpec
       end
 
       def with_around_hooks
-        if @example_group_class.around_hooks.empty?
+        if around_hooks.empty?
           yield
         else
-          @example_group_class.eval_around_eachs(@example_group_instance, Procsy.new(metadata)).call
+          @example_group_class.eval_around_eachs(self, Procsy.new(metadata)).call
         end
       end
 
@@ -123,11 +133,11 @@ module RSpec
 
       def run_before_each
         @example_group_instance.setup_mocks_for_rspec if @example_group_instance.respond_to?(:setup_mocks_for_rspec)
-        @example_group_class.eval_before_eachs(@example_group_instance)
+        @example_group_class.eval_before_eachs(self)
       end
 
       def run_after_each
-        @example_group_class.eval_after_eachs(@example_group_instance)
+        @example_group_class.eval_after_eachs(self)
         @example_group_instance.verify_mocks_for_rspec if @example_group_instance.respond_to?(:verify_mocks_for_rspec)
       ensure
         @example_group_instance.teardown_mocks_for_rspec if @example_group_instance.respond_to?(:teardown_mocks_for_rspec)

data/lib/rspec/core/example_group.rb

@@ -177,22 +177,22 @@ module RSpec
         store_before_all_ivars(example_group_instance)
       end
 
-      def self.eval_around_eachs(example_group_instance, initial_procsy)
-        around_hooks.reverse.inject(initial_procsy) do |procsy, around_hook|
+      def self.eval_around_eachs(example, initial_procsy)
+        example.around_hooks.reverse.inject(initial_procsy) do |procsy, around_hook|
           Example::Procsy.new(procsy.metadata) do
-            example_group_instance.instance_eval_with_args(procsy, &around_hook)
+            example.example_group_instance.instance_eval_with_args(procsy, &around_hook)
           end
         end
       end
 
-      def self.eval_before_eachs(example_group_instance)
-        world.run_hook_filtered(:before, :each, self, example_group_instance)
-        ancestors.reverse.each { |ancestor| ancestor.run_hook(:before, :each, example_group_instance) }
+      def self.eval_before_eachs(example)
+        world.run_hook_filtered(:before, :each, self, example.example_group_instance, example)
+        ancestors.reverse.each { |ancestor| ancestor.run_hook(:before, :each, example.example_group_instance) }
       end
 
-      def self.eval_after_eachs(example_group_instance)
-        ancestors.each { |ancestor| ancestor.run_hook(:after, :each, example_group_instance) }
-        world.run_hook_filtered(:after, :each, self, example_group_instance)
+      def self.eval_after_eachs(example)
+        ancestors.each { |ancestor| ancestor.run_hook(:after, :each, example.example_group_instance) }
+        world.run_hook_filtered(:after, :each, self, example.example_group_instance, example)
       end
 
       def self.eval_after_alls(example_group_instance)
@@ -215,8 +215,8 @@ An error occurred in an after(:all) hook.
         world.run_hook_filtered(:after, :all, self, example_group_instance) if top_level?
       end
 
-      def self.around_hooks
-        @around_hooks ||= (world.find_hook(:around, :each, self) + ancestors.reverse.inject([]){|l,a| l + a.find_hook(:around, :each, self)})
+      def self.around_hooks_for(example)
+        world.find_hook(:around, :each, self, example) + ancestors.reverse.inject([]){|l,a| l + a.find_hook(:around, :each, self, example)}
       end
 
       def self.run(reporter)