rails-forward_compatible_controller_tests 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15eee973b94c06ab667f15a6ccd3cc8bda5ddd27
-  data.tar.gz: 4fda6dba6db8862a7fc106331e6c2eda507e9382
+  metadata.gz: 790f7fe3a2d9e11bbf7ecbe22e5675e7c3bb00c1
+  data.tar.gz: 252a93b427e536a95ed434d8e0508bcc356f9d51
 SHA512:
-  metadata.gz: b450d076c3710c659503e630d2cdf006dc3c059688c74aaa8a17180fc4331ca96665c64ab1d055d1bda22cee934d924731bfc6bb7698ecd80453232d7e55acf5
-  data.tar.gz: 7e4871a49a73cbd4ee2816565840bfa2a45fb1fce735b6f2ba6c93ed35650c8605998e6cabf16e765f374e4183dac3a6cfd1391bc493dc62c88f49aa47f30295
+  metadata.gz: d869af165f25668b7cab965247f7a663447e2ea80847f2734f1b429f1c26c1fa9eac33c7dda87ff8796bb314dafd800b4f100e83865c4e27c33ca3915f23a228
+  data.tar.gz: 4e1e23cf89aae2969a451af71b566685e6f8f25fe781d04898860b9cbf0d1c5ad80b2de5cdee9e64cf414cf5c344c76732e202059865afead290df5c53834f25

data/lib/rails/forward_compatible_controller_tests.rb

@@ -45,8 +45,11 @@ module Rails
 
     %i[get post patch put head delete].each do |method|
       define_method(method) do |action, *args|
+        controller_test = self.class < ActionController::TestCase
         request_params = args[0]&.dup
-        request_headers = args[1]&.dup
+        request_session = args[1]&.dup if controller_test
+        request_headers = args[1]&.dup unless controller_test
+        request_flash = args[2]&.dup if controller_test
 
         old_method = false
         xhr = false
@@ -54,27 +57,54 @@ module Rails
           xhr = request_params.delete(:xhr)
           if request_params[:params].is_a?(Hash)
             request_params.merge!(request_params.delete(:params) || {})
-            request_headers = request_params.delete(:headers) || request_headers
+            request_session = request_params.delete(:session) || request_session if controller_test
+            request_headers = request_params.delete(:headers) || request_headers unless controller_test
+            request_flash = request_params.delete(:flash) || request_flash if controller_test
           elsif request_params.key?(:params)
-            request_headers = request_params[:headers]
+            request_flash = request_params[:flash] if controller_test
+            request_session = request_params[:session] if controller_test
+            request_headers = request_params[:headers] unless controller_test
             request_params = request_params[:params]
-          elsif request_params.key?(:headers)
+          elsif request_params.key?(:headers) && !controller_test
+            request_flash = nil
+            request_session = nil
             request_headers = request_params[:headers]
             request_params = nil
+          elsif request_params.key?(:session) && controller_test
+            request_flash = request_params[:flash]
+            request_session = request_params[:session]
+            request_headers = nil
+            request_params = nil
+          elsif request_params.key?(:flash) && controller_test
+            request_flash = request_params[:flash]
+            request_session = nil
+            request_headers = nil
+            request_params = nil
           elsif !xhr
             old_method = true
           end
-        elsif request_headers.is_a?(Hash)
+        elsif request_headers.is_a?(Hash) || request_session.is_a?(Hash) ||
+              request_flash.is_a?(Hash)
           old_method = true
         end
 
         raise Exception, ERROR_MESSAGE if ForwardCompatibleControllerTests.raise_exception? && old_method
         ActiveSupport::Deprecation.warn(ERROR_MESSAGE) if ForwardCompatibleControllerTests.deprecated? && old_method
 
-        ForwardCompatibleControllerTests.send(:with_ignore) do
-          return xhr(method, action, request_params, request_headers)
-        end if xhr
-        super(action, request_params, request_headers)
+        if xhr
+          ForwardCompatibleControllerTests.send(:with_ignore) do
+            if controller_test
+              return xhr(method, action, request_params, request_session, request_flash)
+            else
+              return xhr(method, action, request_params, request_headers)
+            end
+          end
+        end
+        if controller_test
+          super(action, request_params, request_session, request_flash)
+        else
+          super(action, request_params, request_headers)
+        end
       end
     end
 

data/lib/rails/forward_compatible_controller_tests/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module ForwardCompatibleControllerTests
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-forward_compatible_controller_tests
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Chad Shaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler