Skip to content

Commit fb8f767

Browse files
MrSerthdependabot[bot]
authored andcommitted
Fix Rubocop offenses
1 parent 3b886e2 commit fb8f767

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

app/controllers/community_solutions_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ def edit
3232
# If the first user did not save, the ReadMe file already exists
3333
@files << CodeOcean::File.find_or_create_by!(new_readme_file)
3434
end
35-
all_visible_files = last_contribution.files.select(&:visible)
35+
all_visible_files = last_contribution.files.select(&:visible?)
3636
# Add the ReadMe file first
3737
@files += all_visible_files.select {|f| CodeOcean::File.find_by(id: f.file_id)&.context_type == 'CommunitySolution' }
3838
# Then, add all remaining files and sort them by name with extension
3939
@files += (all_visible_files - @files).sort_by(&:filepath)
4040

4141
# Own Submission as a reference
42-
@own_files = @submission.collect_files.select(&:visible).sort_by(&:filepath)
42+
@own_files = @submission.collect_files.select(&:visible?).sort_by(&:filepath)
4343
# Remove the file_id from the second graph. Otherwise, the comparison and file-tree selection does not work as expected
4444
@own_files.map do |file|
4545
file.file_id = nil

app/controllers/exercises_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ def implement # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedC
418418
@hide_rfc_button = @embed_options[:disable_rfc]
419419

420420
@submission = current_contributor.submissions.order(created_at: :desc).find_by(exercise: @exercise)
421-
@files = (@submission ? @submission.collect_files : @exercise.files).select(&:visible).sort_by(&:filepath)
421+
@files = (@submission ? @submission.collect_files : @exercise.files).select(&:visible?).sort_by(&:filepath)
422422
@paths = collect_paths(@files)
423423
end
424424

app/controllers/submissions_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ def set_files_and_specific_file
469469
end
470470

471471
def set_files
472-
@files = @submission.collect_files.select(&:visible)
472+
@files = @submission.collect_files.select(&:visible?)
473473
end
474474

475475
def set_submission

app/models/code_ocean/file.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def set_default_values
153153
end
154154
private :set_default_values
155155

156-
def visible
156+
def visible?
157157
!hidden
158158
end
159159

app/models/exercise.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ def get_quantiles(quantiles)
377377
SELECT unnest(percentile_cont(#{self.class.sanitize_sql(['array[?]', quantiles])}) within GROUP (ORDER BY working_time))
378378
FROM result
379379
")
380-
if result.count.positive?
380+
if result.any?
381381
quantiles.each_with_index.map {|_q, i| parse_duration(result[i]['unnest']).to_f }
382382
else
383383
quantiles.map {|_q| 0 }
@@ -512,7 +512,7 @@ def set_default_values
512512
private :set_default_values
513513

514514
def valid_main_file?
515-
if files.count(&:main_file?) > 1
515+
if files.many?(&:main_file?)
516516
errors.add(:files, :at_most_one_main_file)
517517
end
518518
end

app/models/testrun_message.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def self.validate_and_store!(messages)
9999
private_class_method :validate_and_store!
100100

101101
def either_data_or_log
102-
if [data, log].count(&:present?) > 1
102+
if [data, log].many?(&:present?)
103103
errors.add(log, "can't be present if data is also present")
104104
end
105105
end
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
- if object.errors.any?
22
#error_explanation.alert.alert-warning
3-
h4 = "#{t("shared.errors_#{object.errors.count == 1 ? 'one' : 'other'}", count: object.errors.count, model: object.class.model_name.human)}:"
3+
h4 = "#{t("shared.errors_#{object.errors.one? ? 'one' : 'other'}", count: object.errors.count, model: object.class.model_name.human)}:"
44
ul
55
- object.errors.full_messages.each do |message|
66
li = message

app/views/submissions/show.json.jbuilder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ json.files @submission.files do |file|
55
json.extract! file, :id, :file_id
66
end
77
unless @embed_options[:disable_download]
8-
json.render_url @submission.collect_files.select(&:visible) do |files|
8+
json.render_url @submission.collect_files.select(&:visible?) do |files|
99
host = ApplicationController::RENDER_HOST || request.host
1010
url = render_submission_url(@submission, files.filepath, host:)
1111

lib/java21_study.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
# frozen_string_literal: true
22

33
class Java21Study
4-
def self.get_for(exercise)
4+
def self.get_for?(exercise)
55
java21_collection = ExerciseCollection.find_by(name: 'java2021', id: 13)
66

77
exercise.exercise_collections.include? java21_collection
88
end
99

1010
def self.show_tips_intervention?(user, exercise)
11-
java21_exercise = get_for(exercise)
11+
java21_exercise = get_for?(exercise)
1212
return false unless java21_exercise # Exercise is not part of the experiment
1313

1414
user_group = UserGroupSeparator.get_intervention_group(user.id)
1515
user_group == :show_tips_intervention
1616
end
1717

1818
def self.show_break_intervention?(user, exercise)
19-
java21_exercise = get_for(exercise)
19+
java21_exercise = get_for?(exercise)
2020
return false unless java21_exercise # Exercise is not part of the experiment
2121

2222
user_group = UserGroupSeparator.get_intervention_group(user.id)
2323
user_group == :show_break_intervention
2424
end
2525

2626
def self.allow_redirect_to_community_solution?(user, exercise)
27-
java21_exercise = get_for(exercise)
27+
java21_exercise = get_for?(exercise)
2828
return false unless java21_exercise # Exercise is not part of the experiment
2929

3030
user_group = UserGroupSeparator.get_community_solution_group(user.id)

spec/system/editor_system_spec.rb

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

4545
it 'displays all visible files in a file tree' do
4646
within('#files') do
47-
exercise.files.select(&:visible).each do |file|
47+
exercise.files.select(&:visible?).each do |file|
4848
expect(page).to have_content(file.name_with_extension)
4949
end
5050
end

0 commit comments

Comments
 (0)