admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #3284 from reitermarkus/fix-rubocop-tests

Browse Source 
Fix RuboCop tests.
This commit is contained in:
ilovezfs 2017-10-07 21:35:59 -07:00 committed by GitHub
commit 30ac040865
18 changed files with 117 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Library/Homebrew/.simplecov
View File

@ -11,11 +11,6 @@ SimpleCov.start do
# tests to be dropped. This causes random fluctuations in test coverage. # tests to be dropped. This causes random fluctuations in test coverage.
merge_timeout 86400 merge_timeout 86400
add_filter "/Homebrew/compat/"
add_filter "/Homebrew/dev-cmd/tests.rb"
add_filter "/Homebrew/test/"
add_filter "/Homebrew/vendor/"
if ENV["HOMEBREW_INTEGRATION_TEST"] if ENV["HOMEBREW_INTEGRATION_TEST"]
command_name "#{ENV["HOMEBREW_INTEGRATION_TEST"]} (#{$PROCESS_ID})" command_name "#{ENV["HOMEBREW_INTEGRATION_TEST"]} (#{$PROCESS_ID})"
@ -35,20 +30,30 @@ SimpleCov.start do
command_name "#{command_name} (#{$PROCESS_ID})" command_name "#{command_name} (#{$PROCESS_ID})"
# Not using this during integration tests makes the tests 4x times faster # Not using this during integration tests makes the tests 4x times faster
# without changing the coverage. # without changing the coverage.
track_files "#{SimpleCov.root}/**/*.rb"
subdirs = Dir.chdir(SimpleCov.root) { Dir.glob("*") }
.reject { |d| d.end_with?(".rb") || ["test", "vendor"].include?(d) }
.map { |d| "#{d}/**/*.rb" }.join(",")
track_files "#{SimpleCov.root}/{#{subdirs},*.rb}"
end end
add_filter %r{^/compat/}
add_filter %r{^/dev-cmd/tests.rb$}
add_filter %r{^/test/}
add_filter %r{^/vendor/}
# Add groups and the proper project name to the output. # Add groups and the proper project name to the output.
project_name "Homebrew" project_name "Homebrew"
add_group "Cask", "/Homebrew/cask/" add_group "Cask", %r{^/cask/}
add_group "Commands", %w[/Homebrew/cmd/ /Homebrew/dev-cmd/] add_group "Commands", [%r{/cmd/}, %r{^/dev-cmd/}]
add_group "Extensions", "/Homebrew/extend/" add_group "Extensions", %r{^/extend/}
add_group "OS", %w[/Homebrew/extend/os/ /Homebrew/os/] add_group "OS", [%r{^/extend/os/}, %r{^/os/}]
add_group "Requirements", "/Homebrew/requirements/" add_group "Requirements", %r{^/requirements/}
add_group "Scripts", %w[ add_group "Scripts", [
/Homebrew/brew.rb %r{^/brew.rb$},
/Homebrew/build.rb %r{^/build.rb$},
/Homebrew/postinstall.rb %r{^/postinstall.rb$},
/Homebrew/test.rb %r{^/test.rb$},
] ]
end end

2
Library/Homebrew/rubocops/extend/formula_cop.rb
View File

@ -298,7 +298,7 @@ module RuboCop
# Returns the array of arguments of the method_node # Returns the array of arguments of the method_node
def parameters(method_node) def parameters(method_node)
method_node.method_args if method_node.send_type? || method_node.block_type? method_node.arguments if method_node.send_type? || method_node.block_type?
end end
# Returns true if the given parameters are present in method call # Returns true if the given parameters are present in method call

4
Library/Homebrew/test/Gemfile
View File

@ -1,10 +1,12 @@
source "https://rubygems.org" source "https://rubygems.org"
require_relative "../constants"
gem "parallel_tests" gem "parallel_tests"
gem "rspec" gem "rspec"
gem "rspec-its", require: false gem "rspec-its", require: false
gem "rspec-wait", require: false gem "rspec-wait", require: false
gem "rubocop" gem "rubocop", HOMEBREW_RUBOCOP_VERSION
group :coverage do group :coverage do
gem "codecov", require: false gem "codecov", require: false

22
Library/Homebrew/test/Gemfile.lock
View File

@ -9,15 +9,15 @@ GEM
diff-lcs (1.3) diff-lcs (1.3)
docile (1.1.5) docile (1.1.5)
json (2.1.0) json (2.1.0)
parallel (1.11.2) parallel (1.12.0)
parallel_tests (2.14.1) parallel_tests (2.17.0)
parallel parallel
parser (2.4.0.0) parser (2.4.0.0)
ast (~> 2.2) ast (~> 2.2)
powerpack (0.1.1) powerpack (0.1.1)
rainbow (2.2.2) rainbow (2.2.2)
rake rake
rake (12.0.0) rake (12.1.0)
rspec (3.6.0) rspec (3.6.0)
rspec-core (~> 3.6.0) rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0) rspec-expectations (~> 3.6.0)
@ -36,20 +36,20 @@ GEM
rspec-support (3.6.0) rspec-support (3.6.0)
rspec-wait (0.0.9) rspec-wait (0.0.9)
rspec (>= 3, < 4) rspec (>= 3, < 4)
rubocop (0.49.1) rubocop (0.50.0)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0) parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1) powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0) rainbow (>= 2.2.2, < 3.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1) unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.8.1) ruby-progressbar (1.9.0)
simplecov (0.14.1) simplecov (0.15.1)
docile (~> 1.1.0) docile (~> 1.1.0)
json (>= 1.8, < 3) json (>= 1.8, < 3)
simplecov-html (~> 0.10.0) simplecov-html (~> 0.10.0)
simplecov-html (0.10.0) simplecov-html (0.10.2)
unicode-display_width (1.2.1) unicode-display_width (1.3.0)
url (0.3.2) url (0.3.2)
PLATFORMS PLATFORMS
@ -61,8 +61,8 @@ DEPENDENCIES
rspec rspec
rspec-its rspec-its
rspec-wait rspec-wait
rubocop rubocop (= 0.50.0)
simplecov simplecov
BUNDLED WITH BUNDLED WITH
1.14.6 1.15.4

4
Library/Homebrew/test/rubocops/bottle_block_cop_spec.rb
View File

@ -24,7 +24,7 @@ describe RuboCop::Cop::FormulaAuditStrict::BottleBlock do
column: 4, column: 4,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -60,7 +60,7 @@ describe RuboCop::Cop::FormulaAuditStrict::BottleBlock do
end end
EOS EOS
new_source = autocorrect_source(cop, source) new_source = autocorrect_source(source)
expect(new_source).to eq(corrected_source) expect(new_source).to eq(corrected_source)
end end
end end

2
Library/Homebrew/test/rubocops/caveats_cop_spec.rb
View File

@ -25,7 +25,7 @@ describe RuboCop::Cop::FormulaAudit::Caveats do
column: 5, column: 5,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)

12
Library/Homebrew/test/rubocops/checksum_cop_spec.rb
View File

@ -34,7 +34,7 @@ describe RuboCop::Cop::FormulaAudit::Checksum do
column: 14, column: 14,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -68,7 +68,7 @@ describe RuboCop::Cop::FormulaAudit::Checksum do
column: 14, column: 14,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -102,7 +102,7 @@ describe RuboCop::Cop::FormulaAudit::Checksum do
column: 31, column: 31,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -142,7 +142,7 @@ describe RuboCop::Cop::FormulaAudit::ChecksumCase do
column: 20, column: 20,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -175,7 +175,7 @@ describe RuboCop::Cop::FormulaAudit::ChecksumCase do
column: 12, column: 12,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -215,7 +215,7 @@ describe RuboCop::Cop::FormulaAudit::ChecksumCase do
end end
EOS EOS
new_source = autocorrect_source(cop, source) new_source = autocorrect_source(source)
expect(new_source).to eq(corrected_source) expect(new_source).to eq(corrected_source)
end end
end end

6
Library/Homebrew/test/rubocops/class_cop_spec.rb
View File

@ -29,7 +29,7 @@ describe RuboCop::Cop::FormulaAudit::ClassName do
column: 12, column: 12,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses.reverse).each do |expected, actual| expected_offenses.zip(cop.offenses.reverse).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -49,7 +49,7 @@ describe RuboCop::Cop::FormulaAudit::ClassName do
end end
EOS EOS
new_source = autocorrect_source(cop, source) new_source = autocorrect_source(source)
expect(new_source).to eq(corrected_source) expect(new_source).to eq(corrected_source)
end end
end end
@ -71,7 +71,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Test do
column: 0, column: 0,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)

12
Library/Homebrew/test/rubocops/components_order_cop_spec.rb
View File

@ -21,7 +21,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsOrder do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -47,7 +47,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsOrder do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -74,7 +74,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsOrder do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -99,7 +99,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsOrder do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -129,7 +129,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsOrder do
end end
EOS EOS
corrected_source = autocorrect_source(cop, source) corrected_source = autocorrect_source(source)
expect(corrected_source).to eq(correct_source) expect(corrected_source).to eq(correct_source)
end end
@ -156,7 +156,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsOrder do
end end
end end
EOS EOS
corrected_source = autocorrect_source(cop, source) corrected_source = autocorrect_source(source)
expect(corrected_source).to eq(correct_source) expect(corrected_source).to eq(correct_source)
end end
end end

6
Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb
View File

@ -23,7 +23,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsRedundancy do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -46,7 +46,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsRedundancy do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -70,7 +70,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsRedundancy do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)

4
Library/Homebrew/test/rubocops/conflicts_cop_spec.rb
View File

@ -22,7 +22,7 @@ describe RuboCop::Cop::FormulaAudit::Conflicts do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source, "/homebrew-core/Formula/foo@2.0.rb") inspect_source(source, "/homebrew-core/Formula/foo@2.0.rb")
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -36,7 +36,7 @@ describe RuboCop::Cop::FormulaAudit::Conflicts do
desc 'Bar' desc 'Bar'
end end
EOS EOS
inspect_source(cop, source, "/homebrew-core/Formula/foo@2.0.rb") inspect_source(source, "/homebrew-core/Formula/foo@2.0.rb")
expect(cop.offenses).to eq([]) expect(cop.offenses).to eq([])
end end
end end

16
Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb
View File

@ -20,7 +20,7 @@ describe RuboCop::Cop::FormulaAuditStrict::DescLength do
column: 0, column: 0,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -45,7 +45,7 @@ describe RuboCop::Cop::FormulaAuditStrict::DescLength do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source, "/homebrew-core/Formula/foo.rb") inspect_source(source, "/homebrew-core/Formula/foo.rb")
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
end end
@ -70,7 +70,7 @@ describe RuboCop::Cop::FormulaAuditStrict::DescLength do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source, "/homebrew-core/Formula/foo.rb") inspect_source(source, "/homebrew-core/Formula/foo.rb")
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
end end
@ -96,7 +96,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Desc do
column: 8, column: 8,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
end end
@ -116,7 +116,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Desc do
column: 8, column: 8,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
end end
@ -136,7 +136,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Desc do
column: 8, column: 8,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
end end
@ -156,7 +156,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Desc do
column: 8, column: 8,
source: source }] source: source }]
inspect_source(cop, source, "/homebrew-core/Formula/foo.rb") inspect_source(source, "/homebrew-core/Formula/foo.rb")
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
end end
@ -176,7 +176,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Desc do
end end
EOS EOS
corrected_source = autocorrect_source(cop, source, "/homebrew-core/Formula/foo.rb") corrected_source = autocorrect_source(source, "/homebrew-core/Formula/foo.rb")
expect(corrected_source).to eq(correct_source) expect(corrected_source).to eq(correct_source)
end end
end end

6
Library/Homebrew/test/rubocops/homepage_cop_spec.rb
View File

@ -20,7 +20,7 @@ describe RuboCop::Cop::FormulaAudit::Homepage do
column: 0, column: 0,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -41,7 +41,7 @@ describe RuboCop::Cop::FormulaAudit::Homepage do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -72,7 +72,7 @@ describe RuboCop::Cop::FormulaAudit::Homepage do
end end
EOS EOS
inspect_source(cop, source) inspect_source(source)
if homepage =~ %r{http:\/\/www\.freedesktop\.org} if homepage =~ %r{http:\/\/www\.freedesktop\.org}
if homepage =~ /Software/ if homepage =~ /Software/
expected_offenses = [{ message: "#{homepage} should be styled " \ expected_offenses = [{ message: "#{homepage} should be styled " \

42
Library/Homebrew/test/rubocops/lines_cop_spec.rb
View File

@ -42,7 +42,7 @@ describe RuboCop::Cop::FormulaAudit::Lines do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses.reverse).each do |expected, actual| expected_offenses.zip(cop.offenses.reverse).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -70,7 +70,7 @@ describe RuboCop::Cop::FormulaAudit::ClassInheritance do
column: 10, column: 10,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -98,7 +98,7 @@ describe RuboCop::Cop::FormulaAudit::Comments do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -120,7 +120,7 @@ describe RuboCop::Cop::FormulaAudit::Comments do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -142,7 +142,7 @@ describe RuboCop::Cop::FormulaAudit::Comments do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -170,7 +170,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -194,7 +194,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -219,7 +219,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 4, column: 4,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -246,7 +246,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 7, column: 7,
source: source }] source: source }]
inspect_source(cop, source, "/homebrew-core/") inspect_source(source, "/homebrew-core/")
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -274,7 +274,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -299,7 +299,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -324,7 +324,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -349,7 +349,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -373,7 +373,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 5, column: 5,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -391,7 +391,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
end end
EOS EOS
inspect_source(cop, source, "/homebrew-core/Formula/wine.rb") inspect_source(source, "/homebrew-core/Formula/wine.rb")
expect(cop.offenses).to eq([]) expect(cop.offenses).to eq([])
end end
@ -412,7 +412,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 5, column: 5,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -436,7 +436,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 5, column: 5,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -458,7 +458,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 10, column: 10,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -474,7 +474,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
end end
EOS EOS
inspect_source(cop, source, "/homebrew-core/Formula/cctools.rb") inspect_source(source, "/homebrew-core/Formula/cctools.rb")
expect(cop.offenses).to eq([]) expect(cop.offenses).to eq([])
end end
@ -493,7 +493,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -509,7 +509,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
end end
EOS EOS
inspect_source(cop, source, "/homebrew-core/Formula/kibana@4.4.rb") inspect_source(source, "/homebrew-core/Formula/kibana@4.4.rb")
expect(cop.offenses).to eq([]) expect(cop.offenses).to eq([])
end end
end end

10
Library/Homebrew/test/rubocops/options_cop_spec.rb
View File

@ -21,7 +21,7 @@ describe RuboCop::Cop::FormulaAudit::Options do
column: 10, column: 10,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -48,7 +48,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Options do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -72,7 +72,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Options do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -95,7 +95,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Options do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -122,7 +122,7 @@ describe RuboCop::Cop::NewFormulaAudit::Options do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)

10
Library/Homebrew/test/rubocops/patches_cop_spec.rb
View File

@ -13,7 +13,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
url 'http://example.com/foo-1.0.tgz' url 'http://example.com/foo-1.0.tgz'
end end
EOS EOS
inspect_source(cop, source) inspect_source(source)
expect(cop.offenses).to eq([]) expect(cop.offenses).to eq([])
end end
@ -34,7 +34,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -61,7 +61,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
end end
EOS EOS
inspect_source(cop, source) inspect_source(source)
expected_offense = if patch_url =~ %r{/raw\.github\.com/} expected_offense = if patch_url =~ %r{/raw\.github\.com/}
[{ message: <<-EOS.undent.chomp, [{ message: <<-EOS.undent.chomp,
GitHub/Gist patches should specify a revision: GitHub/Gist patches should specify a revision:
@ -154,7 +154,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
column: 26, column: 26,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -183,7 +183,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
end end
EOS EOS
inspect_source(cop, source) inspect_source(source)
expected_offense = if patch_url =~ %r{/raw\.github\.com/} expected_offense = if patch_url =~ %r{/raw\.github\.com/}
[{ message: <<-EOS.undent.chomp, [{ message: <<-EOS.undent.chomp,
GitHub/Gist patches should specify a revision: GitHub/Gist patches should specify a revision:

22
Library/Homebrew/test/rubocops/text_cop_spec.rb
View File

@ -24,7 +24,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -48,7 +48,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -73,7 +73,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 4, column: 4,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -98,7 +98,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 4, column: 4,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -123,7 +123,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 4, column: 4,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -148,7 +148,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 4, column: 4,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -173,7 +173,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 4, column: 4,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -210,7 +210,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -237,7 +237,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 0, column: 0,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -267,7 +267,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -292,7 +292,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 4, column: 4,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual| expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)

10
Library/Homebrew/test/rubocops/urls_cop_spec.rb
View File

@ -126,7 +126,7 @@ describe RuboCop::Cop::FormulaAudit::Urls do
column: formula["col"], column: formula["col"],
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses.reverse).each do |expected, actual| expected_offenses.zip(cop.offenses.reverse).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -160,7 +160,7 @@ describe RuboCop::Cop::FormulaAudit::Urls do
column: formula["col"], column: formula["col"],
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses.reverse).each do |expected, actual| expected_offenses.zip(cop.offenses.reverse).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -183,7 +183,7 @@ describe RuboCop::Cop::FormulaAudit::Urls do
column: 2, column: 2,
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
expected_offenses.zip(cop.offenses.reverse).each do |expected, actual| expected_offenses.zip(cop.offenses.reverse).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
@ -222,13 +222,13 @@ describe RuboCop::Cop::FormulaAuditStrict::PyPiUrls do
column: formula["col"], column: formula["col"],
source: source }] source: source }]
inspect_source(cop, source) inspect_source(source)
# Check for expected offenses # Check for expected offenses
expected_offenses.zip(cop.offenses.reverse).each do |expected, actual| expected_offenses.zip(cop.offenses.reverse).each do |expected, actual|
expect_offense(expected, actual) expect_offense(expected, actual)
end end
# Check for expected auto corrected source # Check for expected auto corrected source
new_source = autocorrect_source(cop, source) new_source = autocorrect_source(source)
expect(new_source).to eq(corrected_source) expect(new_source).to eq(corrected_source)
end end
end end