shoulda-matchers 2.3.0 → 2.4.0.rc1

data/spec/shoulda/matchers/active_record/have_db_column_matcher_spec.rb

@@ -88,7 +88,7 @@ describe Shoulda::Matchers::ActiveRecord::HaveDbColumnMatcher do
 
   context 'with primary option' do
     it 'accepts a column that is primary' do
-      with_table(:id, :integer, :primary => true).
+      with_table(:custom_id, :integer, :primary => true).
         should have_db_column(:id).with_options(:primary => true)
     end
 

data/spec/support/active_model_versions.rb

@@ -1,13 +1,13 @@
 RSpec.configure do |c|
-  def active_model_3_0?
-    ::ActiveModel::VERSION::MAJOR == 3 && ::ActiveModel::VERSION::MINOR >= 0
-  end
-
   def active_model_3_1?
-    ::ActiveModel::VERSION::MAJOR == 3 && ::ActiveModel::VERSION::MINOR >= 1
+    (::ActiveModel::VERSION::MAJOR == 3 && ::ActiveModel::VERSION::MINOR >= 1) || active_model_4_0?
   end
 
   def active_model_3_2?
-    ::ActiveModel::VERSION::MAJOR == 3 && ::ActiveModel::VERSION::MINOR >= 2
+    (::ActiveModel::VERSION::MAJOR == 3 && ::ActiveModel::VERSION::MINOR >= 2) || active_model_4_0?
+  end
+
+  def active_model_4_0?
+    ::ActiveModel::VERSION::MAJOR == 4
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 2.3.0
-  prerelease: 
+  version: 2.4.0.rc1
 platform: ruby
 authors:
 - Tammer Saleh
@@ -19,23 +18,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -43,7 +39,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -51,23 +46,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -75,7 +67,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,7 +74,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -91,7 +81,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -99,7 +88,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -107,7 +95,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -115,7 +102,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -123,7 +109,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -131,51 +116,37 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+        version: 2.13.1
+    - - <
       - !ruby/object:Gem::Version
-        version: '2.13'
-- !ruby/object:Gem::Dependency
-  name: strong_parameters
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Making tests easy on the fingers and eyes
 email: support@thoughtbot.com
 executables: []
@@ -201,6 +172,8 @@ files:
 - gemfiles/3.1.gemfile.lock
 - gemfiles/3.2.gemfile
 - gemfiles/3.2.gemfile.lock
+- gemfiles/4.0.gemfile
+- gemfiles/4.0.gemfile.lock
 - lib/shoulda-matchers.rb
 - lib/shoulda/matchers.rb
 - lib/shoulda/matchers/action_controller.rb
@@ -239,6 +212,7 @@ files:
 - lib/shoulda/matchers/active_record/association_matchers/counter_cache_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/dependent_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/model_reflector.rb
+- lib/shoulda/matchers/active_record/association_matchers/option_verifier.rb
 - lib/shoulda/matchers/active_record/association_matchers/order_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/through_matcher.rb
 - lib/shoulda/matchers/active_record/have_db_column_matcher.rb
@@ -248,6 +222,7 @@ files:
 - lib/shoulda/matchers/assertion_error.rb
 - lib/shoulda/matchers/integrations/rspec.rb
 - lib/shoulda/matchers/integrations/test_unit.rb
+- lib/shoulda/matchers/rails_shim.rb
 - lib/shoulda/matchers/version.rb
 - shoulda-matchers.gemspec
 - spec/shoulda/active_model/validate_uniqueness_of_matcher_spec.rb
@@ -295,30 +270,26 @@ files:
 homepage: http://thoughtbot.com/community/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1901679853552928105
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Making tests easy on the fingers and eyes
 test_files:
 - features/rails_integration.feature