fix patch for rails3.2

razum2um · May 14, 2014 · f6fe5b7 · f6fe5b7
1 parent da42b90
commit f6fe5b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/...rker/spec_watcher/action_dispatch_hook.rb → lib/lurker/spec_watcher/rails.rb b/...rker/spec_watcher/action_dispatch_hook.rb → lib/lurker/spec_watcher/rails.rb
@@ -2,7 +2,7 @@
 
 module Lurker
   module SpecWatcher
-    module ActionDispatchHook
+    module Rails
       extend ActiveSupport::Concern
 
       module ClassMethods
@@ -32,9 +32,9 @@ def new(*)
 end
 
 if defined?(ActionDispatch::Integration::Session)
-  ActionDispatch::Integration::Session.send :include, Lurker::SpecWatcher::ActionDispatchHook
+  ActionDispatch::Integration::Session.send :include, Lurker::SpecWatcher::Rails
 end
 
 if defined?(ActionController::TestCase::Behavior)
-  ActionController::TestCase::Behavior.send :include, Lurker::SpecWatcher::ActionDispatchHook
+  ActionController::TestCase::Behavior.send :include, Lurker::SpecWatcher::Rails
 end
diff --git a/lib/lurker/spec_watcher/rspec.rb b/lib/lurker/spec_watcher/rspec.rb
@@ -14,7 +14,9 @@ module Rspec
             request_params ||= {}
             env ||= {}
 
-            if action.is_a?(Symbol)
+            # obsolete, support controller -> request migration
+            # supports `get :index` in request specs
+            if @_example && @_example.metadata[:type] == :request && action.is_a?(Symbol)
               unless @_example.metadata.described_class.is_a?(Class)
                 raise 'cannot determine request url: provide proper described class like: "describe MyController do"'
               end
@@ -28,6 +30,7 @@ module Rspec
           begin
             send :alias_method_chain, verb, :lurker
           rescue NameError
+            # no patch in Rails3.2
             if verb == :patch
               alias_method :patch_without_lurker, :put_without_lurker
               alias_method :patch, :patch_with_lurker
@@ -43,15 +46,13 @@ module Rspec
 
 if defined?(RSpec)
   RSpec.configure do |config|
-    # obsolete, support controller -> request migration
-    # supports `get :index` in request specs
+    config.include Lurker::SpecWatcher::Rspec, type: :controller
     config.include Lurker::SpecWatcher::Rspec, type: :request
 
     lurker = ->(example) {
       # RSpec::Core::ExampleGroup::Nested_1 === self
       @_example = example
 
-      #binding.pry
       if (metadata = example.metadata[:lurker]).present?
         Lurker::Spy.on(suffix: metadata, &example)
       else