remockable 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de3199603ae0cbcc6724c562cc3cd30f765c9f91
-  data.tar.gz: 6f3a4fef9e85c0d7e2aafd582ddfd699c5fefeb8
+  metadata.gz: dad8f07d7c08c5c6eed18c23b3c9b0f969ecd05b
+  data.tar.gz: 2479532b5c0a6e75736ebfb98145866d17d727ab
 SHA512:
-  metadata.gz: e8b6652ff81f5252f8a74a14eb18c27470677bb76a11efc65e3a06fc60812c90cf4b71e95ef33427493905b3ad1c3c7a57219f46febb5ed5447a55893fd6a291
-  data.tar.gz: d9fb6e23a72385726ab12299550248506e78f24029f53b415cabf29af497d3a0c93de79f9526d2addc8ea56b1b7a9038c0f26ea26389b614a74e02ef8297115b
+  metadata.gz: 184bae3a39850bc84632b23aa56f5c75ca7e1fcec943ecdf6949e27924f40d705a6da2bb8e93aa04b8847c2f11a5af32f23e1c8a44f8e8712d6b2a144a74144f
+  data.tar.gz: c4c5864043a9a1f5edb30e6bf2a3b17497426337af07ab02fb81aaa37a82e13b57f6f9a1c5cf8abd226c48aa92443a26e98bdbdd42855eb50f8f9392381ccd7d

data/.gitignore

@@ -5,3 +5,4 @@
 Gemfile.lock
 bin
 pkg
+spec/examples.txt

data/.travis.yml

@@ -1,5 +1,20 @@
 language: ruby
 script: bundle exec rspec
+
+gemfile:
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+
 rvm:
-  - 2.0
-  - 2.1
+  - 2.0.0
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+
+matrix:
+  exclude:
+  - rvm: 2.0.0
+    gemfile: gemfiles/rails_5.0.gemfile
+  - rvm: 2.1.10
+    gemfile: gemfiles/rails_5.0.gemfile

data/Appraisals

@@ -0,0 +1,11 @@
+appraise 'rails-4.2' do
+  gem 'activemodel', '~> 4.2'
+  gem 'activerecord', '~> 4.2'
+  gem 'activesupport', '~> 4.2'
+end
+
+appraise 'rails-5.0' do
+  gem 'activemodel', '~> 5.0'
+  gem 'activerecord', '~> 5.0'
+  gem 'activesupport', '~> 5.0'
+end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.2 (2017-01-16)
+
+  * Support Rails 5.0 ([Tyler Hunt][tylerhunt])
+
 ## 0.3.1 (2015-10-09)
 
   * Fix circular reference error in Ruby 2.2 ([Nathaniel Bibler][nbibler])

data/README.markdown

@@ -2,12 +2,12 @@
 
 [![Build Status][travis-image]][travis] [![Dependency Status][gemnasium-image]][gemnasium] [![Gem Version][rubygems-image]][rubygems]
 
-[travis]: http://travis-ci.org/tylerhunt/remockable
-[travis-image]: https://secure.travis-ci.org/tylerhunt/remockable.png
-[gemnasium]: https://gemnasium.com/tylerhunt/remockable
-[gemnasium-image]: https://gemnasium.com/tylerhunt/remockable.png
-[rubygems]: http://badge.fury.io/rb/remockable
-[rubygems-image]: https://badge.fury.io/rb/remockable.png
+[travis]: https://travis-ci.org/tylerhunt/remockable
+[travis-image]: https://travis-ci.org/tylerhunt/remockable.svg?branch=master
+[gemnasium]: https://gemnasium.com/github.com/tylerhunt/remockable
+[gemnasium-image]: https://gemnasium.com/badges/github.com/tylerhunt/remockable.svg
+[rubygems]: https://badge.fury.io/rb/remockable
+[rubygems-image]: https://badge.fury.io/rb/remockable.svg
 
 A collection of RSpec 3 matchers to simplify your web app specs.
 

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org/"
+
+gem "activemodel", "~> 4.2"
+gem "activerecord", "~> 4.2"
+gem "activesupport", "~> 4.2"
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile.lock

@@ -0,0 +1,67 @@
+PATH
+  remote: ../
+  specs:
+    remockable (0.3.1)
+      activemodel (>= 4.0, < 5.1)
+      activerecord (>= 4.0, < 5.1)
+      activesupport (>= 4.0, < 5.1)
+      rspec-core (~> 3.0)
+      rspec-expectations (~> 3.0)
+      rspec-mocks (~> 3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      arel (~> 6.0)
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (6.0.4)
+    builder (3.2.3)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    json (1.8.6)
+    minitest (5.10.1)
+    rake (12.0.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.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sqlite3 (1.3.13)
+    thor (0.19.4)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (~> 4.2)
+  activerecord (~> 4.2)
+  activesupport (~> 4.2)
+  appraisal (~> 2.1)
+  rake
+  remockable!
+  sqlite3 (~> 1.3.4)
+
+BUNDLED WITH
+   1.13.7

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org/"
+
+gem "activemodel", "~> 5.0"
+gem "activerecord", "~> 5.0"
+gem "activesupport", "~> 5.0"
+
+gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile.lock

@@ -0,0 +1,64 @@
+PATH
+  remote: ../
+  specs:
+    remockable (0.3.1)
+      activemodel (>= 4.0, < 5.1)
+      activerecord (>= 4.0, < 5.1)
+      activesupport (>= 4.0, < 5.1)
+      rspec-core (~> 3.0)
+      rspec-expectations (~> 3.0)
+      rspec-mocks (~> 3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.1)
+      activesupport (= 5.0.1)
+    activerecord (5.0.1)
+      activemodel (= 5.0.1)
+      activesupport (= 5.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.1.4)
+    concurrent-ruby (1.0.4)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    minitest (5.10.1)
+    rake (12.0.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.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sqlite3 (1.3.13)
+    thor (0.19.4)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (~> 5.0)
+  activerecord (~> 5.0)
+  activesupport (~> 5.0)
+  appraisal (~> 2.1)
+  rake
+  remockable!
+  sqlite3 (~> 1.3.4)
+
+BUNDLED WITH
+   1.13.7

data/lib/remockable/active_record/have_column.rb

@@ -11,7 +11,13 @@ RSpec::Matchers.define(:have_column) do
 
   match do |actual|
     if column
-      options.all? { |key, value| column.send(key) == value }
+      options.all? { |key, value|
+        if key == :default
+          column.send(key) == value.to_s # SQLite3 uses string for default
+        else
+          column.send(key) == value
+        end
+      }
     end
   end
 

data/lib/remockable/active_record/have_default_scope.rb

@@ -11,7 +11,7 @@ RSpec::Matchers.define(:have_default_scope) do
 
       if scope.is_a?(ActiveRecord::Relation)
         if relation
-          query_matches = scope.arel.to_sql == relation.arel.to_sql
+          query_matches = scope.to_sql == relation.to_sql
           eager_load_matches = scope.eager_load_values == relation.eager_load_values
           includes_matches = scope.includes_values == relation.includes_values
           lock_matches = scope.lock_value == relation.lock_value

data/lib/remockable/active_record/have_scope.rb

@@ -16,7 +16,7 @@ RSpec::Matchers.define(:have_scope) do |*name|
 
       if scope.is_a?(ActiveRecord::Relation)
         if relation
-          query_matches = scope.arel.to_sql == relation.arel.to_sql
+          query_matches = scope.to_sql == relation.to_sql
           eager_load_matches = scope.eager_load_values == relation.eager_load_values
           includes_matches = scope.includes_values == relation.includes_values
           lock_matches = scope.lock_value == relation.lock_value

data/lib/remockable/version.rb

@@ -1,3 +1,3 @@
 module Remockable
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/remockable.gemspec

@@ -8,12 +8,13 @@ Gem::Specification.new do |spec|
   spec.homepage = 'http://github.com/tylerhunt/remockable'
   spec.license = 'MIT'
 
-  spec.add_dependency 'activemodel', '~> 4.0'
-  spec.add_dependency 'activerecord', '~> 4.0'
-  spec.add_dependency 'activesupport', '~> 4.0'
+  spec.add_dependency 'activemodel', '>= 4.0', '< 5.1'
+  spec.add_dependency 'activerecord', '>= 4.0', '< 5.1'
+  spec.add_dependency 'activesupport', '>= 4.0', '< 5.1'
   spec.add_dependency 'rspec-core', '~> 3.0'
   spec.add_dependency 'rspec-expectations', '~> 3.0'
   spec.add_dependency 'rspec-mocks', '~> 3.0'
+  spec.add_development_dependency 'appraisal', '~> 2.1'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'sqlite3', '~> 1.3.4'
 

data/spec/active_model/allow_values_for_spec.rb

@@ -6,6 +6,8 @@ describe :allow_values_for do
   let(:model) {
     build_class :User do
       include ActiveModel::Validations
+
+      attr_accessor :one
     end
   }
 

data/spec/active_record/have_scope_spec.rb

@@ -35,14 +35,30 @@ describe :have_scope do
     end
 
     context 'with an eager_load value' do
+      let(:comment_model) { build_class(:Comment, ActiveRecord::Base) }
+      let(:post_model) { build_class(:Post, ActiveRecord::Base) }
+
+      before do
+        create_table :comments do |table|
+          table.integer :user_id
+        end
+
+        create_table :posts do |table|
+          table.integer :user_id
+        end
+
+        model.has_many :comments, anonymous_class: comment_model
+        model.has_many :posts, anonymous_class: post_model
+      end
+
       it 'matches if the scope exists and the query matches' do
-        model.instance_eval { scope :loaded, -> { eager_load :order } }
-        expect(model).to have_scope(:loaded).eager_load(:order)
+        model.instance_eval { scope :loaded, -> { eager_load :posts } }
+        expect(model).to have_scope(:loaded).eager_load(:posts)
       end
 
       it 'does not match if the query does not match' do
-        model.instance_eval { scope :loaded, -> { eager_load :order } }
-        expect(model).to_not have_scope(:loaded).eager_load(:from)
+        model.instance_eval { scope :loaded, -> { eager_load :posts } }
+        expect(model).to_not have_scope(:loaded).eager_load(:comments)
       end
     end
 

data/spec/spec_helper.rb

@@ -4,12 +4,27 @@ require 'active_record'
 require 'remockable'
 
 # Require supporting files with custom matchers and macros, etc.
-Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |file|
-  require(file)
-end
+Dir[File.expand_path('support/**/*.rb', __dir__)].each { |file| require file }
 
 RSpec.configure do |config|
-  config.mock_with :rspec
-  config.filter_run focus: true
+  config.filter_run :focus
   config.run_all_when_everything_filtered = true
+  config.example_status_persistence_file_path = 'spec/examples.txt'
+
+  if config.files_to_run.one?
+    config.default_formatter = 'doc'
+  end
+
+  config.order = :random
+  Kernel.srand config.seed
+
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :expect
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :expect
+    mocks.verify_partial_doubles = true
+  end
 end

data/spec/support/shared/a_validation_matcher.rb

@@ -54,6 +54,12 @@ shared_examples_for 'a validation matcher' do
     end
 
     context "with option #{option_name.inspect} with a procedure" do
+      before do
+        model.class_eval do
+          define_method(:skip_validations) {}
+        end
+      end
+
       let(:procedure) { ->(record) { record.skip_validations } }
 
       let(:options) {

metadata

@@ -1,57 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: remockable
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Tyler Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +112,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -131,11 +163,16 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_4.2.gemfile.lock
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.0.gemfile.lock
 - lib/remockable.rb
 - lib/remockable/active_model.rb
 - lib/remockable/active_model/allow_values_for.rb
@@ -209,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A collection of RSpec matchers for web apps.