shoulda-matchers 3.1.1 → 3.1.2

data/{.hound_config/ruby.yml → .rubocop.yml}

@@ -1,12 +1,13 @@
-StringLiterals:
-  EnforcedStyle: single_quotes
-
-AlignParameters:
+inherit_from: .hound/ruby.yml
+Style/AlignParameters:
   EnforcedStyle: with_fixed_indentation
-
-CollectionMethods:
+Style/CollectionMethods:
   PreferredMethods:
     find: detect
     reduce: inject
     collect: map
     find_all: select
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Style/StringLiterals:
+  EnforcedStyle: single_quotes

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'appraisal', '~> 2.0'
 gem 'bundler', '~> 1.1'
-gem 'pry', github: 'pry/pry'
+gem 'pry', git: 'https://github.com/pry/pry.git'
 gem 'pry-byebug'
 gem 'rake', '>= 10.5.0', '< 11'
 gem 'rspec', '~> 3.2'

data/Gemfile.lock

@@ -1,11 +1,10 @@
 GIT
-  remote: git://github.com/pry/pry.git
-  revision: f0cbec507111743fdbc273735ea4f0f6164a5b21
+  remote: https://github.com/pry/pry.git
+  revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c
   specs:
-    pry (0.10.1)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
-      slop (~> 3.4)
 
 GEM
   remote: https://rubygems.org/
@@ -14,40 +13,35 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    byebug (4.0.4)
-      columnize (= 0.9.0)
-    coderay (1.1.0)
-    columnize (0.9.0)
+    byebug (9.0.6)
+    coderay (1.1.1)
     diff-lcs (1.2.5)
     fssm (0.2.10)
     method_source (0.8.2)
-    posix-spawn (0.3.8)
-    pry-byebug (3.1.0)
-      byebug (~> 4.0)
+    multi_json (1.12.1)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
       pry (~> 0.10)
-    pygments.rb (0.3.7)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
+    pygments.rb (1.1.1)
+      multi_json (>= 1.0.0)
     rake (10.5.0)
-    redcarpet (3.0.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    redcarpet (3.4.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    slop (3.6.0)
-    thor (0.19.1)
-    yajl-ruby (1.1.0)
-    yard (0.8.7.3)
-    zeus (0.15.4)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    thor (0.19.4)
+    yard (0.9.6)
+    zeus (0.15.12)
       method_source (>= 0.6.7)
 
 PLATFORMS
@@ -67,4 +61,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.11.2
+   1.13.6

data/NEWS.md

@@ -1,3 +1,21 @@
+# 3.1.2
+
+### Deprecations
+
+* This is the **last version** that supports Rails 4.0 and 4.1 and Ruby 2.0 and 2.1.
+
+### Bug fixes
+
+* When the `permit` matcher was used without `#on`, the controller did not use
+  `params#require`, the params object was duplicated, and the matcher did not
+  recognize the `#permit` call inside the controller. This behavior happened
+  because the matcher overwrote double registries with the same parameter hash
+  whenever ActionController::Parameters was instantiated.
+
+  * *Commit: [44c019]*
+  * *Issue: [#899]*
+  * *Pull request: [#902]*
+
 # 3.1.1
 
 ### Bug fixes

data/README.md

@@ -1,10 +1,26 @@
 # Shoulda Matchers [![Gem Version][version-badge]][rubygems] [![Build Status][travis-badge]][travis] ![Downloads][downloads-badge]
 
+[![Join the chat at https://gitter.im/shoulda-matchers/Lobby](https://badges.gitter.im/shoulda-matchers/Lobby.svg)](https://gitter.im/shoulda-matchers/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 Shoulda Matchers provides RSpec- and Minitest-compatible one-liners that test
 common Rails functionality. These tests would otherwise be much longer, more
 complex, and error-prone.
 
-[View the official documentation for the latest version (3.0.0).][rubydocs]
+[View the official documentation for the latest version (3.1.1).][rubydocs]
+
+----
+
+### Note from the maintainer
+
+> Are you a fan of Shoulda Matchers? Are you interested in maintaining a popular
+> open-source project? If so, please contact me. Don't misunderstand me -- I
+> still use Shoulda Matchers on every project, but unfortunately, it has been a
+> long while since I've been able to give it the love it deserves, and I'd like
+> to hand the reins over to someone else who is able to do that. If you're
+> interested, I can be reached on Twitter as @mcmire or at
+> <elliot.winkler@gmail.com>. Thanks!
+>
+> -- Elliot
 
 ----
 
@@ -103,9 +119,19 @@ complex, and error-prone.
 
 Include `shoulda-matchers` in your Gemfile:
 
+For Rails 4.x:
+
+``` ruby
+group :test do
+  gem 'shoulda-matchers', '~> 3.1'
+end
+```
+
+For Rails 5.0:
+
 ``` ruby
 group :test do
-  gem 'shoulda-matchers', '~> 3.0'
+  gem 'shoulda-matchers', git: 'https://github.com/thoughtbot/shoulda-matchers.git', branch: 'rails-5'
 end
 ```
 
@@ -140,7 +166,7 @@ Now you can use matchers in your tests. For instance a model test might look
 like this:
 
 ``` ruby
-describe Person do
+RSpec.describe Person, type: :model do
   it { should validate_presence_of(:name) }
 end
 ```
@@ -188,7 +214,7 @@ use it even when using the `expect` syntax. But if you prefer to use
 `is_expected.to`, you can do that too:
 
 ``` ruby
-describe Person do
+RSpec.describe Person, type: :model do
   it { is_expected.to validate_presence_of(:name) }
 end
 ```
@@ -199,7 +225,7 @@ Shoulda Matchers was originally a component of [Shoulda][shoulda], a gem that
 also provides `should` and `context` syntax via
 [`shoulda-context`][shoulda-context].
 
-At the moment, `shoulda` has not been updated to support `shoulda-matchers` 3.0,
+At the moment, `shoulda` has not been updated to support `shoulda-matchers` 3.x,
 so you'll want to add the following to your Gemfile:
 
 ```ruby
@@ -307,7 +333,7 @@ and may be redistributed under the terms specified in the
 
 ## About thoughtbot
 
-![thoughtbot](https://thoughtbot.com/logo.png)
+![thoughtbot](http://presskit.thoughtbot.com/images/thoughtbot-logo-for-readmes.svg)
 
 Shoulda Matchers is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.

data/docs/errors/NonCaseSwappableValueError.md

@@ -46,7 +46,7 @@ error message explains, you have two options:
         end
 
         # RSpec
-        describe User do
+        RSpec.describe User, type: :model do
           context "validations" do
             subject do
               # Note that "123" == "123".swapcase. This is a problem!
@@ -87,7 +87,7 @@ error message explains, you have two options:
         end
         
         # RSpec
-        describe User do
+        RSpec.describe User, type: :model do
           context "validations" do
             subject do
               # Note that "123" == "123".swapcase, but it's okay

data/lib/shoulda/matchers/action_controller/callback_matcher.rb

@@ -9,7 +9,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe UsersController do
+      #     RSpec.describe UsersController, type: :controller do
       #       it { should use_before_filter(:authenticate_user!) }
       #       it { should_not use_before_filter(:prevent_ssl) }
       #     end
@@ -34,7 +34,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe IssuesController do
+      #     RSpec.describe IssuesController, type: :controller do
       #       it { should use_after_filter(:log_activity) }
       #       it { should_not use_after_filter(:destroy_user) }
       #     end
@@ -59,7 +59,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe UsersController do
+      #     RSpec.describe UsersController, type: :controller do
       #       it { should use_before_action(:authenticate_user!) }
       #       it { should_not use_before_action(:prevent_ssl) }
       #     end
@@ -84,7 +84,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe IssuesController do
+      #     RSpec.describe IssuesController, type: :controller do
       #       it { should use_after_action(:log_activity) }
       #       it { should_not use_after_action(:destroy_user) }
       #     end
@@ -109,7 +109,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe ChangesController do
+      #     RSpec.describe ChangesController, type: :controller do
       #       it { should use_around_filter(:wrap_in_transaction) }
       #       it { should_not use_around_filter(:save_view_context) }
       #     end
@@ -134,7 +134,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe ChangesController do
+      #     RSpec.describe ChangesController, type: :controller do
       #       it { should use_around_action(:wrap_in_transaction) }
       #       it { should_not use_around_action(:save_view_context) }
       #     end

data/lib/shoulda/matchers/action_controller/filter_param_matcher.rb

@@ -10,7 +10,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe ApplicationController do
+      #     RSpec.describe ApplicationController, type: :controller do
       #       it { should filter_param(:secret_key) }
       #     end
       #

data/lib/shoulda/matchers/action_controller/permit_matcher.rb

@@ -35,7 +35,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe UsersController do
+      #     RSpec.describe UsersController, type: :controller do
       #       it do
       #         params = {
       #           user: {
@@ -96,7 +96,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe UsersController do
+      #     RSpec.describe UsersController, type: :controller do
       #       before do
       #         create(:user, id: 1)
       #       end
@@ -170,7 +170,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe UsersController do
+      #     RSpec.describe UsersController, type: :controller do
       #       before do
       #         create(:user, id: 1)
       #       end
@@ -336,7 +336,7 @@ module Shoulda
         # @private
         class CompositeParametersDoubleRegistry
           def initialize
-            @parameters_double_registries_by_params = {}
+            @parameters_double_registries = []
           end
 
           def register
@@ -347,20 +347,19 @@ module Shoulda
               params = call.return_value
               parameters_double_registry = ParametersDoubleRegistry.new(params)
               parameters_double_registry.register
-              parameters_double_registries_by_params[params] =
-                parameters_double_registry
+              parameters_double_registries << parameters_double_registry
             end
           end
 
           def permitted_parameter_names(options = {})
-            parameters_double_registries_by_params.flat_map do |params, double_registry|
+            parameters_double_registries.flat_map do |double_registry|
               double_registry.permitted_parameter_names(options)
             end
           end
 
           protected
 
-          attr_reader :parameters_double_registries_by_params
+          attr_reader :parameters_double_registries
         end
 
         # @private

data/lib/shoulda/matchers/action_controller/redirect_to_matcher.rb

@@ -14,7 +14,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'GET #show' do
       #         before { get :show }
       #

data/lib/shoulda/matchers/action_controller/render_template_matcher.rb

@@ -15,7 +15,7 @@ module Shoulda
       #     <%= render 'sidebar' %>
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'GET #show' do
       #         before { get :show }
       #

data/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb

@@ -11,7 +11,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'GET #show' do
       #         before { get :show }
       #
@@ -38,7 +38,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'GET #sidebar' do
       #         before { get :sidebar }
       #

data/lib/shoulda/matchers/action_controller/rescue_from_matcher.rb

@@ -16,7 +16,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe ApplicationController do
+      #     RSpec.describe ApplicationController, type: :controller do
       #       it do
       #         should rescue_from(ActiveRecord::RecordNotFound).
       #           with(:handle_not_found)

data/lib/shoulda/matchers/action_controller/respond_with_matcher.rb

@@ -13,7 +13,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'GET #index' do
       #         before { get :index }
       #
@@ -39,7 +39,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'DELETE #destroy' do
       #         before { delete :destroy }
       #
@@ -65,7 +65,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'GET #show' do
       #         before { get :show }
       #

data/lib/shoulda/matchers/action_controller/route_matcher.rb

@@ -24,7 +24,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       it { should route(:get, '/posts').to(action: :index) }
       #       it { should route(:get, '/posts/1').to(action: :show, id: 1) }
       #     end
@@ -38,7 +38,7 @@ module Shoulda
       # Or you could place the tests along with other route tests:
       #
       #     # RSpec
-      #     describe 'Routing' do
+      #     describe 'Routing', type: :routing do
       #       it do
       #         should route(:get, '/posts').
       #           to(controller: :posts, action: :index)