rspec-core 2.8.0.rc2 → 2.8.0

data/lib/autotest/rspec2.rb

@@ -1,6 +1,10 @@
 require 'autotest'
 require 'rspec/core/deprecation'
 
+# Derived from the `Autotest` class, extends the `autotest` command to work
+# with RSpec.
+#
+# @note this will be extracted to a separate gem when we release rspec-3.
 class Autotest::Rspec2 < Autotest
 
   RSPEC_EXECUTABLE = File.expand_path('../../../exe/rspec', __FILE__)

data/lib/rspec/core/configuration.rb

@@ -205,7 +205,7 @@ MESSAGE
         @preferred_options.merge!(hash)
       end
 
-      # @api private
+      # @private
       def reset
         @reporter = nil
         @formatters.clear
@@ -257,6 +257,9 @@ MESSAGE
       # Used by formatters to ask whether a backtrace line should be displayed
       # or not, based on the line matching any `backtrace_clean_patterns`.
       def cleaned_from_backtrace?(line)
+        # TODO (David 2011-12-25) why are we asking the configuration to do
+        # stuff? Either use the patterns directly or enapsulate the filtering
+        # in a BacktraceCleaner object.
         backtrace_clean_patterns.any? { |regex| line =~ regex }
       end
 
@@ -462,6 +465,7 @@ EOM
                       end
       end
 
+      # @private
       def files_or_directories_to_run=(*files)
         files = files.flatten
         files << default_path if command == 'rspec' && default_path && files.empty?
@@ -597,17 +601,76 @@ EOM
         filter_manager.exclusions
       end
 
-      def include(mod, *args)
-        filters = build_metadata_hash_from(args)
-        include_or_extend_modules << [:include, mod, filters]
+      # Tells RSpec to include `mod` in example groups. Methods defined in
+      # `mod` are exposed to examples (not example groups).  Use `filters` to
+      # constrain the groups in which to include the module.
+      #
+      # @example
+      #
+      #     module AuthenticationHelpers
+      #       def login_as(user)
+      #         # ...
+      #       end
+      #     end
+      #
+      #     module UserHelpers
+      #       def users(username)
+      #         # ...
+      #       end
+      #     end
+      #
+      #     RSpec.configure do |config|
+      #       config.include(UserHelpers) # included in all modules
+      #       config.include(AuthenticationHelpers, :type => :request)
+      #     end
+      #
+      #     describe "edit profile", :type => :request do
+      #       it "can be viewed by owning user" do
+      #         login_as users(:jdoe)
+      #         get "/profiles/jdoe"
+      #         assert_select ".username", :text => 'jdoe'
+      #       end
+      #     end
+      #
+      # @see #extend
+      def include(mod, *filters)
+        include_or_extend_modules << [:include, mod, build_metadata_hash_from(filters)]
       end
 
-      def extend(mod, *args)
-        filters = build_metadata_hash_from(args)
-        include_or_extend_modules << [:extend, mod, filters]
+      # Tells RSpec to extend example groups with `mod`.  Methods defined in
+      # `mod` are exposed to example groups (not examples).  Use `filters` to
+      # constrain the groups to extend.
+      #
+      # Similar to `include`, but behavior is added to example groups, which
+      # are classes, rather than the examples, which are instances of those
+      # classes.
+      #
+      # @example
+      #
+      #     module UiHelpers
+      #       def run_in_browser
+      #         # ...
+      #       end
+      #     end
+      #
+      #     RSpec.configure do |config|
+      #       config.extend(UiHelpers, :type => :request)
+      #     end
+      #
+      #     describe "edit profile", :type => :request do
+      #       run_in_browser
+      #
+      #       it "does stuff in the client" do
+      #         # ...
+      #       end
+      #     end
+      #
+      # @see #include
+      def extend(mod, *filters)
+        include_or_extend_modules << [:extend, mod, build_metadata_hash_from(filters)]
       end
 
-      # @api private
+      # @private
       #
       # Used internally to extend a group with modules using `include` and/or
       # `extend`.
@@ -618,21 +681,21 @@ EOM
         end
       end
 
-      # @api private
+      # @private
       def configure_mock_framework
         RSpec::Core::ExampleGroup.send(:include, mock_framework)
       end
 
-      # @api private
+      # @private
       def configure_expectation_framework
         expectation_frameworks.each do |framework|
           RSpec::Core::ExampleGroup.send(:include, framework)
         end
       end
 
-      # @api private
+      # @private
       def load_spec_files
-        files_to_run.map {|f| load File.expand_path(f) }
+        files_to_run.uniq.map {|f| load File.expand_path(f) }
         raise_if_rspec_1_is_loaded
       end
 

data/lib/rspec/core/dsl.rb

@@ -1,5 +1,6 @@
 module RSpec
   module Core
+    # Adds the `describe` method to the top-level namespace.
     module DSL
       # Generates a subclass of [ExampleGroup](ExampleGroup)
       #

data/lib/rspec/core/formatters/base_text_formatter.rb

@@ -16,20 +16,18 @@ module RSpec
           output.puts "Failures:"
           failed_examples.each_with_index do |example, index|
             output.puts
-            dump_pending_example_fixed(example, index) || dump_failure(example, index)
+            pending_fixed?(example) ? dump_pending_fixed(example, index) : dump_failure(example, index)
             dump_backtrace(example)
           end
         end
 
         def colorise_summary(summary)
-          if failure_count == 0
-            if pending_count > 0
-              yellow(summary)
-            else
-              green(summary)
-            end
-          else
+          if failure_count > 0
             red(summary)
+          elsif pending_count > 0
+            yellow(summary)
+          else
+            green(summary)
           end
         end
 
@@ -158,12 +156,13 @@ module RSpec
           end
         end
 
-        def dump_pending_example_fixed(example, index)
-          if example.execution_result[:exception].pending_fixed?
-            output.puts "#{short_padding}#{index.next}) #{example.full_description} FIXED"
-            output.puts blue("#{long_padding}Expected pending '#{example.metadata[:execution_result][:pending_message]}' to fail. No Error was raised.")
-            true
-          end
+        def dump_pending_fixed(example, index)
+          output.puts "#{short_padding}#{index.next}) #{example.full_description} FIXED"
+          output.puts blue("#{long_padding}Expected pending '#{example.metadata[:execution_result][:pending_message]}' to fail. No Error was raised.")
+        end
+
+        def pending_fixed?(example)
+          example.execution_result[:exception].pending_fixed?
         end
 
         def dump_failure(example, index)
@@ -176,15 +175,23 @@ module RSpec
           output.puts "#{long_padding}#{red("Failure/Error:")} #{red(read_failed_line(exception, example).strip)}"
           output.puts "#{long_padding}#{red(exception.class.name << ":")}" unless exception.class.name =~ /RSpec/
           exception.message.split("\n").each { |line| output.puts "#{long_padding}  #{red(line)}" } if exception.message
-
-          example.example_group.ancestors.push(example.example_group).each do |group|
-            if group.metadata[:shared_group_name]
-              output.puts "#{long_padding}Shared Example Group: \"#{group.metadata[:shared_group_name]}\" called from " +
-                "#{backtrace_line(group.metadata[:example_group][:location])}"
-              break
-            end
+          if shared_group = find_shared_group(example)
+            dump_shared_failure_info(shared_group)
           end
         end
+
+        def dump_shared_failure_info(group)
+          output.puts "#{long_padding}Shared Example Group: \"#{group.metadata[:shared_group_name]}\" called from " +
+            "#{backtrace_line(group.metadata[:example_group][:location])}"
+        end
+
+        def find_shared_group(example)
+          group_and_ancestors(example).find {|group| group.metadata[:shared_group_name]}
+        end
+
+        def group_and_ancestors(example)
+          example.example_group.ancestors.push(example.example_group)
+        end
       end
     end
   end

data/lib/rspec/core/metadata.rb

@@ -169,7 +169,7 @@ module RSpec
 
       # @private
       def filter_applies?(key, value, metadata=self)
-        return metadata.filter_applies_to_any_value?(key, value) if Array === metadata[key]
+        return metadata.filter_applies_to_any_value?(key, value) if Array === metadata[key] && !(Proc === value)
         return metadata.line_number_filter_applies?(value)       if key == :line_numbers
         return metadata.location_filter_applies?(value)          if key == :locations
         return metadata.filters_apply?(key, value)               if Hash === value

data/lib/rspec/core/project_initializer.rb

@@ -25,7 +25,12 @@ module RSpec
           report_exists('.rspec')
         else
           report_creating('.rspec')
-          FileUtils.touch('.rspec')
+          File.open('.rspec','w') do |f|
+            f.write <<-CONTENT
+--color
+--format progress
+CONTENT
+          end
         end
       end
 
@@ -34,8 +39,22 @@ module RSpec
           report_exists("spec/spec_helper.rb")
         else
           report_creating("spec/spec_helper.rb")
-          FileUtils.mkdir('spec') unless File.exist?('spec') && File.directory?('spec')
-          FileUtils.touch('spec/spec_helper.rb')
+          FileUtils.mkdir_p('spec')
+          File.open('spec/spec_helper.rb','w') do |f|
+            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
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+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
+end
+CONTENT
+          end
         end
       end
 

data/lib/rspec/core/shared_context.rb

@@ -3,12 +3,10 @@ module RSpec
     # Exposes [ExampleGroup](ExampleGroup)-level methods to a module, so you
     # can include that module in an [ExampleGroup](ExampleGroup).
     #
-    # @note exposed as `RSpec::SharedContext`
-    #
     # @example
     #
     #     module LoggedInAsAdmin
-    #       extend RSpec::SharedContext
+    #       extend RSpec::Core::SharedContext
     #       before(:each) do
     #         log_in_as :admin
     #       end

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.8.0.rc2'
+      STRING = '2.8.0'
     end
   end
 end

data/spec/rspec/core/configuration_spec.rb

@@ -18,6 +18,12 @@ module RSpec::Core
         config.load_spec_files
       end
 
+      it "loads each file once, even if duplicated in list" do
+        config.files_to_run = ["a_spec.rb", "a_spec.rb"]
+        config.should_receive(:load).once
+        config.load_spec_files
+      end
+
       context "with rspec-1 loaded" do
         before do
           Object.const_set(:Spec, Module.new)
@@ -692,6 +698,12 @@ module RSpec::Core
         config.inclusion_filter = :foo
         config.inclusion_filter.should eq({:foo => true})
       end
+
+      it "overrides any inclusion filters set on the command line or in configuration files" do
+        config.force(:inclusion_filter => { :foo => :bar })
+        config.inclusion_filter = {:want => :this}
+        config.inclusion_filter.should eq({:want => :this})
+      end
     end
 
     describe "#exclusion_filter" do
@@ -739,6 +751,12 @@ module RSpec::Core
         config.exclusion_filter = :foo
         config.exclusion_filter.should eq({:foo => true})
       end
+
+      it "overrides any exclusion filters set on the command line or in configuration files" do
+        config.force(:exclusion_filter => { :foo => :bar })
+        config.exclusion_filter = {:want => :this}
+        config.exclusion_filter.should eq({:want => :this})
+      end
     end
 
     describe "line_numbers=" do

data/spec/rspec/core/metadata_spec.rb

@@ -160,6 +160,14 @@ module RSpec
             metadata_with_array.filter_applies?(:tag, 'fourtune').should be_true
             metadata_with_array.filter_applies?(:tag, 'fortune').should be_false
           end
+
+          it "matches a proc that evaluates to true" do
+            metadata_with_array.filter_applies?(:tag, lambda { |values| values.include? 'three' }).should be_true
+          end
+
+          it "does not match a proc that evaluates to false" do
+            metadata_with_array.filter_applies?(:tag, lambda { |values| values.include? 'nothing' }).should be_false
+          end
         end
       end
 

data/spec/rspec/core/project_initializer_spec.rb

@@ -20,7 +20,7 @@ module RSpec::Core
 
           it "generates a .rspec" do
             command_line_config.run
-            File.read('.rspec').should eq('')
+            File.read('.rspec').should =~ /--color\n--format progress/m
           end
         end
 
@@ -46,7 +46,7 @@ module RSpec::Core
 
           it "generates a spec/spec_helper.rb" do
             command_line_config.run
-            File.read('spec/spec_helper.rb').should eq('')
+            File.read('spec/spec_helper.rb').should =~ /RSpec\.configure do \|config\|/m
           end
         end
 

data/spec/rspec/core_spec.rb

@@ -3,29 +3,23 @@ require 'spec_helper'
 describe RSpec::Core do
 
   describe "#configuration" do
-
     it "returns the same object every time" do
       RSpec.configuration.should equal(RSpec.configuration)
     end
-
   end
 
   describe "#configure" do
-
     it "yields the current configuration" do
       RSpec.configure do |config|
         config.should eq(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)
     end
-
   end
 
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  hash: 15424209
-  prerelease: 6
+  hash: 47
+  prerelease: 
   segments: 
   - 2
   - 8
   - 0
-  - rc
-  - 2
-  version: 2.8.0.rc2
+  version: 2.8.0
 platform: ruby
 authors: 
 - Steven Baker
@@ -19,7 +17,7 @@ autorequire:
 bindir: exe
 cert_chain: []
 
-date: 2011-12-20 00:00:00 Z
+date: 2012-01-05 00:00:00 Z
 dependencies: []
 
 description: BDD for Ruby. RSpec runner and example groups.
@@ -220,21 +218,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rspec
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.8.0.rc2
+summary: rspec-core-2.8.0
 test_files: 
 - features/Autotest.md
 - features/README.md