[^] spec warning has been eliminated

jugyo · Apr 15, 2012 · 1a851fa · 1a851fa
1 parent 53d649e
commit 1a851fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/rails-footnotes/filter.rb b/lib/rails-footnotes/filter.rb
@@ -74,9 +74,8 @@ def close!(controller)
 
     protected
       def valid?
-        performed_render? && valid_format? && valid_content_type? &&
-          @body.is_a?(String) && !component_request? && !xhr? &&
-          !footnotes_disabled?
+        @body.is_a?(String) && performed_render? && valid_format? && valid_content_type? &&
+          !component_request? && !xhr? && !footnotes_disabled?
       end
 
       def add_footnotes_without_validation!

diff --git a/spec/footnotes_spec.rb b/spec/footnotes_spec.rb
@@ -69,8 +69,9 @@ class NoteZNote < TestNote; end
   end
 
   specify "not_included_when_body_is_not_a_string" do
-    @controller.response.body = Proc.new { Time.now }
-    expect { footnotes_perform! }.should_not raise_exception
+    @controller.response.stub(:body).and_return(Time.now)# = Proc.new { Time.now }
+    Footnotes::Filter.new(@controller).send(:valid?).should_not be
+    @controller.response.body.should_not =~ /<!-- Footnotes/
   end
 
   specify "notes_are_initialized" do