memoize subject with its\n\n- Closes rspec#292

knzconnor · Jan 27, 2011 · 599c0c9 · 599c0c9
1 parent 56b6a65
commit 599c0c9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/lib/rspec/core/subject.rb b/lib/rspec/core/subject.rb
@@ -124,13 +124,13 @@ def its(attribute, &block)
             example do
               self.class.class_eval do
                 define_method(:subject) do
-                  if super().is_a?(Hash) && attribute.is_a?(Array)
-                    OpenStruct.new(super()).send(attribute.first)
-                  else
-                    attribute.to_s.split('.').inject(super()) do |target, method|
-                      target.send(method)
-                    end
-                  end
+                  @_subject ||= if super().is_a?(Hash) && attribute.is_a?(Array)
+                                  OpenStruct.new(super()).send(attribute.first)
+                                else
+                                  attribute.to_s.split('.').inject(super()) do |target, method|
+                                    target.send(method)
+                                  end
+                                end
                 end
               end
               instance_eval(&block)

diff --git a/spec/rspec/core/example_group_spec.rb b/spec/rspec/core/example_group_spec.rb
@@ -646,7 +646,9 @@ def attribute_call_count
           end
         end.new
       end
-      its(:attribute_call_count) { should_not == 2 }
+
+      its(:attribute_call_count) { should eq(1) }
+
       context "with nil value" do
         subject do
           Class.new do