Skip to content

Commit

Permalink
Gem update (#598)
Browse files Browse the repository at this point in the history
* Pegs simplecov
* Pegs Blacklight to no greater than 7.5.0
* UPDATE gems
* rubocop 0.87.1 → 0.86.0
[changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md#0860-2020-06-22)
* Had to downgrade rubocop due to Shopify/erb-lint#179
  • Loading branch information
cdmo committed Jul 9, 2020
1 parent fae52ad commit 8312cbe
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 106 deletions.
2 changes: 2 additions & 0 deletions .erb-lint.yml
Expand Up @@ -21,6 +21,8 @@ linters:
niftany:
- niftany_rubocop_ruby.yml
- niftany_rubocop_rails.yml
Rails/ContentTag:
Enabled: false
Layout/InitialIndentation:
Enabled: false
Layout/TrailingEmptyLines:
Expand Down
1 change: 1 addition & 0 deletions .rubocop.yml
Expand Up @@ -10,6 +10,7 @@ AllCops:
- 'node_modules/**/*'
- 'tmp/**/*'
- 'vendor/**/*'
NewCops: enable

Metrics/BlockLength:
Exclude:
Expand Down
22 changes: 18 additions & 4 deletions .rubocop_todo.yml
@@ -1,25 +1,39 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2020-06-16 23:44:45 -0400 using RuboCop version 0.83.0.
# on 2020-07-09 03:11:59 UTC using RuboCop version 0.87.1.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.

# Offense count: 1
# Configuration parameters: CountComments, ExcludedMethods.
# Cop supports --auto-correct.
# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
# Include: **/*.gemfile, **/Gemfile, **/gems.rb
Bundler/OrderedGems:
Exclude:
- 'Gemfile'

# Offense count: 1
# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
# ExcludedMethods: refine
Metrics/BlockLength:
Max: 32

# Offense count: 1
# Configuration parameters: CountComments.
# Configuration parameters: CountComments, CountAsOne.
Metrics/ClassLength:
Max: 263
Max: 261

# Offense count: 3
# Cop supports --auto-correct.
RSpec/ExpectActual:
Exclude:
- 'spec/routing/**/*'
- 'spec/controllers/catalog_controller_spec.rb'

# Offense count: 11
# Cop supports --auto-correct.
Rails/ContentTag:
Exclude:
- 'app/helpers/catalog_helper.rb'
5 changes: 3 additions & 2 deletions Gemfile
Expand Up @@ -18,7 +18,7 @@ gem 'rsolr', '>= 1.0'
gem 'sprockets', '< 4.0'
gem 'webpacker', '~> 4.0'

gem 'blacklight', '~> 7.0'
gem 'blacklight', '~> 7.5.0'
gem 'blacklight-marc', '>= 7.0.0.rc1'
gem 'blacklight_advanced_search', '~> 7.0'
gem 'blacklight_range_limit', '~> 7.1'
Expand All @@ -37,10 +37,11 @@ group :development, :test do
gem 'capybara'
gem 'niftany'
gem 'pry-byebug'
gem 'rubocop', '< 0.87'
gem 'rails-controller-testing'
gem 'rspec-rails'
gem 'selenium-webdriver'
gem 'simplecov', require: false
gem 'simplecov', '< 0.18', require: false # CodeClimate does not work with .18 or later
gem 'sqlite3'
gem 'webdrivers', '~> 4.0'
gem 'webmock'
Expand Down

0 comments on commit 8312cbe

Please sign in to comment.