ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bundle update rubocop 

Change-Id: I715c95f48bcbe6d1e4e97590401f7514d5cfcf1a
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/341920
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Build-Review: Aaron Ogata <aogata@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2024-03-01 10:29:56 -07:00
parent 9c8f15d936
commit 52b91801ba
9 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.rubocop.yml
View File

@ -149,6 +149,10 @@ RSpec/InstanceVariable:
Enabled: false # legacy code
RSpec/MultipleMemoizedHelpers:
Enabled: false # complicated setup is sometimes necessary
RSpec/RepeatedSubjectCall:
Enabled: false # referencing and calling methods on the subject multiple times is fine;
# depending on calling `subject` multiple times having side effects is not.
# unfortunately the cop can't tell the difference.
RSpec/SubjectStub:
Enabled: false # yes, canvas is big and complicated sometimes

8
Gemfile.d/rubocop.rb.lock
View File

@ -100,7 +100,7 @@ GEM
rake (13.1.0)
regexp_parser (2.9.0)
rexml (3.2.6)
rubocop (1.60.2)
rubocop (1.61.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
@ -111,8 +111,8 @@ GEM
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-ast (1.31.1)
parser (>= 3.3.0.4)
rubocop-capybara (2.20.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.25.1)
@ -132,7 +132,7 @@ GEM
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.26.1)
rubocop-rspec (2.27.0)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)

8
Gemfile.lock
View File

@ -952,7 +952,7 @@ GEM
rspec-core (>= 2, < 4, != 2.12.0)
rss (0.3.0)
rexml
rubocop (1.60.2)
rubocop (1.61.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
@ -963,8 +963,8 @@ GEM
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-ast (1.31.1)
parser (>= 3.3.0.4)
rubocop-capybara (2.20.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.25.1)
@ -984,7 +984,7 @@ GEM
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.26.1)
rubocop-rspec (2.27.0)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)

8
Gemfile.rails71.lock
View File

@ -969,7 +969,7 @@ GEM
rspec-core (>= 2, < 4, != 2.12.0)
rss (0.3.0)
rexml
rubocop (1.60.2)
rubocop (1.61.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
@ -980,8 +980,8 @@ GEM
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-ast (1.31.1)
parser (>= 3.3.0.4)
rubocop-capybara (2.20.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.25.1)
@ -1001,7 +1001,7 @@ GEM
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.26.1)
rubocop-rspec (2.27.0)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)

2
app/services/video_caption_service.rb
View File

@ -19,6 +19,8 @@
class VideoCaptionService < ApplicationService
def initialize(media_object, skip_polling: false)
super()
@skip_polling = skip_polling # for testing purposes
@media_object = media_object
@type = media_object.media_type

6
gems/rubocop-canvas/Gemfile.lock
View File

@ -122,7 +122,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.0)
rubocop (1.60.2)
rubocop (1.61.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
@ -133,8 +133,8 @@ GEM
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-ast (1.31.1)
parser (>= 3.3.0.4)
rubocop-rails (2.23.1)
activesupport (>= 4.2.0)
rack (>= 1.1)

6
gems/rubocop-canvas/Gemfile.rails71.lock
View File

@ -142,7 +142,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.0)
rubocop (1.60.2)
rubocop (1.61.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
@ -153,8 +153,8 @@ GEM
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-ast (1.31.1)
parser (>= 3.3.0.4)
rubocop-rails (2.23.1)
activesupport (>= 4.2.0)
rack (>= 1.1)

4
lib/microsoft_sync/syncer_steps.rb
View File

@ -344,8 +344,8 @@ module MicrosoftSync
end
def step_check_team_exists(_mem_data, _job_state_data)
if course.enrollments.where(type: MembershipDiff::OWNER_ENROLLMENT_TYPES).any? \
&& !graph_service.teams.team_exists?(group.ms_group_id)
if course.enrollments.where(type: MembershipDiff::OWNER_ENROLLMENT_TYPES).any? &&
!graph_service.teams.team_exists?(group.ms_group_id)
StateMachineJob::DelayedNextStep.new(:step_create_team, DELAY_BEFORE_CREATE_TEAM)
else
StateMachineJob::COMPLETE

3
spec/lib/grade_calculator_spec.rb
View File

@ -398,8 +398,7 @@ describe GradeCalculator do
end
it "emits one live event per student" do
expect(Canvas::LiveEvents).to receive(:course_grade_change).exactly(1).times \
do |score, old_score_values, enrollment|
expect(Canvas::LiveEvents).to receive(:course_grade_change).once do |score, old_score_values, enrollment|
expect(enrollment.user_id).to eq(@student.id)
expect(enrollment.course_id).to eq(@course.id)
expect(score.current_score).to eq(60)