Skip to content

Commit c26e48a

Browse files
committed
Appease da RuboCop
1 parent c67f66e commit c26e48a

File tree

12 files changed

+34
-17
lines changed

12 files changed

+34
-17
lines changed

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require:
99
AllCops:
1010
NewCops: enable
1111
SuggestExtensions: false
12-
TargetRubyVersion: 2.6.0
12+
TargetRubyVersion: 3.0.0
1313

1414
###########################
1515
## Custom Rubocop Config ##

sorcery-core/lib/sorcery/plugins/session_timeout/controller.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ def self.plugin_defaults
2727

2828
module InstanceMethods # :nodoc:
2929
def invalidate_active_sessions!
30-
unless sorcery_config.session_timeout_invalidate_active_sessions_enabled
31-
return
32-
end
30+
return unless sorcery_config.
31+
session_timeout_invalidate_active_sessions_enabled
3332
return unless current_user.present?
3433

3534
# FIXME: Why isn't this in the model? Who did this? Ugh.
@@ -43,7 +42,8 @@ def invalidate_active_sessions!
4342
# Registers last login to be used as the timeout starting point.
4443
# Runs as a hook after a successful login.
4544
#
46-
def register_login_time_after_login(_user, _username, _password, _options)
45+
def register_login_time_after_login(_user, _username, _password,
46+
_options)
4747
register_login_time
4848
end
4949

sorcery-core/sorcery-core.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
1313
'your own MVC structure.'
1414

1515
# TODO: Does including minimum rubygems version make sense?
16-
s.required_ruby_version = '>= 3.0.0'
16+
s.required_ruby_version = '>= 3.0.0'
1717
# s.required_rubygems_version = '>= 1.8.11'
1818

1919
s.license = 'MIT'

sorcery-jwt/sorcery-jwt.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
1111
s.description = 'Adds plugins to Sorcery for supporting JWT login.'
1212

1313
# TODO: Does including minimum rubygems version make sense?
14-
s.required_ruby_version = '>= 3.0.0'
14+
s.required_ruby_version = '>= 3.0.0'
1515
# s.required_rubygems_version = '>= 1.8.11'
1616

1717
s.license = 'MIT'

sorcery-mfa/sorcery-mfa.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
1111
s.description = 'Adds plugins to Sorcery for supporting MFA login.'
1212

1313
# TODO: Does including minimum rubygems version make sense?
14-
s.required_ruby_version = '>= 3.0.0'
14+
s.required_ruby_version = '>= 3.0.0'
1515
# s.required_rubygems_version = '>= 1.8.11'
1616

1717
s.license = 'MIT'

sorcery-oauth/sorcery-oauth.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
1111
s.description = 'Adds plugins to Sorcery for supporting OAuth login.'
1212

1313
# TODO: Does including minimum rubygems version make sense?
14-
s.required_ruby_version = '>= 3.0.0'
14+
s.required_ruby_version = '>= 3.0.0'
1515
# s.required_rubygems_version = '>= 1.8.11'
1616

1717
s.license = 'MIT'

sorcery.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
1616
# TODO: Sign the gem: https://guides.rubygems.org/security/#general
1717

1818
# TODO: Does including minimum rubygems version make sense?
19-
s.required_ruby_version = '>= 3.0.0'
19+
s.required_ruby_version = '>= 3.0.0'
2020
# s.required_rubygems_version = '>= 1.8.11'
2121

2222
s.license = 'MIT'

spec/controllers/plugins/session_timeout_controller_spec.rb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
end
8080
end
8181

82+
# rubocop:disable Layout/LineLength
8283
context 'when session_timeout_invalidate_active_sessions_enabled is true' do
8384
around do |example|
8485
prev_val = described_class.sorcery_config.session_timeout_invalidate_active_sessions_enabled
@@ -125,6 +126,8 @@
125126
expect(session[:user_session_id]).to be_nil
126127
end
127128

129+
# rubocop:disable RSpec/ExampleLength
130+
# rubocop:disable RSpec/MultipleExpectations
128131
it 'allows login after invalidate_active_sessions! is called' do
129132
get :show_if_logged_in
130133

@@ -148,6 +151,8 @@
148151

149152
expect(session[:user_session_id]).to be_present
150153
end
154+
# rubocop:enable RSpec/ExampleLength
155+
# rubocop:enable RSpec/MultipleExpectations
151156
end
152157

153158
context 'when session_timeout_from_last_action is true' do
@@ -162,6 +167,7 @@
162167
post :create, params: { login: username, password: password }
163168
end
164169

170+
# rubocop:disable RSpec/ExampleLength
165171
it 'does not logout if there was activity' do
166172
Timecop.travel(45.minutes.from_now)
167173

@@ -175,6 +181,7 @@
175181

176182
expect(session[:user_session_id]).to be_present
177183
end
184+
# rubocop:enable RSpec/ExampleLength
178185

179186
it 'with \'session_timeout_from_last_action\' logs out if there was no activity' do
180187
get :show_if_logged_in
@@ -188,4 +195,5 @@
188195
expect(session[:user_session_id]).to be_nil
189196
end
190197
end
198+
# rubocop:enable Layout/LineLength
191199
end

spec/dummy_app/config/routes.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
post 'plugins/session_timeout/login' => 'session_timeout#create'
5454
get 'plugins/session_timeout/show_if_logged_in' =>
5555
'session_timeout#show_if_logged_in'
56-
delete 'plugins/session_timeout/purge_session' => 'session_timeout#purge_session'
56+
delete 'plugins/session_timeout/purge_session' =>
57+
'session_timeout#purge_session'
5758
post 'plugins/session_timeout/login_with_remember_me' =>
5859
'session_timeout#login_with_remember_me'
5960
get 'plugins/session_timeout/invalidate_sessions' =>

spec/rails_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
# Normally you would call Rails.root for this, but Rails.root refers to
5151
# dummy_app rather than our actual root.
52-
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
52+
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
5353

5454
#####################
5555
## Configure RSpec ##

0 commit comments

Comments
 (0)