Skip to content

Commit

Permalink
Update rubocop from 0.54.0 to 0.58.2
Browse files Browse the repository at this point in the history
  • Loading branch information
monfresh committed Jul 24, 2018
1 parent 35442e5 commit 24e9aa2
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ plugins:
- 'lib/rspec/formatters/user_flow_formatter.rb'
rubocop:
enabled: true
channel: rubocop-0-54
channel: rubocop-0-58
scss-lint:
enabled: true

Expand Down
4 changes: 0 additions & 4 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
# https://github.com/bbatsov/rubocop/blob/master/config/disabled.yml

AllCops:
Include:
- '**/Gemfile'
- '**/Rakefile'
- '**/Capfile'
Exclude:
- 'bin/**/*'
- 'db/migrate/*'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ group :development do
gem 'rack-mini-profiler', require: false
gem 'rails-erd'
gem 'reek'
gem 'rubocop', '~> 0.54.0', require: false
gem 'rubocop', '~> 0.58.0', require: false
end

group :development, :test do
Expand Down
14 changes: 8 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ GEM
ice_nine (0.11.2)
iniparse (1.4.4)
io-like (0.3.0)
jaro_winkler (1.5.1)
jmespath (1.4.0)
json (1.8.6)
json-jwt (1.9.4)
Expand Down Expand Up @@ -386,12 +387,12 @@ GEM
childprocess (~> 0.6, >= 0.6.3)
iniparse (~> 1.4)
parallel (1.12.1)
parser (2.5.1.0)
parser (2.5.1.2)
ast (~> 2.4.0)
pg (1.0.0)
phonelib (0.6.23)
pkcs11 (0.2.7)
powerpack (0.1.1)
powerpack (0.1.2)
premailer (1.11.1)
addressable
css_parser (>= 1.6.0)
Expand Down Expand Up @@ -502,9 +503,10 @@ GEM
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rubocop (0.54.0)
rubocop (0.58.2)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5)
parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
Expand Down Expand Up @@ -620,7 +622,7 @@ GEM
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.3.0)
unicode-display_width (1.4.0)
uniform_notifier (1.11.0)
user_agent_parser (2.4.1)
uuid (2.3.9)
Expand Down Expand Up @@ -740,7 +742,7 @@ DEPENDENCIES
reek
rqrcode
rspec-rails (~> 3.7)
rubocop (~> 0.54.0)
rubocop (~> 0.58.0)
ruby-progressbar
ruby-saml
saml_idp!
Expand Down
1 change: 0 additions & 1 deletion app/presenters/failure_presenter.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

class FailurePresenter
attr_reader :state

Expand Down
4 changes: 2 additions & 2 deletions lib/encrypted_sidekiq_redis.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ def zrem(key, member)
ret
end

# rubocop:disable Style/MethodMissing
# rubocop:disable Style/MethodMissingSuper
def method_missing(meth, *args, &block)
redis.send(meth, *args, &block)
end
# rubocop:enable Style/MethodMissing
# rubocop:enable Style/MethodMissingSuper

def respond_to_missing?(meth, include_private)
redis.respond_to?(meth, include_private)
Expand Down
12 changes: 5 additions & 7 deletions lib/tasks/rotate.rake
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,11 @@ namespace :rotate do
User.find_in_batches.with_index do |users, _batch|
User.transaction do
users.each do |user|
begin
rotator = KeyRotator::AttributeEncryption.new(user)
rotator.rotate
progress&.increment
rescue StandardError => err # Don't use user.email in output...
Kernel.puts "Error with user id:#{user.id} #{err.message} #{err.backtrace}"
end
rotator = KeyRotator::AttributeEncryption.new(user)
rotator.rotate
progress&.increment
rescue StandardError => err # Don't use user.email in output...
Kernel.puts "Error with user id:#{user.id} #{err.message} #{err.backtrace}"
end
end
end
Expand Down
3 changes: 2 additions & 1 deletion spec/services/ab_test_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@

it 'it returns true or false for a new session' do
enabled = ab_test.enabled?({}, true)
expect(enabled == true || enabled == false).to eq(true)

expect([false, true].include?(enabled)).to eq(true)
end

it 'it returns the same value for the next session' do
Expand Down
4 changes: 2 additions & 2 deletions spec/views/idv/come_back_later/show.html.slim_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
strip_tags(t(
'idv.messages.come_back_later_sp_html',
sp: @decorated_session.sp_name
))
))
)
end
end
Expand Down Expand Up @@ -61,7 +61,7 @@
strip_tags(t(
'idv.messages.come_back_later_no_sp_html',
app: APP_NAME
))
))
)
end
end
Expand Down

0 comments on commit 24e9aa2

Please sign in to comment.