rails-forward_compatible_controller_tests 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 85e6930e64c6444606585111e29e1aad38521760
-  data.tar.gz: 62b5815dae3600c17d2d99839009907ce04f87df
+SHA256:
+  metadata.gz: c1889c50e09fc0c07f49f045fae935eb895de92bbdef352557644a9206c68fe4
+  data.tar.gz: 604cba70d018fb92869bd54ea7555227bcc36b4253059a62175bbd71fb6cc882
 SHA512:
-  metadata.gz: 79f78351a8b03ddf19f2ea260966c7c899d926ddf043440e34b028465473e249c17ed9b130f923f0a4da9800e58240dfbe72be3ca46d04e595f6969f0dd30530
-  data.tar.gz: 15e97383f8958589d226d022d810213ad32005a91ff4c84fe3003b4918180a6538df3a9f3ccc7c1999f422ffa0293d09aceeace5edb75c0ba4fd12c7d5930c0e
+  metadata.gz: 8ad5fbafa83c703986e24c2e4a166dff56bc7ac0c986ddb392f158949d61427a32df6ac3aa0465ca0c573f557f1b28e940c967fa006b5075fe12dc0a1fa508a0
+  data.tar.gz: c381f1d167748da53d6793cadcd6f4cf9d5b5fb63de3db37035695713dfa4f4b1c110285f4cb2b5d45cdeda0ebfc9305d88bbe8cc73808e14d438952644484a8

data/README.md

@@ -1,6 +1,6 @@
 # Rails::ForwardCompatibleControllerTests
 
-Backport Rails 5 style controller/integration testing syntax using kwargs to Rails 4
+Backport Rails 5 style controller/integration testing syntax using kwargs to Rails 4.  Supports minitest and rspec.
 
 ## Installation
 
@@ -24,6 +24,13 @@ At the appropriate spot in your `test_helper.rb`, `spec_helper.rb`, or similar f
 require 'rails/forward_compatible_controller_tests'
 ```
 
+If using rspec, add the following lines to your rspec config:
+
+```ruby
+config.include Rails::ForwardCompatibleControllerTests, type: :controller
+config.include Rails::ForwardCompatibleControllerTests, type: :request
+```
+
 ## Usage
 
 Allows you to simultaneously use the old and new syntax while making HTTP calls to your controllers
@@ -65,7 +72,15 @@ to make the switch to Rails 5.
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies.
+
+This library uses [Appraisal](https://github.com/thoughtbot/appraisal) to run specs in Rails 4 and 5:
+- `bundle exec appraisal actionpack-4.2 rake`.
+- `bundle exec appraisal actionpack-5.0 rake`.
+
+The library is a no-op when used with Rails 5 (it doesn't affect the implementation of controller tests). You can run the tests in Rails 5 mode to ensure that the behaviour native to Rails 5 is the same as the behaviour in Rails 4 with the library.
+
+You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/Rakefile

@@ -1,10 +1,13 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new(:test) do |t|
+Rake::TestTask.new(:test_minitest) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+RSpec::Core::RakeTask.new(:test_rspec)
+
+task :default => [:test_minitest, :test_rspec]

data/lib/rails/forward_compatible_controller_tests.rb

@@ -1,5 +1,4 @@
 require "rails/forward_compatible_controller_tests/version"
-require "rails/test_help"
 
 module Rails
   module ForwardCompatibleControllerTests
@@ -45,7 +44,7 @@ module Rails
 
     %i[get post patch put head delete].each do |method|
       define_method(method) do |action, *args|
-        controller_test = self.class < ActionController::TestCase
+        controller_test = self.class.try(:metadata)&.[](:type) == :controller || self.class < ActionController::TestCase
         request_params = args[0]&.dup
         request_session = args[1]&.dup if controller_test
         request_headers = args[1]&.dup unless controller_test
@@ -62,6 +61,11 @@ module Rails
             request_headers = request_params.delete(:headers) || request_headers unless controller_test
             request_flash = request_params.delete(:flash) || request_flash if controller_test
             request_params.merge!(request_params.delete(:params) || {})
+          elsif request_params[:params].is_a?(String) && !controller_test
+            request_flash = nil
+            request_session = nil
+            request_headers = request_params.delete(:headers)
+            request_params = request_params.delete(:params) || ""
           elsif request_params.key?(:headers) && !controller_test
             request_flash = nil
             request_session = nil

data/lib/rails/forward_compatible_controller_tests/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module ForwardCompatibleControllerTests
-    VERSION = "2.3.2"
+    VERSION = "2.4.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.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Chad Shaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Back-porting Rails 5 controller & integration tests into Rails 4