remockable 0.3.8 → 0.3.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (23) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/build.yml +64 -0
  3. data/Appraisals +7 -0
  4. data/CHANGELOG.md +5 -0
  5. data/README.markdown +14 -12
  6. data/gemfiles/rails_4.2.gemfile +5 -4
  7. data/gemfiles/rails_4.2.gemfile.lock +14 -14
  8. data/gemfiles/rails_5.0.gemfile +1 -1
  9. data/gemfiles/rails_5.0.gemfile.lock +10 -10
  10. data/gemfiles/rails_5.1.gemfile +1 -1
  11. data/gemfiles/rails_5.1.gemfile.lock +10 -10
  12. data/gemfiles/rails_5.2.gemfile +1 -1
  13. data/gemfiles/rails_5.2.gemfile.lock +10 -10
  14. data/gemfiles/rails_6.0.gemfile +1 -1
  15. data/gemfiles/rails_6.0.gemfile.lock +10 -10
  16. data/gemfiles/rails_6.1.gemfile +1 -1
  17. data/gemfiles/rails_6.1.gemfile.lock +10 -10
  18. data/lib/remockable/active_record/belong_to.rb +11 -0
  19. data/lib/remockable/version.rb +1 -1
  20. data/spec/active_record/belong_to_spec.rb +6 -1
  21. data/spec/support/shared/an_active_record_matcher.rb +9 -3
  22. metadata +4 -4
  23. data/.travis.yml +0 -57
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cd890b89ca6632cc7b8461f13e0ef884369eaba7aeeec9a60f9ce7e416d39842
4
- data.tar.gz: c38b42c84ca19e6a25a79583ea485bc5ce2443b18b12a1bc5755942d6cf07bed
3
+ metadata.gz: 4ffc2a8134d4c752ce38d77cec8e266d50ea9f0f14d4d68c039d54983a25786e
4
+ data.tar.gz: 695c352b12e802ba5f175dea7bed983ef7051323d11157e52b58924172e8ae4f
5
5
  SHA512:
6
- metadata.gz: db7c72e95d189e453a5d65aad26a11f20d4995e28ca0809d1d821fc232891ef4991d62f4a355df4e5d9ef54072017325aa59bfbcde1258abac04f845c63938c7
7
- data.tar.gz: 908cb59b56057aa44417ed2e6219577cddf7a50607f07afbda28d700b1bece69ec0c3f4c7eb26a9177016f187efd5b92f289873f09e63a7246ba06f3ea3d6544
6
+ metadata.gz: 61b0cb9dde668204f1dd5a150e24f299030f3049fb4218bae92c494ea8fb5843740cca45ee65dec6833841c5303b40ba44dfef632da7c60d060c1c4021ae2422
7
+ data.tar.gz: bae3c12a4724a77e40c99e3fbc9cc5cb4ad46132d2a7a2071349f8e44c188904679ef8594988cfa7271d27c371402e5dc9856ec1d4a479d7408f6d421bbc43a4
data/.github/workflows/build.yml ADDED
@@ -0,0 +1,64 @@
1
+ name: Build
2
+ on:
3
+ - push
4
+ - pull_request
5
+
6
+ jobs:
7
+ build:
8
+ name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}
9
+ if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
10
+ strategy:
11
+ fail-fast: false
12
+ matrix:
13
+ ruby:
14
+ - "2.5"
15
+ - "2.6"
16
+ - "2.7"
17
+ - "3.0"
18
+ - "3.1"
19
+ rails:
20
+ - "4.2"
21
+ - "5.0"
22
+ - "5.1"
23
+ - "5.2"
24
+ - "6.0"
25
+ - "6.1"
26
+ exclude:
27
+ - ruby: "2.7"
28
+ rails: "4.2"
29
+
30
+ - ruby: "3.0"
31
+ rails: "4.2"
32
+ - ruby: "3.0"
33
+ rails: "5.0"
34
+ - ruby: "3.0"
35
+ rails: "5.1"
36
+ - ruby: "3.0"
37
+ rails: "5.2"
38
+
39
+ - ruby: "3.1"
40
+ rails: "4.2"
41
+ - ruby: "3.1"
42
+ rails: "5.0"
43
+ - ruby: "3.1"
44
+ rails: "5.1"
45
+ - ruby: "3.1"
46
+ rails: "5.2"
47
+ - ruby: "3.1"
48
+ rails: "6.0"
49
+
50
+ runs-on: "ubuntu-latest"
51
+
52
+ env:
53
+ BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
54
+ RUBYOPT: "--disable-error_highlight"
55
+
56
+ steps:
57
+ - uses: actions/checkout@v2
58
+ - uses: ruby/setup-ruby@v1
59
+ with:
60
+ ruby-version: ${{ matrix.ruby }}
61
+ - name: Setup project
62
+ run: bundle install
63
+ - name: Run tests
64
+ run: bundle exec rspec
data/Appraisals CHANGED
@@ -1,3 +1,10 @@
1
+ appraise 'rails-4.2' do
2
+ gem 'activemodel', '~> 4.2'
3
+ gem 'activerecord', '~> 4.2'
4
+ gem 'activesupport', '~> 4.2'
5
+ gem 'sqlite3', '~> 1.3.6'
6
+ end
7
+
1
8
  appraise 'rails-5.0' do
2
9
  gem 'activemodel', '~> 5.0.0'
3
10
  gem 'activerecord', '~> 5.0.0'
data/CHANGELOG.md CHANGED
@@ -1,5 +1,10 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.3.9 (2022-05-04)
4
+
5
+ * Allow `:required`/`:optional` aliases with `belongs_to`
6
+ ([Tyler Hunt][tylerhunt])
7
+
3
8
  ## 0.3.8 (2021-07-23)
4
9
 
5
10
  * Add `:where` option to `have_index` ([Tyler Hunt][tylerhunt])
data/README.markdown CHANGED
@@ -1,11 +1,13 @@
1
1
  # Remockable
2
2
 
3
- [![Build Status][travis-image]][travis] [![Dependency Status][gemnasium-image]][gemnasium] [![Gem Version][rubygems-image]][rubygems]
4
-
5
- [travis]: https://travis-ci.org/tylerhunt/remockable
6
- [travis-image]: https://travis-ci.org/tylerhunt/remockable.svg?branch=master
7
- [gemnasium]: https://gemnasium.com/github.com/tylerhunt/remockable
8
- [gemnasium-image]: https://gemnasium.com/badges/github.com/tylerhunt/remockable.svg
3
+ [![Build][build-image]][build]
4
+ [![Maintainability][codeclimate-image]][codeclimate]
5
+ [![Gem Version][rubygems-image]][rubygems]
6
+
7
+ [build]: https://github.com/tylerhunt/remockable/actions/workflows/build.yml?query=branch%3Amaster
8
+ [build-image]: https://github.com/tylerhunt/remockable/actions/workflows/build.yml/badge.svg
9
+ [codeclimate]: https://codeclimate.com/github/tylerhunt/remockable/maintainability
10
+ [codeclimate-image]: https://api.codeclimate.com/v1/badges/c95736ab7cca49228f5c/maintainability
9
11
  [rubygems]: https://badge.fury.io/rb/remockable
10
12
  [rubygems-image]: https://badge.fury.io/rb/remockable.svg
11
13
 
@@ -92,13 +94,13 @@ it { should have_many :subscriptions, through: :customers }
92
94
 
93
95
  ## Contributing
94
96
 
95
- 1. Fork it.
96
- 2. Create your feature branch (`git checkout -b my-new-feature`).
97
- 3. Commit your changes (`git commit -am 'Added some feature'`).
98
- 4. Push to the branch (`git push origin my-new-feature`).
99
- 5. Create a new Pull Request.
97
+ 1. Fork it.
98
+ 2. Create your feature branch (`git checkout -b my-new-feature`).
99
+ 3. Commit your changes (`git commit -am 'Added some feature'`).
100
+ 4. Push to the branch (`git push origin my-new-feature`).
101
+ 5. Create a new Pull Request.
100
102
 
101
103
 
102
104
  ## Copyright
103
105
 
104
- Copyright © 2010-2013 Tyler Hunt. See LICENSE for details.
106
+ Copyright © 2010–2022 Tyler Hunt. See LICENSE for details.
data/gemfiles/rails_4.2.gemfile CHANGED
@@ -2,8 +2,9 @@
2
2
 
3
3
  source "https://rubygems.org/"
4
4
 
5
- gem "activemodel", "~> 4.2.0"
6
- gem "activerecord", "~> 4.2.0"
7
- gem "activesupport", "~> 4.2.0"
5
+ gem "activemodel", "~> 4.2"
6
+ gem "activerecord", "~> 4.2"
7
+ gem "activesupport", "~> 4.2"
8
+ gem "sqlite3", "~> 1.3.6"
8
9
 
9
- gemspec path: "../"
10
+ gemspec :path => "../"
data/gemfiles/rails_4.2.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- remockable (0.3.6)
4
+ remockable (0.3.9)
5
5
  activemodel (>= 4.0, < 6.2)
6
6
  activerecord (>= 4.0, < 6.2)
7
7
  activesupport (>= 4.0, < 6.2)
@@ -31,20 +31,20 @@ GEM
31
31
  arel (6.0.4)
32
32
  builder (3.2.4)
33
33
  concurrent-ruby (1.1.7)
34
- diff-lcs (1.4.4)
34
+ diff-lcs (1.5.0)
35
35
  i18n (0.9.5)
36
36
  concurrent-ruby (~> 1.0)
37
37
  minitest (5.14.3)
38
38
  rake (13.0.3)
39
- rspec-core (3.10.1)
40
- rspec-support (~> 3.10.0)
41
- rspec-expectations (3.10.1)
39
+ rspec-core (3.11.0)
40
+ rspec-support (~> 3.11.0)
41
+ rspec-expectations (3.11.0)
42
42
  diff-lcs (>= 1.2.0, < 2.0)
43
- rspec-support (~> 3.10.0)
44
- rspec-mocks (3.10.1)
43
+ rspec-support (~> 3.11.0)
44
+ rspec-mocks (3.11.0)
45
45
  diff-lcs (>= 1.2.0, < 2.0)
46
- rspec-support (~> 3.10.0)
47
- rspec-support (3.10.1)
46
+ rspec-support (~> 3.11.0)
47
+ rspec-support (3.11.0)
48
48
  sqlite3 (1.3.13)
49
49
  thor (1.0.1)
50
50
  thread_safe (0.3.6)
@@ -55,13 +55,13 @@ PLATFORMS
55
55
  ruby
56
56
 
57
57
  DEPENDENCIES
58
- activemodel (~> 4.2.0)
59
- activerecord (~> 4.2.0)
60
- activesupport (~> 4.2.0)
58
+ activemodel (~> 4.2)
59
+ activerecord (~> 4.2)
60
+ activesupport (~> 4.2)
61
61
  appraisal (~> 2.1)
62
62
  rake
63
63
  remockable!
64
- sqlite3 (~> 1.3.4)
64
+ sqlite3 (~> 1.3.6)
65
65
 
66
66
  BUNDLED WITH
67
- 2.1.4
67
+ 2.3.6
data/gemfiles/rails_5.0.gemfile CHANGED
@@ -7,4 +7,4 @@ gem "activerecord", "~> 5.0.0"
7
7
  gem "activesupport", "~> 5.0.0"
8
8
  gem "sqlite3", "~> 1.3.6"
9
9
 
10
- gemspec path: "../"
10
+ gemspec :path => "../"
data/gemfiles/rails_5.0.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- remockable (0.3.7)
4
+ remockable (0.3.9)
5
5
  activemodel (>= 4.0, < 6.2)
6
6
  activerecord (>= 4.0, < 6.2)
7
7
  activesupport (>= 4.0, < 6.2)
@@ -29,20 +29,20 @@ GEM
29
29
  thor (>= 0.14.0)
30
30
  arel (7.1.4)
31
31
  concurrent-ruby (1.1.7)
32
- diff-lcs (1.4.4)
32
+ diff-lcs (1.5.0)
33
33
  i18n (1.8.7)
34
34
  concurrent-ruby (~> 1.0)
35
35
  minitest (5.14.3)
36
36
  rake (13.0.3)
37
- rspec-core (3.10.1)
38
- rspec-support (~> 3.10.0)
39
- rspec-expectations (3.10.1)
37
+ rspec-core (3.11.0)
38
+ rspec-support (~> 3.11.0)
39
+ rspec-expectations (3.11.0)
40
40
  diff-lcs (>= 1.2.0, < 2.0)
41
- rspec-support (~> 3.10.0)
42
- rspec-mocks (3.10.1)
41
+ rspec-support (~> 3.11.0)
42
+ rspec-mocks (3.11.0)
43
43
  diff-lcs (>= 1.2.0, < 2.0)
44
- rspec-support (~> 3.10.0)
45
- rspec-support (3.10.1)
44
+ rspec-support (~> 3.11.0)
45
+ rspec-support (3.11.0)
46
46
  sqlite3 (1.3.13)
47
47
  thor (1.0.1)
48
48
  thread_safe (0.3.6)
@@ -62,4 +62,4 @@ DEPENDENCIES
62
62
  sqlite3 (~> 1.3.6)
63
63
 
64
64
  BUNDLED WITH
65
- 2.1.4
65
+ 2.3.6
data/gemfiles/rails_5.1.gemfile CHANGED
@@ -6,4 +6,4 @@ gem "activemodel", "~> 5.1.0"
6
6
  gem "activerecord", "~> 5.1.0"
7
7
  gem "activesupport", "~> 5.1.0"
8
8
 
9
- gemspec path: "../"
9
+ gemspec :path => "../"
data/gemfiles/rails_5.1.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- remockable (0.3.7)
4
+ remockable (0.3.9)
5
5
  activemodel (>= 4.0, < 6.2)
6
6
  activerecord (>= 4.0, < 6.2)
7
7
  activesupport (>= 4.0, < 6.2)
@@ -29,20 +29,20 @@ GEM
29
29
  thor (>= 0.14.0)
30
30
  arel (8.0.0)
31
31
  concurrent-ruby (1.1.7)
32
- diff-lcs (1.4.4)
32
+ diff-lcs (1.5.0)
33
33
  i18n (1.8.7)
34
34
  concurrent-ruby (~> 1.0)
35
35
  minitest (5.14.3)
36
36
  rake (13.0.3)
37
- rspec-core (3.10.1)
38
- rspec-support (~> 3.10.0)
39
- rspec-expectations (3.10.1)
37
+ rspec-core (3.11.0)
38
+ rspec-support (~> 3.11.0)
39
+ rspec-expectations (3.11.0)
40
40
  diff-lcs (>= 1.2.0, < 2.0)
41
- rspec-support (~> 3.10.0)
42
- rspec-mocks (3.10.1)
41
+ rspec-support (~> 3.11.0)
42
+ rspec-mocks (3.11.0)
43
43
  diff-lcs (>= 1.2.0, < 2.0)
44
- rspec-support (~> 3.10.0)
45
- rspec-support (3.10.1)
44
+ rspec-support (~> 3.11.0)
45
+ rspec-support (3.11.0)
46
46
  sqlite3 (1.4.2)
47
47
  thor (1.0.1)
48
48
  thread_safe (0.3.6)
@@ -62,4 +62,4 @@ DEPENDENCIES
62
62
  sqlite3 (~> 1.4.2)
63
63
 
64
64
  BUNDLED WITH
65
- 2.1.4
65
+ 2.3.6
data/gemfiles/rails_5.2.gemfile CHANGED
@@ -6,4 +6,4 @@ gem "activemodel", "~> 5.2.0"
6
6
  gem "activerecord", "~> 5.2.0"
7
7
  gem "activesupport", "~> 5.2.0"
8
8
 
9
- gemspec path: "../"
9
+ gemspec :path => "../"
data/gemfiles/rails_5.2.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- remockable (0.3.7)
4
+ remockable (0.3.9)
5
5
  activemodel (>= 4.0, < 6.2)
6
6
  activerecord (>= 4.0, < 6.2)
7
7
  activesupport (>= 4.0, < 6.2)
@@ -29,20 +29,20 @@ GEM
29
29
  thor (>= 0.14.0)
30
30
  arel (9.0.0)
31
31
  concurrent-ruby (1.1.7)
32
- diff-lcs (1.4.4)
32
+ diff-lcs (1.5.0)
33
33
  i18n (1.8.7)
34
34
  concurrent-ruby (~> 1.0)
35
35
  minitest (5.14.3)
36
36
  rake (13.0.3)
37
- rspec-core (3.10.1)
38
- rspec-support (~> 3.10.0)
39
- rspec-expectations (3.10.1)
37
+ rspec-core (3.11.0)
38
+ rspec-support (~> 3.11.0)
39
+ rspec-expectations (3.11.0)
40
40
  diff-lcs (>= 1.2.0, < 2.0)
41
- rspec-support (~> 3.10.0)
42
- rspec-mocks (3.10.1)
41
+ rspec-support (~> 3.11.0)
42
+ rspec-mocks (3.11.0)
43
43
  diff-lcs (>= 1.2.0, < 2.0)
44
- rspec-support (~> 3.10.0)
45
- rspec-support (3.10.1)
44
+ rspec-support (~> 3.11.0)
45
+ rspec-support (3.11.0)
46
46
  sqlite3 (1.4.2)
47
47
  thor (1.0.1)
48
48
  thread_safe (0.3.6)
@@ -62,4 +62,4 @@ DEPENDENCIES
62
62
  sqlite3 (~> 1.4.2)
63
63
 
64
64
  BUNDLED WITH
65
- 2.1.4
65
+ 2.3.6
data/gemfiles/rails_6.0.gemfile CHANGED
@@ -6,4 +6,4 @@ gem "activemodel", "~> 6.0.0"
6
6
  gem "activerecord", "~> 6.0.0"
7
7
  gem "activesupport", "~> 6.0.0"
8
8
 
9
- gemspec path: "../"
9
+ gemspec :path => "../"
data/gemfiles/rails_6.0.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- remockable (0.3.7)
4
+ remockable (0.3.9)
5
5
  activemodel (>= 4.0, < 6.2)
6
6
  activerecord (>= 4.0, < 6.2)
7
7
  activesupport (>= 4.0, < 6.2)
@@ -28,20 +28,20 @@ GEM
28
28
  rake
29
29
  thor (>= 0.14.0)
30
30
  concurrent-ruby (1.1.7)
31
- diff-lcs (1.4.4)
31
+ diff-lcs (1.5.0)
32
32
  i18n (1.8.7)
33
33
  concurrent-ruby (~> 1.0)
34
34
  minitest (5.14.3)
35
35
  rake (13.0.3)
36
- rspec-core (3.10.1)
37
- rspec-support (~> 3.10.0)
38
- rspec-expectations (3.10.1)
36
+ rspec-core (3.11.0)
37
+ rspec-support (~> 3.11.0)
38
+ rspec-expectations (3.11.0)
39
39
  diff-lcs (>= 1.2.0, < 2.0)
40
- rspec-support (~> 3.10.0)
41
- rspec-mocks (3.10.1)
40
+ rspec-support (~> 3.11.0)
41
+ rspec-mocks (3.11.0)
42
42
  diff-lcs (>= 1.2.0, < 2.0)
43
- rspec-support (~> 3.10.0)
44
- rspec-support (3.10.1)
43
+ rspec-support (~> 3.11.0)
44
+ rspec-support (3.11.0)
45
45
  sqlite3 (1.4.2)
46
46
  thor (1.0.1)
47
47
  thread_safe (0.3.6)
@@ -62,4 +62,4 @@ DEPENDENCIES
62
62
  sqlite3 (~> 1.4.2)
63
63
 
64
64
  BUNDLED WITH
65
- 2.1.4
65
+ 2.3.6
data/gemfiles/rails_6.1.gemfile CHANGED
@@ -6,4 +6,4 @@ gem "activemodel", "~> 6.1.0"
6
6
  gem "activerecord", "~> 6.1.0"
7
7
  gem "activesupport", "~> 6.1.0"
8
8
 
9
- gemspec path: "../"
9
+ gemspec :path => "../"
data/gemfiles/rails_6.1.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- remockable (0.3.7)
4
+ remockable (0.3.9)
5
5
  activemodel (>= 4.0, < 6.2)
6
6
  activerecord (>= 4.0, < 6.2)
7
7
  activesupport (>= 4.0, < 6.2)
@@ -28,20 +28,20 @@ GEM
28
28
  rake
29
29
  thor (>= 0.14.0)
30
30
  concurrent-ruby (1.1.7)
31
- diff-lcs (1.4.4)
31
+ diff-lcs (1.5.0)
32
32
  i18n (1.8.7)
33
33
  concurrent-ruby (~> 1.0)
34
34
  minitest (5.14.3)
35
35
  rake (13.0.3)
36
- rspec-core (3.10.1)
37
- rspec-support (~> 3.10.0)
38
- rspec-expectations (3.10.1)
36
+ rspec-core (3.11.0)
37
+ rspec-support (~> 3.11.0)
38
+ rspec-expectations (3.11.0)
39
39
  diff-lcs (>= 1.2.0, < 2.0)
40
- rspec-support (~> 3.10.0)
41
- rspec-mocks (3.10.1)
40
+ rspec-support (~> 3.11.0)
41
+ rspec-mocks (3.11.0)
42
42
  diff-lcs (>= 1.2.0, < 2.0)
43
- rspec-support (~> 3.10.0)
44
- rspec-support (3.10.1)
43
+ rspec-support (~> 3.11.0)
44
+ rspec-support (3.11.0)
45
45
  sqlite3 (1.4.2)
46
46
  thor (1.0.1)
47
47
  tzinfo (2.0.4)
@@ -61,4 +61,4 @@ DEPENDENCIES
61
61
  sqlite3 (~> 1.4.2)
62
62
 
63
63
  BUNDLED WITH
64
- 2.1.4
64
+ 2.3.6
data/lib/remockable/active_record/belong_to.rb CHANGED
@@ -19,8 +19,19 @@ RSpec::Matchers.define(:belong_to) do
19
19
 
20
20
  match do |actual|
21
21
  if association = subject.class.reflect_on_association(attribute)
22
+ if ActiveRecord.version > Gem::Version.new('5.0')
23
+ if options.key?(:required)
24
+ options[:optional] = !options.delete(:required)
25
+ end
26
+ else
27
+ if options.key?(:optional)
28
+ options[:required] = !options.delete(:optional)
29
+ end
30
+ end
31
+
22
32
  macro_matches = association.macro == :belongs_to
23
33
  options_match = association.options.slice(*options.keys) == options
34
+
24
35
  macro_matches && options_match
25
36
  end
26
37
  end
data/lib/remockable/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Remockable
2
- VERSION = '0.3.8'
2
+ VERSION = '0.3.9'
3
3
  end
data/spec/active_record/belong_to_spec.rb CHANGED
@@ -44,7 +44,10 @@ describe :belong_to do
44
44
 
45
45
  with_option :class_name, 'Company', 'Organization'
46
46
  with_option :foreign_key, :company_id, :organization_id
47
- with_option :foreign_type, :company_type, :organization_type, polymorphic: true
47
+ with_option :foreign_type,
48
+ :company_type,
49
+ :organization_type,
50
+ polymorphic: true
48
51
  with_option :primary_key, :id, :company_id
49
52
  with_option :dependent, :destroy, :nullify
50
53
  with_option :counter_cache, true, false
@@ -55,9 +58,11 @@ describe :belong_to do
55
58
  with_option :inverse_of, :users, :employees
56
59
 
57
60
  if ActiveRecord.version > Gem::Version.new('5.0')
61
+ with_option :required, false, true
58
62
  with_option :optional, true, false
59
63
  else
60
64
  with_option :required, true, false
65
+ with_option :optional, false, true, {}, required: true
61
66
  end
62
67
  end
63
68
  end
data/spec/support/shared/an_active_record_matcher.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  shared_examples_for 'an Active Record matcher' do
2
- let(:matcher_name) do
2
+ let(:matcher_name) do
3
3
  if self.class.respond_to?(:module_parent)
4
4
  self.class.module_parent.module_parent.description
5
5
  else
@@ -7,9 +7,15 @@ shared_examples_for 'an Active Record matcher' do
7
7
  end
8
8
  end
9
9
 
10
- def self.with_option(option_name, positive, negative, context={})
10
+ def self.with_option(
11
+ option_name,
12
+ positive,
13
+ negative,
14
+ context={},
15
+ macro_option={ option_name => positive }
16
+ )
11
17
  context "with option #{option_name.inspect}" do
12
- let(:options) { context.merge(option_name => positive) }
18
+ let(:options) { context.merge(macro_option) }
13
19
 
14
20
  before do
15
21
  model.send macro, :company, **options
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: remockable
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.8
4
+ version: 0.3.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tyler Hunt
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-07-23 00:00:00.000000000 Z
11
+ date: 2022-05-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemodel
@@ -160,9 +160,9 @@ executables: []
160
160
  extensions: []
161
161
  extra_rdoc_files: []
162
162
  files:
163
+ - ".github/workflows/build.yml"
163
164
  - ".gitignore"
164
165
  - ".rspec"
165
- - ".travis.yml"
166
166
  - Appraisals
167
167
  - CHANGELOG.md
168
168
  - Gemfile
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
253
253
  - !ruby/object:Gem::Version
254
254
  version: '0'
255
255
  requirements: []
256
- rubygems_version: 3.1.6
256
+ rubygems_version: 3.3.6
257
257
  signing_key:
258
258
  specification_version: 4
259
259
  summary: A collection of RSpec matchers for web apps.
data/.travis.yml DELETED
@@ -1,57 +0,0 @@
1
- language: ruby
2
- cache: bundler
3
- before_install: gem install bundler:2.1.4
4
- script: bundle exec rspec
5
- sudo: false
6
-
7
- gemfile:
8
- - gemfiles/rails_5.0.gemfile
9
- - gemfiles/rails_5.1.gemfile
10
- - gemfiles/rails_5.2.gemfile
11
- - gemfiles/rails_6.0.gemfile
12
- - gemfiles/rails_6.1.gemfile
13
-
14
- rvm:
15
- - 2.3.8
16
- - 2.4.10
17
- - 2.5.8
18
- - 2.6.6
19
- - 2.7.2
20
- - 3.0.0
21
-
22
- matrix:
23
- exclude:
24
- - rvm: 2.5.8
25
- gemfile: gemfiles/rails_5.0.gemfile
26
- - rvm: 2.6.6
27
- gemfile: gemfiles/rails_5.0.gemfile
28
- - rvm: 2.7.2
29
- gemfile: gemfiles/rails_5.0.gemfile
30
- - rvm: 3.0.0
31
- gemfile: gemfiles/rails_5.0.gemfile
32
-
33
- - rvm: 2.6.6
34
- gemfile: gemfiles/rails_5.1.gemfile
35
- - rvm: 2.7.2
36
- gemfile: gemfiles/rails_5.1.gemfile
37
- - rvm: 3.0.0
38
- gemfile: gemfiles/rails_5.1.gemfile
39
-
40
- - rvm: 2.6.6
41
- gemfile: gemfiles/rails_5.2.gemfile
42
- - rvm: 2.7.2
43
- gemfile: gemfiles/rails_5.2.gemfile
44
- - rvm: 3.0.0
45
- gemfile: gemfiles/rails_5.2.gemfile
46
-
47
- - rvm: 2.3.8
48
- gemfile: gemfiles/rails_6.0.gemfile
49
- - rvm: 2.4.10
50
- gemfile: gemfiles/rails_6.0.gemfile
51
- - rvm: 3.0.0
52
- gemfile: gemfiles/rails_6.0.gemfile
53
-
54
- - rvm: 2.3.8
55
- gemfile: gemfiles/rails_6.1.gemfile
56
- - rvm: 2.4.10
57
- gemfile: gemfiles/rails_6.1.gemfile