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 

and apply new cops. well, mostly. I skipped the update of the rubocop
gem itself until
f005b0506d
is released, since otherwise it spits out a _ton_ of un-actionable
deprecation warnings

Change-Id: I300d0180ed2028060c46491f2baa3efd5336830c
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/353237
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2024-07-22 11:51:41 -06:00
parent 445fe2aea5
commit d35261f22c
7 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ GEM
activerecord (>= 6.0, < 7.2)
railties (>= 6.0, < 7.2)
parallel (1.25.1)
parser (3.3.3.0)
parser (3.3.4.0)
ast (~> 2.4.1)
racc
psych (5.1.2)
@ -163,7 +163,7 @@ GEM
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (3.0.2)
rubocop-rspec (3.0.3)
rubocop (~> 1.61)
rubocop-rspec_rails (2.30.0)
rubocop (~> 1.61)

4
Gemfile.lock
View File

@ -842,7 +842,7 @@ GEM
term-ansicolor (~> 1.7)
thor (>= 0.20, < 2.0)
parallel (1.25.1)
parser (3.3.3.0)
parser (3.3.4.0)
ast (~> 2.4.1)
racc
parslet (2.0.0)
@ -1029,7 +1029,7 @@ GEM
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (3.0.2)
rubocop-rspec (3.0.3)
rubocop (~> 1.61)
rubocop-rspec_rails (2.30.0)
rubocop (~> 1.61)

4
gems/canvas_dynamodb/canvas_dynamodb.gemspec
View File

@ -13,8 +13,8 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]
spec.add_runtime_dependency "aws-sdk-applicationautoscaling", "~> 1.26"
spec.add_runtime_dependency "aws-sdk-dynamodb", "~> 1.32"
spec.add_dependency "aws-sdk-applicationautoscaling", "~> 1.26"
spec.add_dependency "aws-sdk-dynamodb", "~> 1.32"
spec.add_development_dependency "bundler", "~> 2.2"
spec.add_development_dependency "rake"

2
gems/google_drive/google_drive.gemspec
View File

@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]
spec.add_runtime_dependency "google-apis-drive_v3", "~> 0.43"
spec.add_dependency "google-apis-drive_v3", "~> 0.43"
spec.add_development_dependency "bundler"
spec.add_development_dependency "debug"

4
gems/lti-advantage/lti-advantage.gemspec
View File

@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]
spec.add_runtime_dependency "activemodel", ">= 5.1"
spec.add_runtime_dependency "json-jwt", "~> 1.5"
spec.add_dependency "activemodel", ">= 5.1"
spec.add_dependency "json-jwt", "~> 1.5"
spec.add_development_dependency "bundler", "~> 2.2"
spec.add_development_dependency "rake"

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

@ -87,7 +87,7 @@ GEM
activerecord (>= 6.0, < 7.2)
railties (>= 6.0, < 7.2)
parallel (1.25.1)
parser (3.3.3.0)
parser (3.3.4.0)
ast (~> 2.4.1)
racc
psych (5.1.2)

14
spec/selenium/test_setup/custom_selenium_rspec_matchers.rb
View File

@ -252,13 +252,19 @@ module CustomSeleniumRSpecMatchers
end
failure_message do |element|
"expected #{element.inspect}'s opacity to be 0.5, actual opacity is: #{element.style("opacity")}" if element.style("opacity") != "0.5"
"expected #{element.inspect}'s pointer-events to be 'none', actual pointer-events is : #{element.style("pointer-events")}" if element.style("pointer-events") != "none"
if element.style("opacity") != "0.5"
"expected #{element.inspect}'s opacity to be 0.5, actual opacity is: #{element.style("opacity")}"
elsif element.style("pointer-events") != "none"
"expected #{element.inspect}'s pointer-events to be 'none', actual pointer-events is : #{element.style("pointer-events")}"
end
end
failure_message_when_negated do |element|
"expected #{element.inspect}'s opacity to be 1, actual opacity is: #{element.style("opacity")}" if element.style("opacity") != "1"
"expected #{element.inspect}'s pointer-events to be 'auto', actual pointer-events is : #{element.style("pointer-events")}" if element.style("pointer-events") != "auto"
if element.style("opacity") != "1"
"expected #{element.inspect}'s opacity to be 1, actual opacity is: #{element.style("opacity")}"
elsif element.style("pointer-events") != "auto"
"expected #{element.inspect}'s pointer-events to be 'auto', actual pointer-events is : #{element.style("pointer-events")}"
end
end
end