diff --git a/Library/Homebrew/rubocops/extend/formula_cop.rb b/Library/Homebrew/rubocops/extend/formula_cop.rb
index 47dd2d80336d8d4f1cb50efea73c9619b5e36153..fccce0deda1990a0903c876d5a5581973d2c469f 100644
--- a/Library/Homebrew/rubocops/extend/formula_cop.rb
+++ b/Library/Homebrew/rubocops/extend/formula_cop.rb
@@ -298,7 +298,7 @@ module RuboCop
# Returns the array of arguments of the 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
# Returns true if the given parameters are present in method call
diff --git a/Library/Homebrew/test/Gemfile b/Library/Homebrew/test/Gemfile
index dbe76b51c4a86ff781784e29f3164bcc20947c90..b6d1405ff63c267c59d3eaa9e2fd1650b58a07b5 100644
--- a/Library/Homebrew/test/Gemfile
+++ b/Library/Homebrew/test/Gemfile
@@ -1,10 +1,12 @@
source "https://rubygems.org"
+require_relative "../constants"
+
gem "parallel_tests"
gem "rspec"
gem "rspec-its", require: false
gem "rspec-wait", require: false
-gem "rubocop"
+gem "rubocop", HOMEBREW_RUBOCOP_VERSION
group :coverage do
gem "codecov", require: false
diff --git a/Library/Homebrew/test/Gemfile.lock b/Library/Homebrew/test/Gemfile.lock
index ccfd91542d26e3c97a933d7538658669469f6ab7..ba12d091d4b23708871071a7787f64eb3f6ebd86 100644
--- a/Library/Homebrew/test/Gemfile.lock
+++ b/Library/Homebrew/test/Gemfile.lock
@@ -9,15 +9,15 @@ GEM
diff-lcs (1.3)
docile (1.1.5)
json (2.1.0)
- parallel (1.11.2)
- parallel_tests (2.14.1)
+ parallel (1.12.0)
+ parallel_tests (2.17.0)
parallel
parser (2.4.0.0)
ast (~> 2.2)
powerpack (0.1.1)
rainbow (2.2.2)
rake
- rake (12.0.0)
+ rake (12.1.0)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
@@ -36,20 +36,20 @@ GEM
rspec-support (3.6.0)
rspec-wait (0.0.9)
rspec (>= 3, < 4)
- rubocop (0.49.1)
+ rubocop (0.50.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
- rainbow (>= 1.99.1, < 3.0)
+ rainbow (>= 2.2.2, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
- ruby-progressbar (1.8.1)
- simplecov (0.14.1)
+ ruby-progressbar (1.9.0)
+ simplecov (0.15.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
- simplecov-html (0.10.0)
- unicode-display_width (1.2.1)
+ simplecov-html (0.10.2)
+ unicode-display_width (1.3.0)
url (0.3.2)
PLATFORMS
@@ -61,8 +61,8 @@ DEPENDENCIES
rspec
rspec-its
rspec-wait
- rubocop
+ rubocop (= 0.50.0)
simplecov
BUNDLED WITH
- 1.14.6
+ 1.15.4
diff --git a/Library/Homebrew/test/rubocops/bottle_block_cop_spec.rb b/Library/Homebrew/test/rubocops/bottle_block_cop_spec.rb
index 563f7ad4be65a5346eeae6f2b941d49f85585322..b1afdc3f94437dd66e42e9193be0f9470c7e3576 100644
--- a/Library/Homebrew/test/rubocops/bottle_block_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/bottle_block_cop_spec.rb
@@ -24,7 +24,7 @@ describe RuboCop::Cop::FormulaAuditStrict::BottleBlock do
column: 4,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -60,7 +60,7 @@ describe RuboCop::Cop::FormulaAuditStrict::BottleBlock do
end
EOS
- new_source = autocorrect_source(cop, source)
+ new_source = autocorrect_source(source)
expect(new_source).to eq(corrected_source)
end
end
diff --git a/Library/Homebrew/test/rubocops/caveats_cop_spec.rb b/Library/Homebrew/test/rubocops/caveats_cop_spec.rb
index d44808a5d7475f9dcd6b375d04175b3c386d7ac7..4dbe65cfb8112f6fe52f236cfeb22dd1827117e4 100644
--- a/Library/Homebrew/test/rubocops/caveats_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/caveats_cop_spec.rb
@@ -25,7 +25,7 @@ describe RuboCop::Cop::FormulaAudit::Caveats do
column: 5,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
diff --git a/Library/Homebrew/test/rubocops/checksum_cop_spec.rb b/Library/Homebrew/test/rubocops/checksum_cop_spec.rb
index 644152c32cae597a356e81e4eee9124d28f6a281..2f508bbf52333ba72d4860aa35c430cb18ea9daa 100644
--- a/Library/Homebrew/test/rubocops/checksum_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/checksum_cop_spec.rb
@@ -34,7 +34,7 @@ describe RuboCop::Cop::FormulaAudit::Checksum do
column: 14,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -68,7 +68,7 @@ describe RuboCop::Cop::FormulaAudit::Checksum do
column: 14,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -102,7 +102,7 @@ describe RuboCop::Cop::FormulaAudit::Checksum do
column: 31,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -142,7 +142,7 @@ describe RuboCop::Cop::FormulaAudit::ChecksumCase do
column: 20,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -175,7 +175,7 @@ describe RuboCop::Cop::FormulaAudit::ChecksumCase do
column: 12,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -215,7 +215,7 @@ describe RuboCop::Cop::FormulaAudit::ChecksumCase do
end
EOS
- new_source = autocorrect_source(cop, source)
+ new_source = autocorrect_source(source)
expect(new_source).to eq(corrected_source)
end
end
diff --git a/Library/Homebrew/test/rubocops/class_cop_spec.rb b/Library/Homebrew/test/rubocops/class_cop_spec.rb
index 676dd4f6e96e19cd086325ee291385d8f784da7e..59252587c03b21c084312569453b8a572d05180e 100644
--- a/Library/Homebrew/test/rubocops/class_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/class_cop_spec.rb
@@ -29,7 +29,7 @@ describe RuboCop::Cop::FormulaAudit::ClassName do
column: 12,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses.reverse).each do |expected, actual|
expect_offense(expected, actual)
@@ -49,7 +49,7 @@ describe RuboCop::Cop::FormulaAudit::ClassName do
end
EOS
- new_source = autocorrect_source(cop, source)
+ new_source = autocorrect_source(source)
expect(new_source).to eq(corrected_source)
end
end
@@ -71,7 +71,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Test do
column: 0,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
diff --git a/Library/Homebrew/test/rubocops/components_order_cop_spec.rb b/Library/Homebrew/test/rubocops/components_order_cop_spec.rb
index 25467c6353e930e48d43adcf1cf9cdabad1d9c8c..f093f4927979d3e2bd06a0bfab5bc92b0fa88d27 100644
--- a/Library/Homebrew/test/rubocops/components_order_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/components_order_cop_spec.rb
@@ -21,7 +21,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsOrder do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -47,7 +47,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsOrder do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -74,7 +74,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsOrder do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -99,7 +99,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsOrder do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -129,7 +129,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsOrder do
end
EOS
- corrected_source = autocorrect_source(cop, source)
+ corrected_source = autocorrect_source(source)
expect(corrected_source).to eq(correct_source)
end
@@ -156,7 +156,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsOrder do
end
end
EOS
- corrected_source = autocorrect_source(cop, source)
+ corrected_source = autocorrect_source(source)
expect(corrected_source).to eq(correct_source)
end
end
diff --git a/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb b/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb
index fd635a1264589339e54db4850cd7d16ab727407c..9fbe1590412a66edcbe3347fdfc7d53c361c7446 100644
--- a/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb
@@ -23,7 +23,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsRedundancy do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -46,7 +46,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsRedundancy do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -70,7 +70,7 @@ describe RuboCop::Cop::FormulaAuditStrict::ComponentsRedundancy do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
diff --git a/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb b/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb
index 3af0f96697c35f90da7fead174056d43379da794..8874ecc963e0bffdb8df9469129c40af35145003 100644
--- a/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb
@@ -22,7 +22,7 @@ describe RuboCop::Cop::FormulaAudit::Conflicts do
column: 2,
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|
expect_offense(expected, actual)
@@ -36,7 +36,7 @@ describe RuboCop::Cop::FormulaAudit::Conflicts do
desc 'Bar'
end
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([])
end
end
diff --git a/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb b/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb
index 48342e8bca5e88e576606105f08eba7c404c89ae..ac8893e18088702b64f8b9c519163c540521bdf5 100644
--- a/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb
@@ -20,7 +20,7 @@ describe RuboCop::Cop::FormulaAuditStrict::DescLength do
column: 0,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -45,7 +45,7 @@ describe RuboCop::Cop::FormulaAuditStrict::DescLength do
column: 2,
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|
expect_offense(expected, actual)
end
@@ -70,7 +70,7 @@ describe RuboCop::Cop::FormulaAuditStrict::DescLength do
column: 2,
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|
expect_offense(expected, actual)
end
@@ -96,7 +96,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Desc do
column: 8,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
end
@@ -116,7 +116,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Desc do
column: 8,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
end
@@ -136,7 +136,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Desc do
column: 8,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
end
@@ -156,7 +156,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Desc do
column: 8,
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|
expect_offense(expected, actual)
end
@@ -176,7 +176,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Desc do
end
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)
end
end
diff --git a/Library/Homebrew/test/rubocops/homepage_cop_spec.rb b/Library/Homebrew/test/rubocops/homepage_cop_spec.rb
index c03efd82573b3417cadfbd4e0b24635551b14c12..6c7f248baa8c57f448ef5da5564cfeb4cb1e1a24 100644
--- a/Library/Homebrew/test/rubocops/homepage_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/homepage_cop_spec.rb
@@ -20,7 +20,7 @@ describe RuboCop::Cop::FormulaAudit::Homepage do
column: 0,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -41,7 +41,7 @@ describe RuboCop::Cop::FormulaAudit::Homepage do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -72,7 +72,7 @@ describe RuboCop::Cop::FormulaAudit::Homepage do
end
EOS
- inspect_source(cop, source)
+ inspect_source(source)
if homepage =~ %r{http:\/\/www\.freedesktop\.org}
if homepage =~ /Software/
expected_offenses = [{ message: "#{homepage} should be styled " \
diff --git a/Library/Homebrew/test/rubocops/lines_cop_spec.rb b/Library/Homebrew/test/rubocops/lines_cop_spec.rb
index d939626883d06c037c8d62ae03754f7f86fa313a..753439c8e27bddb41cecd3d83d2517c1522e2da8 100644
--- a/Library/Homebrew/test/rubocops/lines_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/lines_cop_spec.rb
@@ -42,7 +42,7 @@ describe RuboCop::Cop::FormulaAudit::Lines do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses.reverse).each do |expected, actual|
expect_offense(expected, actual)
@@ -70,7 +70,7 @@ describe RuboCop::Cop::FormulaAudit::ClassInheritance do
column: 10,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -98,7 +98,7 @@ describe RuboCop::Cop::FormulaAudit::Comments do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -120,7 +120,7 @@ describe RuboCop::Cop::FormulaAudit::Comments do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -142,7 +142,7 @@ describe RuboCop::Cop::FormulaAudit::Comments do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -170,7 +170,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -194,7 +194,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -219,7 +219,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 4,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -246,7 +246,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 7,
source: source }]
- inspect_source(cop, source, "/homebrew-core/")
+ inspect_source(source, "/homebrew-core/")
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -274,7 +274,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -299,7 +299,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -324,7 +324,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -349,7 +349,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -373,7 +373,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 5,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -391,7 +391,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
end
EOS
- inspect_source(cop, source, "/homebrew-core/Formula/wine.rb")
+ inspect_source(source, "/homebrew-core/Formula/wine.rb")
expect(cop.offenses).to eq([])
end
@@ -412,7 +412,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 5,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -436,7 +436,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 5,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -458,7 +458,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 10,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -474,7 +474,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
end
EOS
- inspect_source(cop, source, "/homebrew-core/Formula/cctools.rb")
+ inspect_source(source, "/homebrew-core/Formula/cctools.rb")
expect(cop.offenses).to eq([])
end
@@ -493,7 +493,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -509,7 +509,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
end
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([])
end
end
diff --git a/Library/Homebrew/test/rubocops/options_cop_spec.rb b/Library/Homebrew/test/rubocops/options_cop_spec.rb
index b89b3d9b59a7e3fac475b6755b005da07dab667b..c27389a68b47a32bec096e90b9094fe40690f54f 100644
--- a/Library/Homebrew/test/rubocops/options_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/options_cop_spec.rb
@@ -21,7 +21,7 @@ describe RuboCop::Cop::FormulaAudit::Options do
column: 10,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -48,7 +48,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Options do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -72,7 +72,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Options do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -95,7 +95,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Options do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -122,7 +122,7 @@ describe RuboCop::Cop::NewFormulaAudit::Options do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
diff --git a/Library/Homebrew/test/rubocops/patches_cop_spec.rb b/Library/Homebrew/test/rubocops/patches_cop_spec.rb
index 28915a1ec9a987cec14df41bbabcb49fb6bd63ab..4f9ca2df84b9131d204ac6934f112c99010c0691 100644
--- a/Library/Homebrew/test/rubocops/patches_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/patches_cop_spec.rb
@@ -13,7 +13,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
url 'http://example.com/foo-1.0.tgz'
end
EOS
- inspect_source(cop, source)
+ inspect_source(source)
expect(cop.offenses).to eq([])
end
@@ -34,7 +34,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -61,7 +61,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
end
EOS
- inspect_source(cop, source)
+ inspect_source(source)
expected_offense = if patch_url =~ %r{/raw\.github\.com/}
[{ message: <<-EOS.undent.chomp,
GitHub/Gist patches should specify a revision:
@@ -154,7 +154,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
column: 26,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -183,7 +183,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
end
EOS
- inspect_source(cop, source)
+ inspect_source(source)
expected_offense = if patch_url =~ %r{/raw\.github\.com/}
[{ message: <<-EOS.undent.chomp,
GitHub/Gist patches should specify a revision:
diff --git a/Library/Homebrew/test/rubocops/text_cop_spec.rb b/Library/Homebrew/test/rubocops/text_cop_spec.rb
index ec13c4041578fba232097a72518b8139143d99f1..49080177035356e9aa697de89ab67981b9bdbeae 100644
--- a/Library/Homebrew/test/rubocops/text_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/text_cop_spec.rb
@@ -24,7 +24,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -48,7 +48,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -73,7 +73,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 4,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -98,7 +98,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 4,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -123,7 +123,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 4,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -148,7 +148,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 4,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -173,7 +173,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 4,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -210,7 +210,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -237,7 +237,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 0,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -267,7 +267,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
@@ -292,7 +292,7 @@ describe RuboCop::Cop::FormulaAudit::Text do
column: 4,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses).each do |expected, actual|
expect_offense(expected, actual)
diff --git a/Library/Homebrew/test/rubocops/urls_cop_spec.rb b/Library/Homebrew/test/rubocops/urls_cop_spec.rb
index e51fb6be0e79b4342988473234737dee027ae43a..ad939a1a2a8d45785338f18dc1863a479c3edaa0 100644
--- a/Library/Homebrew/test/rubocops/urls_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/urls_cop_spec.rb
@@ -126,7 +126,7 @@ describe RuboCop::Cop::FormulaAudit::Urls do
column: formula["col"],
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses.reverse).each do |expected, actual|
expect_offense(expected, actual)
@@ -160,7 +160,7 @@ describe RuboCop::Cop::FormulaAudit::Urls do
column: formula["col"],
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses.reverse).each do |expected, actual|
expect_offense(expected, actual)
@@ -183,7 +183,7 @@ describe RuboCop::Cop::FormulaAudit::Urls do
column: 2,
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
expected_offenses.zip(cop.offenses.reverse).each do |expected, actual|
expect_offense(expected, actual)
@@ -222,13 +222,13 @@ describe RuboCop::Cop::FormulaAuditStrict::PyPiUrls do
column: formula["col"],
source: source }]
- inspect_source(cop, source)
+ inspect_source(source)
# Check for expected offenses
expected_offenses.zip(cop.offenses.reverse).each do |expected, actual|
expect_offense(expected, actual)
end
# Check for expected auto corrected source
- new_source = autocorrect_source(cop, source)
+ new_source = autocorrect_source(source)
expect(new_source).to eq(corrected_source)
end
end