Merge pull request #739 from toptal/update-rspec-mocks

Remove explicit `main` branch dependencies on rspec* gems after `rspec-mocks` 3.10.2 is released
toptal · Jan 29, 2021 · fc737a4 · fc737a4
2 parents 0dfebc2 + 2ef5674
commit fc737a4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # master
 
+  * [#739](https://github.com/toptal/chewy/pull/739): Remove explicit `main` branch dependencies on rspec* gems after `rspec-mocks` 3.10.2 is released ([@rabotyaga][])
+
 # Version 5.2.0 (2021-01-28)
 
 ## Changes
@@ -486,6 +488,7 @@
   * Initial version
 
 
+[@rabotyaga]: https://github.com/rabotyaga
 [@lowang]: https://github.com/lowang
 [@bhacaz]: https://github.com/bhacaz
 [@bbatsov]: https://github.com/bbatsov

diff --git a/Gemfile b/Gemfile
@@ -25,4 +25,4 @@ gem 'guard-rspec'
 gem 'redcarpet'
 gem 'yard'
 
-eval(File.read('gemfiles/ruby3.gemfile'), nil, 'gemfiles/ruby3.gemfile') if RUBY_VERSION >= '3.0.0' # rubocop:disable Security/Eval
+gem 'rexml' if RUBY_VERSION >= '3.0.0'
diff --git a/gemfiles/rails.6.1.activerecord.gemfile b/gemfiles/rails.6.1.activerecord.gemfile
@@ -14,6 +14,6 @@ gem "will_paginate", require: false
 gem "parallel", require: false
 gem 'rspec_junit_formatter', '~> 0.4.1'
 
-eval(File.read('gemfiles/ruby3.gemfile'), nil, 'gemfiles/ruby3.gemfile') if RUBY_VERSION >= '3.0.0'
+gem 'rexml' if RUBY_VERSION >= '3.0.0'
 
 gemspec path: "../"
diff --git a/gemfiles/ruby3.gemfile b/gemfiles/ruby3.gemfile