Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Commit

Permalink
Merge #7452
Browse files Browse the repository at this point in the history
7452: Bump rubocop and rubocop-performance r=deivid-rodriguez a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was not really a problem, but it's good to keep our dependencies up to date.

### What is your fix for the problem, implemented in this PR?

My fix is to bump rubocop and rubocop-performance.


Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
  • Loading branch information
bundlerbot and deivid-rodriguez committed Nov 23, 2019
2 parents 0a866d0 + a5a6577 commit 3e54fbc
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
24 changes: 12 additions & 12 deletions .rubocop.yml
Expand Up @@ -183,15 +183,6 @@ Lint/UnderscorePrefixedVariableName:
Lint/UnifiedInteger:
Enabled: true

Lint/UnneededCopDisableDirective:
Enabled: true

Lint/UnneededCopEnableDirective:
Enabled: true

Lint/UnneededSplatExpansion:
Enabled: true

Lint/UnreachableCode:
Enabled: true

Expand Down Expand Up @@ -705,9 +696,18 @@ Style/RedundantBegin:
Style/RedundantConditional:
Enabled: true

Lint/RedundantCopDisableDirective:
Enabled: true

Lint/RedundantCopEnableDirective:
Enabled: true

Style/RedundantException:
Enabled: true

Style/RedundantInterpolation:
Enabled: true

Style/RedundantParentheses:
Enabled: true

Expand All @@ -717,6 +717,9 @@ Style/RedundantSelf:
Style/RedundantSortBy:
Enabled: true

Lint/RedundantSplatExpansion:
Enabled: true

Style/RegexpLiteral:
Enabled: true

Expand Down Expand Up @@ -798,9 +801,6 @@ Style/TrailingCommaInHashLiteral:
Style/TrailingMethodEndStatement:
Enabled: true

Style/UnneededInterpolation:
Enabled: true

Style/UnlessElse:
Enabled: true

Expand Down
4 changes: 2 additions & 2 deletions spec/bundler/fetcher_spec.rb
Expand Up @@ -144,14 +144,14 @@
describe "include CI information" do
it "from one CI" do
with_env_vars("JENKINS_URL" => "foo") do
ci_part = fetcher.user_agent.split(" ").find {|x| x.match(%r{\Aci/}) }
ci_part = fetcher.user_agent.split(" ").find {|x| x.start_with?("ci/") }
expect(ci_part).to match("jenkins")
end
end

it "from many CI" do
with_env_vars("TRAVIS" => "foo", "CI_NAME" => "my_ci") do
ci_part = fetcher.user_agent.split(" ").find {|x| x.match(%r{\Aci/}) }
ci_part = fetcher.user_agent.split(" ").find {|x| x.start_with?("ci/") }
expect(ci_part).to match("travis")
expect(ci_part).to match("my_ci")
end
Expand Down
4 changes: 2 additions & 2 deletions spec/support/rubygems_ext.rb
Expand Up @@ -10,8 +10,8 @@ module Rubygems
"rake" => "~> 12.0",
"ronn" => "~> 0.7.3",
"rspec" => "~> 3.8",
"rubocop" => "= 0.74.0",
"rubocop-performance" => "= 1.4.0",
"rubocop" => "= 0.76.0",
"rubocop-performance" => "= 1.5.1",
}.freeze

DEPS = {
Expand Down

0 comments on commit 3e54fbc

Please sign in to comment.