simplify each_ancestor in each_ancestor (again, don't need to add Exa…

…mpleMethods since it is already included in the group)
raggi · Oct 20, 2008 · 8dabd9f · 8dabd9f
1 parent 2426eda
commit 8dabd9f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/History.txt b/History.txt
@@ -14,6 +14,7 @@ included in the group.
   * 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
 
 * 5 bug fixes
 

diff --git a/lib/spec/example/example_group_methods.rb b/lib/spec/example/example_group_methods.rb
@@ -293,7 +293,7 @@ def each_ancestor(superclass_last=false)
           superclass_last ? classes << current_class : classes.unshift(current_class)
           current_class = current_class.superclass
         end
-
+        
         classes.each do |example_group|
           yield example_group
         end

diff --git a/lib/spec/example/example_methods.rb b/lib/spec/example/example_methods.rb
@@ -2,11 +2,6 @@ module Spec
   module Example
     module ExampleMethods
 
-      class << self
-        # FIXME - this is defined on ExampleGroupMethods too - why in both places?
-        attr_reader :description_args
-      end
-
       extend ModuleReopeningFix
 
       def execute(options, instance_variables)

diff --git a/lib/spec/example/shared_example_group.rb b/lib/spec/example/shared_example_group.rb
@@ -45,11 +45,7 @@ def included(mod) # :nodoc:
       end
 
       def each_ancestor(superclass_last=false)
-        classes = [self]
-        superclass_last ? classes << ExampleMethods : classes.unshift(ExampleMethods)
-        classes.each do |example_group|
-          yield example_group
-        end
+        yield self
       end
     end
   end