Update Rubocopcop to 0.85.0 and lock version (shakacode#1288)

* Update Rubocopcop to 0.85.0 and lock version
sachiotomita · Jun 7, 2020 · c3bd926 · c3bd926
1 parent 6e6367b
commit c3bd926
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -254,6 +254,12 @@ You can run specific linting for directories or files by using `docker-compose r
 
 `docker-compose run lint bash` sets you up to run from the container command line.
 
+### Updating Rubocop
+2 files require updating to update the Rubocop version:
+
+1. `react_on_rails.gemspec`
+2. `spec/dummy/Gemfile`
+
 ### Docker CI - Test and Linting
 Docker CI and Tests containers have a xvfd server automatically started for headless browser testing with selenium and Firefox.
 

diff --git a/react_on_rails.gemspec b/react_on_rails.gemspec
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "rubocop"
+  s.add_development_dependency "rubocop", "0.85.0"
 
   s.post_install_message = '
 --------------------------------------------------------------------------------

diff --git a/spec/dummy/Gemfile b/spec/dummy/Gemfile
@@ -56,7 +56,7 @@ group :development, :test do
   gem "pry-doc"
   gem "pry-rails"
   gem "pry-rescue"
-  gem "rubocop", require: false
+  gem "rubocop", "0.85.0", require: false
   gem "ruby-lint", require: false
   gem "scss_lint", require: false
 

diff --git a/spec/dummy/Gemfile.lock b/spec/dummy/Gemfile.lock
@@ -154,7 +154,7 @@ GEM
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.1)
-    parser (2.7.1.2)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -233,13 +233,17 @@ GEM
     rspec-support (3.9.3)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.83.0)
+    rubocop (0.85.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
     ruby-lint (2.3.1)
       parser (~> 2.2)
       slop (~> 3.4, >= 3.4.7)
@@ -344,7 +348,7 @@ DEPENDENCIES
   rspec-rails
   rspec-retry
   rspec_junit_formatter
-  rubocop
+  rubocop (= 0.85.0)
   ruby-lint
   sass-rails
   scss_lint

diff --git a/spec/react_on_rails/test_helper/webpack_assets_compiler_spec.rb b/spec/react_on_rails/test_helper/webpack_assets_compiler_spec.rb
@@ -30,11 +30,13 @@
           cmd: cd \"#{Rails.root}\" && #{invalid_command}
         MSG
 
+        # rubocop:disable Lint/SuppressedException
         expect do
           ReactOnRails::TestHelper::WebpackAssetsCompiler.new.compile_assets
         rescue SystemExit
           # No op
         end.to output(/#{expected_output}/).to_stdout
+        # rubocop:enable Lint/SuppressedException
       end
     end
   end