Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the rubocop group with 2 updates #5592

Merged
merged 2 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ group :development do
gem 'web-console', '~> 4.2.1'

gem 'rb-readline', '~> 0.5.5' # require for irb
gem 'rubocop-capybara', '~> 2.20.0'
gem 'rubocop-factory_bot', '~> 2.25'
gem 'rubocop-capybara', '~> 2.21.0'
gem 'rubocop-factory_bot', '~> 2.26'
gem 'rubocop-minitest', '~> 0.35.0'
gem 'rubocop-rails', '~> 2.25.0'

Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,8 @@ GEM
validate_url
webfinger (~> 2.0)
orm_adapter (0.5.0)
parallel (1.24.0)
parser (3.3.1.0)
parallel (1.25.1)
parser (3.3.2.0)
ast (~> 2.4.1)
racc
premailer (1.18.0)
Expand Down Expand Up @@ -445,10 +445,10 @@ GEM
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.2.8)
strscan (>= 3.0.9)
rexml (3.2.9)
strscan
rouge (4.2.1)
rubocop (1.63.5)
rubocop (1.64.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -461,9 +461,9 @@ GEM
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
parser (>= 3.3.1.0)
rubocop-capybara (2.20.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.25.1)
rubocop-factory_bot (2.26.0)
rubocop (~> 1.41)
rubocop-minitest (0.35.0)
rubocop (>= 1.61, < 2.0)
Expand Down Expand Up @@ -630,8 +630,8 @@ DEPENDENCIES
rails-i18n (~> 7.0.9)
rb-readline (~> 0.5.5)
rouge (= 4.2.1)
rubocop-capybara (~> 2.20.0)
rubocop-factory_bot (~> 2.25)
rubocop-capybara (~> 2.21.0)
rubocop-factory_bot (~> 2.26)
rubocop-minitest (~> 0.35.0)
rubocop-rails (~> 2.25.0)
ruby-saml (~> 1.16.0)
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/renderers/pythia_renderer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ def output_message(m)
@builder.text! m[:description]
end
else
super(m)
super
end
end

def testcase(tc)
return super(tc) unless tc[:data] && tc[:data][:files]
return super unless tc[:data] && tc[:data][:files]

jsonfiles = tc[:data][:files].to_a.to_h do |key, value|
value[:content] = "#{value[:content]}?token=#{@exercise.access_token}" \
Expand Down
2 changes: 1 addition & 1 deletion app/models/api_token.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ApiToken < ApplicationRecord
attr_reader :token

def initialize(*params)
super(*params)
super

# If there is no digest (we have a new instance)
# generate a new random token
Expand Down
4 changes: 2 additions & 2 deletions app/models/evaluation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ class Evaluation < ApplicationRecord
def users=(new_users)
removed = users - new_users
evaluation_users.where(user: removed).destroy_all
super(new_users)
super
end

def exercises=(new_exercises)
removed = exercises - new_exercises
evaluation_exercises.where(exercise: removed).destroy_all
super(new_exercises)
super
end

def metadata
Expand Down
2 changes: 1 addition & 1 deletion app/models/submission.rb
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def initialize(params)
@evaluate = params.delete(:evaluate)
code = params.delete(:code)
result = params.delete(:result)
super(params)
super
# We need to do this after the rest of the fields are initialized, because we depend on the course_id, user_id, ...
self.code = code.to_s unless code.nil?
self.result = result.to_s unless result.nil?
Expand Down