rspec 1.1.8 → 1.1.9

data/History.txt

@@ -1,3 +1,30 @@
+=== Version 1.1.9 / 2008-10-20
+
+WARNING: This release removes implicit inclusion of modules in example groups.
+This means that if you have 'describe MyModule do', MyModule will not be
+included in the group.
+
+* 2 major enhancements
+
+	* Add extend to configuration (thanks to advice from Chad Fowler)
+	* Modules are no longer implicitly included in example groups
+
+* 4 minor enhancements
+
+  * mingw indicates windows too (thanks to Luis Lavena for the tip)
+	* improved output for partial mock expecation failures
+	* it_should_behave_like now accepts n names of shared groups
+	* eliminated redundant inclusion/extension of ExampleGroupMethods
+
+* 6 bug fixes
+
+  * spec command with no arguments prints help
+  * fixed typo in help. Fixes #73.
+  * fixed bug where should_receive..and_yield after similar stub added the args_to_yield to the stub's original args_to_yield (Pat Maddox)
+  * fixed bug where rspec-autotest (autospec) was loading non-spec files in spec directory. Fixes #559.
+	* fixed bug where should_not_receive was reporting twice
+	* fixed bug where rspec tries to run examples just because it is required (even if there are no examples loaded). Fixes #575.
+
 === Version 1.1.8 / 2008-10-03
 
 * 2 bug fixes
@@ -13,12 +40,12 @@
 
 * 2 bug fixes
 
-	* fixed bug where negative message expectations following stubs resulted in false (negative) positives (Pat Maddox). Closes #548.
-	* fixed bug where Not Yet Implemented examples report incorrect caller (Scott Taylor). Closes #547.
+  * fixed bug where negative message expectations following stubs resulted in false (negative) positives (Mathias Meyer). Closes #548.
+  * fixed bug where Not Yet Implemented examples report incorrect caller (Scott Taylor). Closes #547.
 
 * 1 minor enhancement
 
-	* removed deprecated mock argument constraint symbols
+  * removed deprecated mock argument constraint symbols
 
 === Version 1.1.5 / 2008-09-28
 

data/License.txt

@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) 2005-2008 The RSpec Development Team
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Manifest.txt

@@ -1,4 +1,5 @@
 History.txt
+License.txt
 Manifest.txt
 README.txt
 Rakefile
@@ -85,6 +86,7 @@ lib/spec/adapters/ruby_engine.rb
 lib/spec/adapters/ruby_engine/mri.rb
 lib/spec/adapters/ruby_engine/rubinius.rb
 lib/spec/example.rb
+lib/spec/example/before_and_after_hooks.rb
 lib/spec/example/configuration.rb
 lib/spec/example/errors.rb
 lib/spec/example/example_group.rb
@@ -92,7 +94,6 @@ lib/spec/example/example_group_factory.rb
 lib/spec/example/example_group_methods.rb
 lib/spec/example/example_matcher.rb
 lib/spec/example/example_methods.rb
-lib/spec/example/module_inclusion_warnings.rb
 lib/spec/example/module_reopening_fix.rb
 lib/spec/example/pending.rb
 lib/spec/example/shared_example_group.rb
@@ -213,8 +214,6 @@ spec/ruby_forker.rb
 spec/spec.opts
 spec/spec/adapters/ruby_engine_spec.rb
 spec/spec/example/configuration_spec.rb
-spec/spec/example/example_group/described_module_spec.rb
-spec/spec/example/example_group/warning_messages_spec.rb
 spec/spec/example/example_group_class_definition_spec.rb
 spec/spec/example/example_group_factory_spec.rb
 spec/spec/example/example_group_methods_spec.rb
@@ -234,6 +233,7 @@ spec/spec/extensions/main_spec.rb
 spec/spec/interop/test/unit/resources/spec_that_fails.rb
 spec/spec/interop/test/unit/resources/spec_that_passes.rb
 spec/spec/interop/test/unit/resources/spec_with_errors.rb
+spec/spec/interop/test/unit/resources/spec_with_options_hash.rb
 spec/spec/interop/test/unit/resources/test_case_that_fails.rb
 spec/spec/interop/test/unit/resources/test_case_that_passes.rb
 spec/spec/interop/test/unit/resources/test_case_with_errors.rb

data/README.txt

@@ -2,6 +2,7 @@
 
 * http://rspec.info
 * http://rspec.info/rdoc/
+* http://rubyforge.org/projects/rspec
 * http://github.com/dchelimsky/rspec/wikis
 * mailto:rspec-devel@rubyforge.org
 
@@ -36,28 +37,3 @@ behaviour to your existing objects.
   cd rspec
   rake gem
   rake install_gem
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2005-2008 The RSpec Development Team
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -18,10 +18,12 @@ Hoe.new('rspec', Spec::VERSION::STRING) do |p|
   p.url = 'http://rspec.info/'
   p.description = "Behaviour Driven Development for Ruby."
   p.rubyforge_name = 'rspec'
+  p.extra_dev_deps = ['diff-lcs',['spicycode-rcov','>= 0.8.1.3'],'syntax']
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
+  p.remote_rdoc_dir = "rspec/#{Spec::VERSION::STRING}"
 end
 
-['audit','test','test_deps','default','publish_docs','post_blog'].each do |task|
+['audit','test','test_deps','default','post_blog'].each do |task|
   Rake.application.instance_variable_get('@tasks').delete(task)
 end
 
@@ -41,7 +43,7 @@ Spec::Rake::SpecTask.new do |t|
   unless ENV['NO_RCOV']
     t.rcov = true
     t.rcov_dir = 'coverage'
-    t.rcov_opts = ['--exclude', "lib/spec.rb,lib/spec/runner.rb,spec\/spec,bin\/spec,examples,\/var\/lib\/gems,\/Library\/Ruby,\.autotest,#{ENV['GEM_HOME']}"]
+    t.rcov_opts = ['--text-report', '--exclude', "lib/spec.rb,lib/spec/runner.rb,spec\/spec,bin\/spec,examples,\/var\/lib\/gems,\/Library\/Ruby,\.autotest,#{ENV['GEM_HOME']}"]
   end
 end
 

data/TODO.txt

@@ -1,9 +1,10 @@
-== 1.1.6
-
-* resolve windows tty/colorization issue
-
 == Future
 
 * do SOMETHING with the website
 * extract spec/story to rspec-stories (new gem)
 * remove the ruby engine adapter unless Rubinius team plans to use it
+* rename top level namespace to Rspec and commands to 'rspec' and 'autorspec'
+  * continue to support Spec 'spec' and 'autospec' as aliases for a reasonable time
+* separate the underlying framework from the DSL
+  * be able to do everything with classes and methods
+* tweak raise_error rdoc to show only one arg

data/bin/autospec

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 ENV['RSPEC'] = 'true'     # allows autotest to discover rspec
 ENV['AUTOTEST'] = 'true'  # allows autotest to run w/ color on linux
-system (RUBY_PLATFORM =~ /mswin/ ? 'autotest.bat' : 'autotest'), *ARGV
+system (RUBY_PLATFORM =~ /mswin|mingw/ ? 'autotest.bat' : 'autotest'), *ARGV

data/examples/pure/shared_example_group_example.rb

@@ -31,8 +31,8 @@ module SharedExampleGroupExample
     end
   end
 
-  # A SharedExampleGroup is also module. If you create one like this
-  # it gets assigned to the constant AllThings
+  # A SharedExampleGroup is also a module. If you create one like this it gets
+  # assigned to the constant MostThings
   share_as :MostThings do
     def helper_method
       "helper method"

data/lib/autotest/rspec.rb

@@ -4,7 +4,7 @@ Autotest.add_hook :initialize do |at|
   at.clear_mappings
   # watch out: Ruby bug (1.8.6):
   # %r(/) != /\//
-  at.add_mapping(%r%^spec/.*\.rb$%) { |filename, _| 
+  at.add_mapping(%r%^spec/.*_spec.rb$%) { |filename, _| 
     filename 
   }
   at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| 

data/lib/spec.rb

@@ -24,5 +24,9 @@ module Spec
     def exit?
       !Object.const_defined?(:Test) || Test::Unit.run?
     end
+
+    def spec_command?
+      $0.split('/').last == 'spec'
+    end
   end
-end
+end

data/lib/spec/example.rb

@@ -1,7 +1,7 @@
 require 'timeout'
+require 'spec/example/before_and_after_hooks'
 require 'spec/example/pending'
 require 'spec/example/module_reopening_fix'
-require 'spec/example/module_inclusion_warnings'
 require 'spec/example/example_group_methods'
 require 'spec/example/example_methods'
 require 'spec/example/example_group'

data/lib/spec/example/before_and_after_hooks.rb

@@ -0,0 +1,93 @@
+module Spec
+  module Example
+    module BeforeAndAfterHooks
+      # Registers a block to be executed before each example.
+      # This method prepends +block+ to existing before blocks.
+      def prepend_before(*args, &block)
+        scope, options = scope_and_options(*args)
+        parts = before_parts_from_scope(scope)
+        parts.unshift(block)
+      end
+
+      # Registers a block to be executed before each example.
+      # This method appends +block+ to existing before blocks.
+      def append_before(*args, &block)
+        scope, options = scope_and_options(*args)
+        parts = before_parts_from_scope(scope)
+        parts << block
+      end
+      alias_method :before, :append_before
+
+      # Registers a block to be executed after each example.
+      # This method prepends +block+ to existing after blocks.
+      def prepend_after(*args, &block)
+        scope, options = scope_and_options(*args)
+        parts = after_parts_from_scope(scope)
+        parts.unshift(block)
+      end
+      alias_method :after, :prepend_after
+
+      # Registers a block to be executed after each example.
+      # This method appends +block+ to existing after blocks.
+      def append_after(*args, &block)
+        scope, options = scope_and_options(*args)
+        parts = after_parts_from_scope(scope)
+        parts << block
+      end
+
+      def remove_after(scope, &block)
+        after_each_parts.delete(block)
+      end
+
+      # Deprecated. Use before(:each)
+      def setup(&block)
+        before(:each, &block)
+      end
+
+      # Deprecated. Use after(:each)
+      def teardown(&block)
+        after(:each, &block)
+      end
+
+      def before_all_parts # :nodoc:
+        @before_all_parts ||= []
+      end
+
+      def after_all_parts # :nodoc:
+        @after_all_parts ||= []
+      end
+
+      def before_each_parts # :nodoc:
+        @before_each_parts ||= []
+      end
+
+      def after_each_parts # :nodoc:
+        @after_each_parts ||= []
+      end
+      
+    private  
+      
+      def scope_and_options(*args)
+        args, options = args_and_options(*args)
+        scope = (args[0] || :each), options
+      end
+
+      def before_parts_from_scope(scope)
+        case scope
+        when :each; before_each_parts
+        when :all; before_all_parts
+        when :suite; Spec::Runner.options.before_suite_parts
+        end
+      end
+
+      def after_parts_from_scope(scope)
+        case scope
+        when :each; after_each_parts
+        when :all; after_all_parts
+        when :suite; Spec::Runner.options.after_suite_parts
+        end
+      end
+
+    end
+  end
+end

data/lib/spec/example/configuration.rb

@@ -67,12 +67,21 @@ module Spec
       #   end
       #
       def include(*args)
+        include_or_extend(:include, *args)
+      end
+      
+      def extend(*args)
+        include_or_extend(:extend, *args)
+      end
+      
+      def include_or_extend(*args)
+        action = args.shift
         args << {} unless Hash === args.last
         modules, options = args_and_options(*args)
         required_example_group = get_type_from_options(options)
         required_example_group = required_example_group.to_sym if required_example_group
         modules.each do |mod|
-          ExampleGroupFactory.get(required_example_group).send(:include, mod)
+          ExampleGroupFactory.get(required_example_group).send(action, mod)
         end
       end
 

data/lib/spec/example/example_group.rb

@@ -6,7 +6,8 @@ module Spec
       extend Spec::Example::ExampleGroupMethods
       include Spec::Example::ExampleMethods
 
-      def initialize(defined_description, &implementation)
+      def initialize(defined_description, options={}, &implementation)
+        @_options = options
         @_defined_description = defined_description
         @_implementation = implementation || pending_implementation
       end

data/lib/spec/example/example_group_factory.rb

@@ -7,6 +7,13 @@ module Spec
           default(ExampleGroup)
         end
 
+        def all_registered?(example_group_classes)
+          example_group_classes.each do |example_group_class|
+            return false unless registered_or_ancestor_of_registered? example_group_class
+          end
+          return true
+        end
+
         # Registers an example group class +klass+ with the symbol +type+. For
         # example:
         #
@@ -46,7 +53,7 @@ module Spec
           superclass.describe(*args, &block)
         end
 
-        protected
+      protected
 
         def determine_superclass(opts)
           key = if opts[:type]
@@ -56,6 +63,16 @@ module Spec
           end
           get(key)
         end
+        
+      private
+        
+        def registered_or_ancestor_of_registered? example_group_class
+          registered_types.any? {|registered_type| registered_type.ancestors.include? example_group_class}
+        end
+        
+        def registered_types
+          @example_group_types.values
+        end
 
       end
       self.reset

data/lib/spec/example/example_group_methods.rb

@@ -2,6 +2,8 @@ module Spec
   module Example
 
     module ExampleGroupMethods
+      include Spec::Example::BeforeAndAfterHooks
+
       class << self
         attr_accessor :matcher_class
 
@@ -13,7 +15,12 @@ module Spec
         end
       end
 
-      attr_reader :description_text, :description_args, :description_options, :spec_path, :registration_binding_block
+      attr_reader :description_text, :description_options, :spec_path
+      alias :options :description_options
+      
+      def description_args
+        @description_args ||= []
+      end
 
       def inherited(klass)
         super
@@ -64,19 +71,12 @@ module Spec
       
       # Use this to pull in examples from shared example groups.
       # See Spec::Runner for information about shared example groups.
-      def it_should_behave_like(shared_example_group)
-        case shared_example_group
-        when SharedExampleGroup
-          include shared_example_group
-        else
-          example_group = SharedExampleGroup.find_shared_example_group(shared_example_group)
-          unless example_group
-            raise RuntimeError.new("Shared Example Group '#{shared_example_group}' can not be found")
-          end
-          include(example_group)
+      def it_should_behave_like(*shared_example_groups)
+        shared_example_groups.each do |group|
+          include_shared_example_group(group)
         end
       end
-
+      
       # :call-seq:
       #   predicate_matchers[matcher_name] = method_on_object
       #   predicate_matchers[matcher_name] = [method1_on_object, method2_on_object]
@@ -111,8 +111,8 @@ module Spec
 
       # Creates an instance of the current example group class and adds it to
       # a collection of examples of the current example group.
-      def example(description=nil, &implementation)
-        e = new(description, &implementation)
+      def example(description=nil, options={}, &implementation)
+        e = new(description, options, &implementation)
         example_objects << e
         e
       end
@@ -157,8 +157,8 @@ module Spec
 
       def description_parts #:nodoc:
         parts = []
-        execute_in_class_hierarchy do |example_group|
-          parts << example_group.description_args
+        each_ancestor_example_group_class do |example_group_class|
+          parts << example_group_class.description_args
         end
         parts.flatten.compact
       end
@@ -169,14 +169,9 @@ module Spec
         @description_options = options
         @description_text = ExampleGroupMethods.description_text(*args)
         @spec_path = File.expand_path(options[:spec_path]) if options[:spec_path]
-        if described_type.class == Module
-          @described_module = described_type
-        end
         self
       end
       
-      attr_reader :described_module
-
       def examples #:nodoc:
         examples = example_objects.dup
         add_method_examples(examples)
@@ -187,70 +182,6 @@ module Spec
         examples.length
       end
 
-      # Registers a block to be executed before each example.
-      # This method prepends +block+ to existing before blocks.
-      def prepend_before(*args, &block)
-        scope, options = scope_and_options(*args)
-        parts = before_parts_from_scope(scope)
-        parts.unshift(block)
-      end
-
-      # Registers a block to be executed before each example.
-      # This method appends +block+ to existing before blocks.
-      def append_before(*args, &block)
-        scope, options = scope_and_options(*args)
-        parts = before_parts_from_scope(scope)
-        parts << block
-      end
-      alias_method :before, :append_before
-
-      # Registers a block to be executed after each example.
-      # This method prepends +block+ to existing after blocks.
-      def prepend_after(*args, &block)
-        scope, options = scope_and_options(*args)
-        parts = after_parts_from_scope(scope)
-        parts.unshift(block)
-      end
-      alias_method :after, :prepend_after
-
-      # Registers a block to be executed after each example.
-      # This method appends +block+ to existing after blocks.
-      def append_after(*args, &block)
-        scope, options = scope_and_options(*args)
-        parts = after_parts_from_scope(scope)
-        parts << block
-      end
-
-      def remove_after(scope, &block)
-        after_each_parts.delete(block)
-      end
-
-      # Deprecated. Use before(:each)
-      def setup(&block)
-        before(:each, &block)
-      end
-
-      # Deprecated. Use after(:each)
-      def teardown(&block)
-        after(:each, &block)
-      end
-
-      def before_all_parts # :nodoc:
-        @before_all_parts ||= []
-      end
-
-      def after_all_parts # :nodoc:
-        @after_all_parts ||= []
-      end
-
-      def before_each_parts # :nodoc:
-        @before_each_parts ||= []
-      end
-
-      def after_each_parts # :nodoc:
-        @after_each_parts ||= []
-      end
-
       # Only used from RSpec's own examples
       def reset # :nodoc:
         @before_all_parts = nil
@@ -269,18 +200,18 @@ module Spec
       end
 
       def registration_backtrace
-        eval("caller", registration_binding_block)
+        eval("caller", @registration_binding_block)
       end
 
       def run_before_each(example)
-        execute_in_class_hierarchy do |example_group|
-          example.eval_each_fail_fast(example_group.before_each_parts)
+        each_ancestor_example_group_class do |example_group_class|
+          example.eval_each_fail_fast(example_group_class.before_each_parts)
         end
       end
 
       def run_after_each(example)
-        execute_in_class_hierarchy(:superclass_first) do |example_group|
-          example.eval_each_fail_slow(example_group.after_each_parts)
+        each_ancestor_example_group_class(:superclass_first) do |example_group_class|
+          example.eval_each_fail_slow(example_group_class.after_each_parts)
         end
       end
 
@@ -296,8 +227,8 @@ module Spec
       def run_before_all
         before_all = new("before(:all)")
         begin
-          execute_in_class_hierarchy do |example_group|
-            before_all.eval_each_fail_fast(example_group.before_all_parts)
+          each_ancestor_example_group_class do |example_group_class|
+            before_all.eval_each_fail_fast(example_group_class.before_all_parts)
           end
           return [true, before_all.instance_variable_hash]
         rescue Exception => e
@@ -320,8 +251,8 @@ module Spec
       def run_after_all(success, instance_variables)
         after_all = new("after(:all)")
         after_all.set_instance_variables_from_hash(instance_variables)
-        execute_in_class_hierarchy(:superclass_first) do |example_group|
-          after_all.eval_each_fail_slow(example_group.after_all_parts)
+        each_ancestor_example_group_class(:superclass_first) do |example_group_class|
+          after_all.eval_each_fail_slow(example_group_class.after_all_parts)
         end
         return success
       rescue Exception => e
@@ -359,22 +290,21 @@ module Spec
         @example_objects ||= []
       end
 
-      def execute_in_class_hierarchy(superclass_last=false)
+      def each_ancestor_example_group_class(superclass_last=false)
         classes = []
         current_class = self
-        while is_example_group?(current_class)
+        while is_example_group_class?(current_class)
           superclass_last ? classes << current_class : classes.unshift(current_class)
           current_class = current_class.superclass
         end
-        superclass_last ? classes << ExampleMethods : classes.unshift(ExampleMethods)
-
+        
         classes.each do |example_group|
           yield example_group
         end
       end
 
-      def is_example_group?(klass)
-        Module === klass && klass.kind_of?(ExampleGroupMethods)
+      def is_example_group_class?(klass)
+        klass.kind_of?(ExampleGroupMethods) && klass.included_modules.include?(ExampleMethods)
       end
 
       def plugin_mock_framework
@@ -398,27 +328,6 @@ module Spec
         end
       end
 
-      def scope_and_options(*args)
-        args, options = args_and_options(*args)
-        scope = (args[0] || :each), options
-      end
-
-      def before_parts_from_scope(scope)
-        case scope
-        when :each; before_each_parts
-        when :all; before_all_parts
-        when :suite; Spec::Runner.options.before_suite_parts
-        end
-      end
-
-      def after_parts_from_scope(scope)
-        case scope
-        when :each; after_each_parts
-        when :all; after_all_parts
-        when :suite; Spec::Runner.options.after_suite_parts
-        end
-      end
-
       def add_method_examples(examples)
         instance_methods.sort.each do |method_name|
           if example_method?(method_name)
@@ -436,10 +345,23 @@ module Spec
       def should_method?(method_name)
         !(method_name =~ /^should(_not)?$/) &&
         method_name =~ /^should/ && (
-          instance_method(method_name).arity == 0 ||
-          instance_method(method_name).arity == -1
+          [-1,0].include?(instance_method(method_name).arity)
         )
       end
+
+      def include_shared_example_group(shared_example_group)
+        case shared_example_group
+        when SharedExampleGroup
+          include shared_example_group
+        else
+          example_group = SharedExampleGroup.find_shared_example_group(shared_example_group)
+          unless example_group
+            raise RuntimeError.new("Shared Example Group '#{shared_example_group}' can not be found")
+          end
+          include(example_group)
+        end
+      end
+
     end
 
   end