aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/test
diff options
context:
space:
mode:
authorMike McQuaid2016-09-17 15:32:44 +0100
committerMike McQuaid2016-09-17 16:14:13 +0100
commit3982950e6106d45811a396a6a7478eeeee2817d7 (patch)
tree3bc809f42e4356c89f4ff3508bbf0e84cd5d4d41 /Library/Homebrew/test
parent6693915399a5d9f1f09255c5008d2cc1209f7662 (diff)
downloadbrew-3982950e6106d45811a396a6a7478eeeee2817d7.tar.bz2
rubocop --auto-correct all hash-rocket usage.
Diffstat (limited to 'Library/Homebrew/test')
-rw-r--r--Library/Homebrew/test/Gemfile6
-rw-r--r--Library/Homebrew/test/Rakefile2
-rw-r--r--Library/Homebrew/test/test_cmd_audit.rb42
-rw-r--r--Library/Homebrew/test/test_cmd_testbot.rb4
-rw-r--r--Library/Homebrew/test/test_compiler_failure.rb4
-rw-r--r--Library/Homebrew/test/test_compiler_selector.rb12
-rw-r--r--Library/Homebrew/test/test_dependency_collector.rb10
-rw-r--r--Library/Homebrew/test/test_dependency_expansion.rb24
-rw-r--r--Library/Homebrew/test/test_download_strategies.rb6
-rw-r--r--Library/Homebrew/test/test_exceptions.rb24
-rw-r--r--Library/Homebrew/test/test_formula.rb68
-rw-r--r--Library/Homebrew/test/test_integration_cmds.rb2
-rw-r--r--Library/Homebrew/test/test_language_python.rb6
-rw-r--r--Library/Homebrew/test/test_patch.rb16
-rw-r--r--Library/Homebrew/test/test_patching.rb6
-rw-r--r--Library/Homebrew/test/test_requirement.rb6
-rw-r--r--Library/Homebrew/test/test_resource.rb26
-rw-r--r--Library/Homebrew/test/test_sandbox.rb8
-rw-r--r--Library/Homebrew/test/test_software_spec.rb26
-rw-r--r--Library/Homebrew/test/test_tab.rb6
-rw-r--r--Library/Homebrew/test/test_tap.rb10
-rw-r--r--Library/Homebrew/test/test_update_report.rb4
-rw-r--r--Library/Homebrew/test/test_utils.rb8
-rw-r--r--Library/Homebrew/test/test_versions.rb4
-rw-r--r--Library/Homebrew/test/testing_env.rb2
25 files changed, 166 insertions, 166 deletions
diff --git a/Library/Homebrew/test/Gemfile b/Library/Homebrew/test/Gemfile
index c7c146233..b7666e551 100644
--- a/Library/Homebrew/test/Gemfile
+++ b/Library/Homebrew/test/Gemfile
@@ -10,8 +10,8 @@ group :coverage do
# back to stable as soon as v0.12.1 or v0.13.0 is released. See pull request
# <https://github.com/Homebrew/legacy-homebrew/pull/48250> for full details.
gem "simplecov", "0.12.0",
- :git => "https://github.com/colszowka/simplecov.git",
- :branch => "master", # commit 257e26394c464c4ab388631b4eff1aa98c37d3f1
- :require => false
+ git: "https://github.com/colszowka/simplecov.git",
+ branch: "master", # commit 257e26394c464c4ab388631b4eff1aa98c37d3f1
+ require: false
gem "codecov", require: false
end
diff --git a/Library/Homebrew/test/Rakefile b/Library/Homebrew/test/Rakefile
index 3841badab..a2db861f2 100644
--- a/Library/Homebrew/test/Rakefile
+++ b/Library/Homebrew/test/Rakefile
@@ -11,7 +11,7 @@ TEST_FILES = Dir["#{TEST_DIRECTORY}/test_*.rb"].reject do |f|
f.include?("/test_os_mac_") && !mac?
end
-task :default => :test
+task default: :test
Rake::TestTask.new(:test) do |t|
t.libs << TEST_DIRECTORY
diff --git a/Library/Homebrew/test/test_cmd_audit.rb b/Library/Homebrew/test/test_cmd_audit.rb
index 9c672f634..98ab780b4 100644
--- a/Library/Homebrew/test/test_cmd_audit.rb
+++ b/Library/Homebrew/test/test_cmd_audit.rb
@@ -50,7 +50,7 @@ class FormulaTextTests < Homebrew::TestCase
end
def test_has_end
- ft = formula_text "end", "", :patch => "__END__\na patch here"
+ ft = formula_text "end", "", patch: "__END__\na patch here"
assert ft.end?, "The formula must have __END__"
assert_equal "class End < Formula\n \nend", ft.without_patch
end
@@ -138,7 +138,7 @@ class FormulaAuditorTests < Homebrew::TestCase
end
def test_audit_file_strict_ordering_issue
- fa = formula_auditor "foo", <<-EOS.undent, :strict => true
+ fa = formula_auditor "foo", <<-EOS.undent, strict: true
class Foo < Formula
url "http://example.com/foo-1.0.tgz"
homepage "http://example.com"
@@ -150,7 +150,7 @@ class FormulaAuditorTests < Homebrew::TestCase
end
def test_audit_file_strict_resource_placement
- fa = formula_auditor "foo", <<-EOS.undent, :strict => true
+ fa = formula_auditor "foo", <<-EOS.undent, strict: true
class Foo < Formula
url "https://example.com/foo-1.0.tgz"
@@ -167,7 +167,7 @@ class FormulaAuditorTests < Homebrew::TestCase
end
def test_audit_file_strict_plist_placement
- fa = formula_auditor "foo", <<-EOS.undent, :strict => true
+ fa = formula_auditor "foo", <<-EOS.undent, strict: true
class Foo < Formula
url "https://example.com/foo-1.0.tgz"
@@ -185,7 +185,7 @@ class FormulaAuditorTests < Homebrew::TestCase
end
def test_audit_file_strict_url_outside_of_stable_block
- fa = formula_auditor "foo", <<-EOS.undent, :strict => true
+ fa = formula_auditor "foo", <<-EOS.undent, strict: true
class Foo < Formula
url "http://example.com/foo-1.0.tgz"
stable do
@@ -198,7 +198,7 @@ class FormulaAuditorTests < Homebrew::TestCase
end
def test_audit_file_strict_head_and_head_do
- fa = formula_auditor "foo", <<-EOS.undent, :strict => true
+ fa = formula_auditor "foo", <<-EOS.undent, strict: true
class Foo < Formula
head "http://example.com/foo.git"
head do
@@ -211,7 +211,7 @@ class FormulaAuditorTests < Homebrew::TestCase
end
def test_audit_file_strict_bottle_and_bottle_do
- fa = formula_auditor "foo", <<-EOS.undent, :strict => true
+ fa = formula_auditor "foo", <<-EOS.undent, strict: true
class Foo < Formula
url "http://example.com/foo-1.0.tgz"
bottle do
@@ -234,7 +234,7 @@ class FormulaAuditorTests < Homebrew::TestCase
fa.audit_class
assert_equal [], fa.problems
- fa = formula_auditor "foo", <<-EOS.undent, :strict => true
+ fa = formula_auditor "foo", <<-EOS.undent, strict: true
class Foo < Formula
url "http://example.com/foo-1.0.tgz"
end
@@ -291,7 +291,7 @@ class FormulaAuditorTests < Homebrew::TestCase
end
def test_audit_line_pkgshare
- fa = formula_auditor "foo", <<-EOS.undent, :strict => true
+ fa = formula_auditor "foo", <<-EOS.undent, strict: true
class Foo < Formula
url "http://example.com/foo-1.0.tgz"
end
@@ -320,7 +320,7 @@ class FormulaAuditorTests < Homebrew::TestCase
# Formulae with "++" in their name would break various audit regexps:
# Error: nested *?+ in regexp: /^libxml++3\s/
def test_audit_plus_plus_name
- fa = formula_auditor "foolibc++", <<-EOS.undent, :strict => true
+ fa = formula_auditor "foolibc++", <<-EOS.undent, strict: true
class Foolibcxx < Formula
desc "foolibc++ is a test"
url "http://example.com/foo-1.0.tgz"
@@ -358,7 +358,7 @@ class FormulaAuditorTests < Homebrew::TestCase
end
def test_audit_github_repository_no_api
- fa = formula_auditor "foo", <<-EOS.undent, :strict => true, :online => true
+ fa = formula_auditor "foo", <<-EOS.undent, strict: true, online: true
class Foo < Formula
homepage "https://github.com/example/example"
url "http://example.com/foo-1.0.tgz"
@@ -393,14 +393,14 @@ class FormulaAuditorTests < Homebrew::TestCase
def test_audit_desc
formula_descriptions = [
- { :name => "foo", :desc => nil,
- :problem => "Formula should have a desc" },
- { :name => "bar", :desc => "bar" * 30,
- :problem => "Description is too long" },
- { :name => "baz", :desc => "Baz commandline tool",
- :problem => "Description should use \"command-line\"" },
- { :name => "qux", :desc => "A tool called Qux",
- :problem => "Description shouldn't start with an indefinite article" },
+ { name: "foo", desc: nil,
+ problem: "Formula should have a desc" },
+ { name: "bar", desc: "bar" * 30,
+ problem: "Description is too long" },
+ { name: "baz", desc: "Baz commandline tool",
+ problem: "Description should use \"command-line\"" },
+ { name: "qux", desc: "A tool called Qux",
+ problem: "Description shouldn't start with an indefinite article" },
]
formula_descriptions.each do |formula|
@@ -411,14 +411,14 @@ class FormulaAuditorTests < Homebrew::TestCase
end
EOS
- fa = formula_auditor formula[:name], content, :strict => true
+ fa = formula_auditor formula[:name], content, strict: true
fa.audit_desc
assert_match formula[:problem], fa.problems.first
end
end
def test_audit_homepage
- fa = formula_auditor "foo", <<-EOS.undent, :online => true
+ fa = formula_auditor "foo", <<-EOS.undent, online: true
class Foo < Formula
homepage "ftp://example.com/foo"
url "http://example.com/foo-1.0.tgz"
diff --git a/Library/Homebrew/test/test_cmd_testbot.rb b/Library/Homebrew/test/test_cmd_testbot.rb
index a696b9e95..d762448d1 100644
--- a/Library/Homebrew/test/test_cmd_testbot.rb
+++ b/Library/Homebrew/test/test_cmd_testbot.rb
@@ -52,8 +52,8 @@ class TestbotStepTests < Homebrew::TestCase
def stub_test_instance
stub(
- :category => "stub",
- :log_root => Pathname.pwd
+ category: "stub",
+ log_root: Pathname.pwd
)
end
diff --git a/Library/Homebrew/test/test_compiler_failure.rb b/Library/Homebrew/test/test_compiler_failure.rb
index d907c93a3..db2ba6371 100644
--- a/Library/Homebrew/test/test_compiler_failure.rb
+++ b/Library/Homebrew/test/test_compiler_failure.rb
@@ -37,14 +37,14 @@ class CompilerFailureTests < Homebrew::TestCase
end
def test_create_with_hash
- failure = create(:gcc => "4.8")
+ failure = create(gcc: "4.8")
assert_fails_with compiler("gcc-4.8", "4.8"), failure
assert_fails_with compiler("gcc-4.8", "4.8.1"), failure
refute_fails_with compiler("gcc-4.7", "4.7"), failure
end
def test_create_with_hash_and_version
- failure = create(:gcc => "4.8") { version "4.8.1" }
+ failure = create(gcc: "4.8") { version "4.8.1" }
assert_fails_with compiler("gcc-4.8", "4.8"), failure
assert_fails_with compiler("gcc-4.8", "4.8.1"), failure
refute_fails_with compiler("gcc-4.8", "4.8.2"), failure
diff --git a/Library/Homebrew/test/test_compiler_selector.rb b/Library/Homebrew/test/test_compiler_selector.rb
index d030d48ce..0363cacd2 100644
--- a/Library/Homebrew/test/test_compiler_selector.rb
+++ b/Library/Homebrew/test/test_compiler_selector.rb
@@ -42,7 +42,7 @@ class CompilerSelectorTests < Homebrew::TestCase
end
def test_all_compiler_failures
- @f << :clang << :llvm << :gcc << { :gcc => "4.8" } << { :gcc => "4.7" }
+ @f << :clang << :llvm << :gcc << { gcc: "4.8" } << { gcc: "4.7" }
assert_raises(CompilerSelectionError) { actual_cc }
end
@@ -66,7 +66,7 @@ class CompilerSelectorTests < Homebrew::TestCase
end
def test_fails_with_non_apple_gcc
- @f << { :gcc => "4.8" }
+ @f << { gcc: "4.8" }
assert_equal :clang, actual_cc
end
@@ -86,12 +86,12 @@ class CompilerSelectorTests < Homebrew::TestCase
end
def test_mixed_failures_4
- @f << :clang << { :gcc => "4.8" }
+ @f << :clang << { gcc: "4.8" }
assert_equal :gcc, actual_cc
end
def test_mixed_failures_5
- @f << :clang << :gcc << :llvm << { :gcc => "4.8" }
+ @f << :clang << :gcc << :llvm << { gcc: "4.8" }
assert_equal "gcc-4.7", actual_cc
end
@@ -102,13 +102,13 @@ class CompilerSelectorTests < Homebrew::TestCase
def test_missing_gcc
@versions.gcc_build_version = nil
- @f << :clang << :llvm << { :gcc => "4.8" } << { :gcc => "4.7" }
+ @f << :clang << :llvm << { gcc: "4.8" } << { gcc: "4.7" }
assert_raises(CompilerSelectionError) { actual_cc }
end
def test_missing_llvm_and_gcc
@versions.gcc_build_version = nil
- @f << :clang << { :gcc => "4.8" } << { :gcc => "4.7" }
+ @f << :clang << { gcc: "4.8" } << { gcc: "4.7" }
assert_raises(CompilerSelectionError) { actual_cc }
end
end
diff --git a/Library/Homebrew/test/test_dependency_collector.rb b/Library/Homebrew/test/test_dependency_collector.rb
index 9ef2a8cc7..a94b4959e 100644
--- a/Library/Homebrew/test/test_dependency_collector.rb
+++ b/Library/Homebrew/test/test_dependency_collector.rb
@@ -48,8 +48,8 @@ class DependencyCollectorTests < Homebrew::TestCase
end
def test_requirement_tags
- @d.add :x11 => "2.5.1"
- @d.add :xcode => :build
+ @d.add x11: "2.5.1"
+ @d.add xcode: :build
assert_empty find_requirement(X11Requirement).tags
assert_predicate find_requirement(XcodeRequirement), :build?
end
@@ -60,17 +60,17 @@ class DependencyCollectorTests < Homebrew::TestCase
end
def test_x11_min_version
- @d.add :x11 => "2.5.1"
+ @d.add x11: "2.5.1"
assert_equal "2.5.1", find_requirement(X11Requirement).min_version.to_s
end
def test_x11_tag
- @d.add :x11 => :optional
+ @d.add x11: :optional
assert_predicate find_requirement(X11Requirement), :optional?
end
def test_x11_min_version_and_tag
- @d.add :x11 => ["2.5.1", :optional]
+ @d.add x11: ["2.5.1", :optional]
dep = find_requirement(X11Requirement)
assert_equal "2.5.1", dep.min_version.to_s
assert_predicate dep, :optional?
diff --git a/Library/Homebrew/test/test_dependency_expansion.rb b/Library/Homebrew/test/test_dependency_expansion.rb
index 97bf70eab..9d6de35e2 100644
--- a/Library/Homebrew/test/test_dependency_expansion.rb
+++ b/Library/Homebrew/test/test_dependency_expansion.rb
@@ -4,7 +4,7 @@ require "dependency"
class DependencyExpansionTests < Homebrew::TestCase
def build_dep(name, tags = [], deps = [])
dep = Dependency.new(name.to_s, tags)
- dep.stubs(:to_formula).returns(stub(:deps => deps, :name => name))
+ dep.stubs(:to_formula).returns(stub(deps: deps, name: name))
dep
end
@@ -14,7 +14,7 @@ class DependencyExpansionTests < Homebrew::TestCase
@baz = build_dep(:baz)
@qux = build_dep(:qux)
@deps = [@foo, @bar, @baz, @qux]
- @f = stub(:deps => @deps, :name => "f")
+ @f = stub(deps: @deps, name: "f")
end
def test_expand_yields_dependent_and_dep_pairs
@@ -43,19 +43,19 @@ class DependencyExpansionTests < Homebrew::TestCase
end
def test_expand_preserves_dependency_order
- @foo.stubs(:to_formula).returns(stub(:name => "f", :deps => [@qux, @baz]))
+ @foo.stubs(:to_formula).returns(stub(name: "f", deps: [@qux, @baz]))
assert_equal [@qux, @baz, @foo, @bar], Dependency.expand(@f)
end
def test_expand_skips_optionals_by_default
deps = [build_dep(:foo, [:optional]), @bar, @baz, @qux]
- f = stub(:deps => deps, :build => stub(:with? => false), :name => "f")
+ f = stub(deps: deps, build: stub(with?: false), name: "f")
assert_equal [@bar, @baz, @qux], Dependency.expand(f)
end
def test_expand_keeps_recommendeds_by_default
deps = [build_dep(:foo, [:recommended]), @bar, @baz, @qux]
- f = stub(:deps => deps, :build => stub(:with? => true), :name => "f")
+ f = stub(deps: deps, build: stub(with?: true), name: "f")
assert_equal deps, Dependency.expand(f)
end
@@ -73,7 +73,7 @@ class DependencyExpansionTests < Homebrew::TestCase
def test_merger_preserves_env_proc
env_proc = stub
dep = Dependency.new("foo", [], env_proc)
- dep.stubs(:to_formula).returns(stub(:deps => [], :name => "foo"))
+ dep.stubs(:to_formula).returns(stub(deps: [], name: "foo"))
@deps.replace [dep]
assert_equal env_proc, Dependency.expand(@f).first.env_proc
end
@@ -88,8 +88,8 @@ class DependencyExpansionTests < Homebrew::TestCase
def test_skip_skips_parent_but_yields_children
f = stub(
- :name => "f",
- :deps => [
+ name: "f",
+ deps: [
build_dep(:foo, [], [@bar, @baz]),
build_dep(:foo, [], [@baz]),
]
@@ -105,7 +105,7 @@ class DependencyExpansionTests < Homebrew::TestCase
def test_keep_dep_but_prune_recursive_deps
foo = build_dep(:foo, [:build], @bar)
baz = build_dep(:baz, [:build])
- f = stub(:name => "f", :deps => [foo, baz])
+ f = stub(name: "f", deps: [foo, baz])
deps = Dependency.expand(f) do |_dependent, dep|
Dependency.keep_but_prune_recursive_deps if dep.build?
@@ -122,15 +122,15 @@ class DependencyExpansionTests < Homebrew::TestCase
def test_cyclic_dependency
foo = build_dep(:foo)
bar = build_dep(:bar, [], [foo])
- foo.stubs(:to_formula).returns(stub(:deps => [bar], :name => "foo"))
- f = stub(:name => "f", :deps => [foo, bar])
+ foo.stubs(:to_formula).returns(stub(deps: [bar], name: "foo"))
+ f = stub(name: "f", deps: [foo, bar])
assert_nothing_raised { Dependency.expand(f) }
end
def test_clean_expand_stack
foo = build_dep(:foo)
foo.stubs(:to_formula).raises(FormulaUnavailableError, "foo")
- f = stub(:name => "f", :deps => [foo])
+ f = stub(name: "f", deps: [foo])
assert_raises(FormulaUnavailableError) { Dependency.expand(f) }
assert_empty Dependency.instance_variable_get(:@expand_stack)
end
diff --git a/Library/Homebrew/test/test_download_strategies.rb b/Library/Homebrew/test/test_download_strategies.rb
index 3f371d461..d107d14e8 100644
--- a/Library/Homebrew/test/test_download_strategies.rb
+++ b/Library/Homebrew/test/test_download_strategies.rb
@@ -21,7 +21,7 @@ class AbstractDownloadStrategyTests < Homebrew::TestCase
end
def test_expand_safe_system_args_with_explicit_quiet_flag
- @args << { :quiet_flag => "--flag" }
+ @args << { quiet_flag: "--flag" }
expanded_args = @strategy.expand_safe_system_args(@args)
assert_equal %w[foo bar baz --flag], expanded_args
end
@@ -39,8 +39,8 @@ class AbstractDownloadStrategyTests < Homebrew::TestCase
def test_source_modified_time
mktemp "mtime" do
- touch "foo", :mtime => Time.now - 10
- touch "bar", :mtime => Time.now - 100
+ touch "foo", mtime: Time.now - 10
+ touch "bar", mtime: Time.now - 100
ln_s "not-exist", "baz"
assert_equal File.mtime("foo"), @strategy.source_modified_time
end
diff --git a/Library/Homebrew/test/test_exceptions.rb b/Library/Homebrew/test/test_exceptions.rb
index 4926b0c40..671b433e4 100644
--- a/Library/Homebrew/test/test_exceptions.rb
+++ b/Library/Homebrew/test/test_exceptions.rb
@@ -32,7 +32,7 @@ class ExceptionsTest < Homebrew::TestCase
end
def test_tap_formula_unavailable_error
- t = stub(:user => "u", :repo => "r", :to_s => "u/r", :installed? => false)
+ t = stub(user: "u", repo: "r", to_s: "u/r", installed?: false)
assert_match "Please tap it and then try again: brew tap u/r",
TapFormulaUnavailableError.new(t, "foo").to_s
end
@@ -73,7 +73,7 @@ class ExceptionsTest < Homebrew::TestCase
end
def test_build_error
- f = stub(:name => "foo")
+ f = stub(name: "foo")
assert_equal "Failed executing: badprg arg1 arg2",
BuildError.new(f, "badprg", %w[arg1 arg2], {}).to_s
end
@@ -84,20 +84,20 @@ class ExceptionsTest < Homebrew::TestCase
end
def test_formula_installation_already_attempted_error
- f = stub(:full_name => "foo/bar")
+ f = stub(full_name: "foo/bar")
assert_equal "Formula installation already attempted: foo/bar",
FormulaInstallationAlreadyAttemptedError.new(f).to_s
end
def test_formula_conflict_error
- f = stub(:full_name => "foo/qux")
- c = stub(:name => "bar", :reason => "I decided to")
+ f = stub(full_name: "foo/qux")
+ c = stub(name: "bar", reason: "I decided to")
assert_match "Please `brew unlink bar` before continuing.",
FormulaConflictError.new(f, [c]).to_s
end
def test_compiler_selection_error
- f = stub(:full_name => "foo")
+ f = stub(full_name: "foo")
assert_match "foo cannot be built with any available compilers.",
CompilerSelectionError.new(f).to_s
end
@@ -115,27 +115,27 @@ class ExceptionsTest < Homebrew::TestCase
end
def test_checksum_mismatch_error
- h1 = stub(:hash_type => "sha256", :to_s => "deadbeef")
- h2 = stub(:hash_type => "sha256", :to_s => "deadcafe")
+ h1 = stub(hash_type: "sha256", to_s: "deadbeef")
+ h2 = stub(hash_type: "sha256", to_s: "deadcafe")
assert_match "SHA256 mismatch",
ChecksumMismatchError.new("/file.tar.gz", h1, h2).to_s
end
def test_resource_missing_error
- f = stub(:full_name => "bar")
- r = stub(:inspect => "<resource foo>")
+ f = stub(full_name: "bar")
+ r = stub(inspect: "<resource foo>")
assert_match "bar does not define resource <resource foo>",
ResourceMissingError.new(f, r).to_s
end
def test_duplicate_resource_error
- r = stub(:inspect => "<resource foo>")
+ r = stub(inspect: "<resource foo>")
assert_equal "Resource <resource foo> is defined more than once",
DuplicateResourceError.new(r).to_s
end
def test_bottle_version_mismatch_error
- f = stub(:full_name => "foo")
+ f = stub(full_name: "foo")
assert_match "Bottle version mismatch",
BottleVersionMismatchError.new("/foo.bottle.tar.gz", "1.0", f, "1.1").to_s
end
diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb
index 07244a151..7c09e765f 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test_formula.rb
@@ -10,7 +10,7 @@ class FormulaTests < Homebrew::TestCase
spec = :stable
alias_path = CoreTap.instance.alias_dir/"formula_alias"
- f = klass.new(name, path, spec, :alias_path => alias_path)
+ f = klass.new(name, path, spec, alias_path: alias_path)
assert_equal name, f.name
assert_equal path, f.path
assert_equal alias_path, f.alias_path
@@ -72,16 +72,16 @@ class FormulaTests < Homebrew::TestCase
def test_installed?
f = Testball.new
- f.stubs(:installed_prefix).returns(stub(:directory? => false))
+ f.stubs(:installed_prefix).returns(stub(directory?: false))
refute_predicate f, :installed?
f.stubs(:installed_prefix).returns(
- stub(:directory? => true, :children => [])
+ stub(directory?: true, children: [])
)
refute_predicate f, :installed?
f.stubs(:installed_prefix).returns(
- stub(:directory? => true, :children => [stub])
+ stub(directory?: true, children: [stub])
)
assert_predicate f, :installed?
end
@@ -255,7 +255,7 @@ class FormulaTests < Homebrew::TestCase
mirror "http://example.org/test-0.1.tbz"
sha256 TEST_SHA256
- head "http://example.com/test.git", :tag => "foo"
+ head "http://example.com/test.git", tag: "foo"
devel do
url "http://example.com/test-0.2.tbz"
@@ -352,7 +352,7 @@ class FormulaTests < Homebrew::TestCase
initial_env = ENV.to_hash
f = formula do
- head "foo", :using => :git
+ head "foo", using: :git
end
cached_location = f.head.downloader.cached_location
@@ -616,47 +616,47 @@ class OutdatedVersionsTests < Homebrew::TestCase
end
def test_greater_different_tap_installed
- setup_tab_for_prefix(greater_prefix, :tap => "user/repo")
+ setup_tab_for_prefix(greater_prefix, tap: "user/repo")
assert_predicate f.outdated_versions, :empty?
end
def test_greater_same_tap_installed
f.instance_variable_set(:@tap, CoreTap.instance)
- setup_tab_for_prefix(greater_prefix, :tap => "homebrew/core")
+ setup_tab_for_prefix(greater_prefix, tap: "homebrew/core")
assert_predicate f.outdated_versions, :empty?
end
def test_outdated_different_tap_installed
- setup_tab_for_prefix(outdated_prefix, :tap => "user/repo")
+ setup_tab_for_prefix(outdated_prefix, tap: "user/repo")
refute_predicate f.outdated_versions, :empty?
end
def test_outdated_same_tap_installed
f.instance_variable_set(:@tap, CoreTap.instance)
- setup_tab_for_prefix(outdated_prefix, :tap => "homebrew/core")
+ setup_tab_for_prefix(outdated_prefix, tap: "homebrew/core")
refute_predicate f.outdated_versions, :empty?
end
def test_same_head_installed
f.instance_variable_set(:@tap, CoreTap.instance)
- setup_tab_for_prefix(head_prefix, :tap => "homebrew/core")
+ setup_tab_for_prefix(head_prefix, tap: "homebrew/core")
assert_predicate f.outdated_versions, :empty?
end
def test_different_head_installed
f.instance_variable_set(:@tap, CoreTap.instance)
- setup_tab_for_prefix(head_prefix, :tap => "user/repo")
+ setup_tab_for_prefix(head_prefix, tap: "user/repo")
assert_predicate f.outdated_versions, :empty?
end
def test_mixed_taps_greater_version_installed
f.instance_variable_set(:@tap, CoreTap.instance)
- setup_tab_for_prefix(outdated_prefix, :tap => "homebrew/core")
- setup_tab_for_prefix(greater_prefix, :tap => "user/repo")
+ setup_tab_for_prefix(outdated_prefix, tap: "homebrew/core")
+ setup_tab_for_prefix(greater_prefix, tap: "user/repo")
assert_predicate f.outdated_versions, :empty?
- setup_tab_for_prefix(greater_prefix, :tap => "homebrew/core")
+ setup_tab_for_prefix(greater_prefix, tap: "homebrew/core")
reset_outdated_versions
assert_predicate f.outdated_versions, :empty?
@@ -668,12 +668,12 @@ class OutdatedVersionsTests < Homebrew::TestCase
extra_outdated_prefix = HOMEBREW_CELLAR/"#{f.name}/1.0"
setup_tab_for_prefix(outdated_prefix)
- setup_tab_for_prefix(extra_outdated_prefix, :tap => "homebrew/core")
+ setup_tab_for_prefix(extra_outdated_prefix, tap: "homebrew/core")
reset_outdated_versions
refute_predicate f.outdated_versions, :empty?
- setup_tab_for_prefix(outdated_prefix, :tap => "user/repo")
+ setup_tab_for_prefix(outdated_prefix, tap: "user/repo")
reset_outdated_versions
refute_predicate f.outdated_versions, :empty?
@@ -681,18 +681,18 @@ class OutdatedVersionsTests < Homebrew::TestCase
def test_same_version_tap_installed
f.instance_variable_set(:@tap, CoreTap.instance)
- setup_tab_for_prefix(same_prefix, :tap => "homebrew/core")
+ setup_tab_for_prefix(same_prefix, tap: "homebrew/core")
assert_predicate f.outdated_versions, :empty?
- setup_tab_for_prefix(same_prefix, :tap => "user/repo")
+ setup_tab_for_prefix(same_prefix, tap: "user/repo")
reset_outdated_versions
assert_predicate f.outdated_versions, :empty?
end
def test_outdated_installed_head_less_than_stable
- tab = setup_tab_for_prefix(head_prefix, :versions => { "stable" => "1.0" })
+ tab = setup_tab_for_prefix(head_prefix, versions: { "stable" => "1.0" })
refute_predicate f.outdated_versions, :empty?
# Tab.for_keg(head_prefix) will be fetched from CACHE but we write it anyway
@@ -710,7 +710,7 @@ class OutdatedVersionsTests < Homebrew::TestCase
head_prefix_c = HOMEBREW_CELLAR.join("testball/HEAD-5658946")
setup_tab_for_prefix(outdated_stable_prefix)
- tab_a = setup_tab_for_prefix(head_prefix_a, :versions => { "stable" => "1.0" })
+ tab_a = setup_tab_for_prefix(head_prefix_a, versions: { "stable" => "1.0" })
setup_tab_for_prefix(head_prefix_b)
initial_env = ENV.to_hash
@@ -720,7 +720,7 @@ class OutdatedVersionsTests < Homebrew::TestCase
@f = formula("testball") do
url "foo"
version "2.10"
- head "file://#{testball_repo}", :using => :git
+ head "file://#{testball_repo}", using: :git
end
%w[AUTHOR COMMITTER].each do |role|
@@ -738,20 +738,20 @@ class OutdatedVersionsTests < Homebrew::TestCase
end
end
- refute_predicate f.outdated_versions(:fetch_head => true), :empty?
+ refute_predicate f.outdated_versions(fetch_head: true), :empty?
tab_a.source["versions"] = { "stable" => f.version.to_s }
tab_a.write
reset_outdated_versions
- refute_predicate f.outdated_versions(:fetch_head => true), :empty?
+ refute_predicate f.outdated_versions(fetch_head: true), :empty?
head_prefix_a.rmtree
reset_outdated_versions
- refute_predicate f.outdated_versions(:fetch_head => true), :empty?
+ refute_predicate f.outdated_versions(fetch_head: true), :empty?
- setup_tab_for_prefix(head_prefix_c, :source_modified_time => 1)
+ setup_tab_for_prefix(head_prefix_c, source_modified_time: 1)
reset_outdated_versions
- assert_predicate f.outdated_versions(:fetch_head => true), :empty?
+ assert_predicate f.outdated_versions(fetch_head: true), :empty?
ensure
ENV.replace(initial_env)
testball_repo.rmtree if testball_repo.exist?
@@ -770,7 +770,7 @@ class OutdatedVersionsTests < Homebrew::TestCase
end
prefix = HOMEBREW_CELLAR.join("testball/0.1")
- setup_tab_for_prefix(prefix, :versions => { "stable" => "0.1" })
+ setup_tab_for_prefix(prefix, versions: { "stable" => "0.1" })
refute_predicate f.outdated_versions, :empty?
ensure
@@ -785,22 +785,22 @@ class OutdatedVersionsTests < Homebrew::TestCase
end
prefix_a = HOMEBREW_CELLAR.join("testball/20141009")
- setup_tab_for_prefix(prefix_a, :versions => { "stable" => "20141009", "version_scheme" => 1 })
+ setup_tab_for_prefix(prefix_a, versions: { "stable" => "20141009", "version_scheme" => 1 })
prefix_b = HOMEBREW_CELLAR.join("testball/2.14")
- setup_tab_for_prefix(prefix_b, :versions => { "stable" => "2.14", "version_scheme" => 2 })
+ setup_tab_for_prefix(prefix_b, versions: { "stable" => "2.14", "version_scheme" => 2 })
refute_predicate f.outdated_versions, :empty?
reset_outdated_versions
prefix_c = HOMEBREW_CELLAR.join("testball/20141009")
- setup_tab_for_prefix(prefix_c, :versions => { "stable" => "20141009", "version_scheme" => 3 })
+ setup_tab_for_prefix(prefix_c, versions: { "stable" => "20141009", "version_scheme" => 3 })
refute_predicate f.outdated_versions, :empty?
reset_outdated_versions
prefix_d = HOMEBREW_CELLAR.join("testball/20141011")
- setup_tab_for_prefix(prefix_d, :versions => { "stable" => "20141009", "version_scheme" => 3 })
+ setup_tab_for_prefix(prefix_d, versions: { "stable" => "20141009", "version_scheme" => 3 })
assert_predicate f.outdated_versions, :empty?
ensure
f.rack.rmtree
@@ -815,13 +815,13 @@ class OutdatedVersionsTests < Homebrew::TestCase
head_prefix = HOMEBREW_CELLAR.join("testball/HEAD")
- setup_tab_for_prefix(head_prefix, :versions => { "stable" => "1.0", "version_scheme" => 1 })
+ setup_tab_for_prefix(head_prefix, versions: { "stable" => "1.0", "version_scheme" => 1 })
refute_predicate f.outdated_versions, :empty?
reset_outdated_versions
head_prefix.rmtree
- setup_tab_for_prefix(head_prefix, :versions => { "stable" => "1.0", "version_scheme" => 2 })
+ setup_tab_for_prefix(head_prefix, versions: { "stable" => "1.0", "version_scheme" => 2 })
assert_predicate f.outdated_versions, :empty?
ensure
head_prefix.rmtree
diff --git a/Library/Homebrew/test/test_integration_cmds.rb b/Library/Homebrew/test/test_integration_cmds.rb
index 3eef41515..43b8689af 100644
--- a/Library/Homebrew/test/test_integration_cmds.rb
+++ b/Library/Homebrew/test/test_integration_cmds.rb
@@ -160,7 +160,7 @@ class IntegrationCommandTests < Homebrew::TestCase
def setup_remote_tap(name)
tap = Tap.fetch name
- tap.install(:full_clone => false, :quiet => true) unless tap.installed?
+ tap.install(full_clone: false, quiet: true) unless tap.installed?
tap
end
diff --git a/Library/Homebrew/test/test_language_python.rb b/Library/Homebrew/test/test_language_python.rb
index d9d4f3458..d1e3867f7 100644
--- a/Library/Homebrew/test/test_language_python.rb
+++ b/Library/Homebrew/test/test_language_python.rb
@@ -5,7 +5,7 @@ require "resource"
class LanguagePythonTests < Homebrew::TestCase
def setup
@dir = Pathname.new(mktmpdir)
- resource = stub("resource", :stage => true)
+ resource = stub("resource", stage: true)
formula_bin = @dir/"formula_bin"
@formula = mock("formula") do
stubs(:resource).returns(resource)
@@ -20,7 +20,7 @@ class LanguagePythonTests < Homebrew::TestCase
def test_virtualenv_creation
@formula.expects(:resource).with("homebrew-virtualenv").returns(
- mock("resource", :stage => true)
+ mock("resource", stage: true)
)
@venv.create
end
@@ -28,7 +28,7 @@ class LanguagePythonTests < Homebrew::TestCase
# or at least doesn't crash the second time
def test_virtualenv_creation_is_idempotent
@formula.expects(:resource).with("homebrew-virtualenv").returns(
- mock("resource", :stage => true)
+ mock("resource", stage: true)
)
@venv.create
FileUtils.mkdir_p @dir/"bin"
diff --git a/Library/Homebrew/test/test_patch.rb b/Library/Homebrew/test/test_patch.rb
index 3b489b35c..120f0a3a5 100644
--- a/Library/Homebrew/test/test_patch.rb
+++ b/Library/Homebrew/test/test_patch.rb
@@ -58,7 +58,7 @@ class LegacyPatchTests < Homebrew::TestCase
def test_p0_hash_to_string
patches = Patch.normalize_legacy_patches(
- :p0 => "http://example.com/patch.diff"
+ p0: "http://example.com/patch.diff"
)
assert_equal 1, patches.length
@@ -67,7 +67,7 @@ class LegacyPatchTests < Homebrew::TestCase
def test_p1_hash_to_string
patches = Patch.normalize_legacy_patches(
- :p1 => "http://example.com/patch.diff"
+ p1: "http://example.com/patch.diff"
)
assert_equal 1, patches.length
@@ -76,8 +76,8 @@ class LegacyPatchTests < Homebrew::TestCase
def test_mixed_hash_to_strings
patches = Patch.normalize_legacy_patches(
- :p1 => "http://example.com/patch1.diff",
- :p0 => "http://example.com/patch0.diff"
+ p1: "http://example.com/patch1.diff",
+ p0: "http://example.com/patch0.diff"
)
assert_equal 2, patches.length
assert_equal 1, patches.count { |p| p.strip == :p0 }
@@ -86,10 +86,10 @@ class LegacyPatchTests < Homebrew::TestCase
def test_mixed_hash_to_arrays
patches = Patch.normalize_legacy_patches(
- :p1 => ["http://example.com/patch10.diff",
- "http://example.com/patch11.diff"],
- :p0 => ["http://example.com/patch00.diff",
- "http://example.com/patch01.diff"]
+ p1: ["http://example.com/patch10.diff",
+ "http://example.com/patch11.diff"],
+ p0: ["http://example.com/patch00.diff",
+ "http://example.com/patch01.diff"]
)
assert_equal 4, patches.length
diff --git a/Library/Homebrew/test/test_patching.rb b/Library/Homebrew/test/test_patching.rb
index 8511981e1..18b848b10 100644
--- a/Library/Homebrew/test/test_patching.rb
+++ b/Library/Homebrew/test/test_patching.rb
@@ -163,7 +163,7 @@ class PatchingTests < Homebrew::TestCase
def test_patch_p0
assert_patched formula {
def patches
- { :p0 => PATCH_URL_B }
+ { p0: PATCH_URL_B }
end
}
end
@@ -179,7 +179,7 @@ class PatchingTests < Homebrew::TestCase
def test_patch_hash
assert_patched formula {
def patches
- { :p1 => PATCH_URL_A }
+ { p1: PATCH_URL_A }
end
}
end
@@ -187,7 +187,7 @@ class PatchingTests < Homebrew::TestCase
def test_patch_hash_array
assert_patched formula {
def patches
- { :p1 => [PATCH_URL_A] }
+ { p1: [PATCH_URL_A] }
end
}
end
diff --git a/Library/Homebrew/test/test_requirement.rb b/Library/Homebrew/test/test_requirement.rb
index 0281ad70c..580d42bfa 100644
--- a/Library/Homebrew/test/test_requirement.rb
+++ b/Library/Homebrew/test/test_requirement.rb
@@ -36,14 +36,14 @@ class RequirementTests < Homebrew::TestCase
def test_satisfy_true
req = Class.new(Requirement) do
- satisfy(:build_env => false) { true }
+ satisfy(build_env: false) { true }
end.new
assert_predicate req, :satisfied?
end
def test_satisfy_false
req = Class.new(Requirement) do
- satisfy(:build_env => false) { false }
+ satisfy(build_env: false) { false }
end.new
refute_predicate req, :satisfied?
end
@@ -67,7 +67,7 @@ class RequirementTests < Homebrew::TestCase
def test_satisfy_build_env_can_be_disabled
req = Class.new(Requirement) do
- satisfy(:build_env => false) { true }
+ satisfy(build_env: false) { true }
end.new
ENV.expects(:with_build_environment).never
diff --git a/Library/Homebrew/test/test_resource.rb b/Library/Homebrew/test/test_resource.rb
index b0e0d1b72..c1b526cb2 100644
--- a/Library/Homebrew/test/test_resource.rb
+++ b/Library/Homebrew/test/test_resource.rb
@@ -12,42 +12,42 @@ class ResourceTests < Homebrew::TestCase
end
def test_url_with_specs
- @resource.url("foo", :branch => "master")
+ @resource.url("foo", branch: "master")
assert_equal "foo", @resource.url
- assert_equal({ :branch => "master" }, @resource.specs)
+ assert_equal({ branch: "master" }, @resource.specs)
end
def test_url_with_custom_download_strategy_class
strategy = Class.new(AbstractDownloadStrategy)
- @resource.url("foo", :using => strategy)
+ @resource.url("foo", using: strategy)
assert_equal "foo", @resource.url
assert_equal strategy, @resource.download_strategy
end
def test_url_with_specs_and_download_strategy
strategy = Class.new(AbstractDownloadStrategy)
- @resource.url("foo", :using => strategy, :branch => "master")
+ @resource.url("foo", using: strategy, branch: "master")
assert_equal "foo", @resource.url
- assert_equal({ :branch => "master" }, @resource.specs)
+ assert_equal({ branch: "master" }, @resource.specs)
assert_equal strategy, @resource.download_strategy
end
def test_url_with_custom_download_strategy_symbol
- @resource.url("foo", :using => :git)
+ @resource.url("foo", using: :git)
assert_equal "foo", @resource.url
assert_equal GitDownloadStrategy, @resource.download_strategy
end
def test_raises_for_unknown_download_strategy_class
- assert_raises(TypeError) { @resource.url("foo", :using => Class.new) }
+ assert_raises(TypeError) { @resource.url("foo", using: Class.new) }
end
def test_does_not_mutate_specs_hash
- specs = { :using => :git, :branch => "master" }
+ specs = { using: :git, branch: "master" }
@resource.url("foo", specs)
- assert_equal({ :branch => "master" }, @resource.specs)
+ assert_equal({ branch: "master" }, @resource.specs)
assert_equal(:git, @resource.using)
- assert_equal({ :using => :git, :branch => "master" }, specs)
+ assert_equal({ using: :git, branch: "master" }, specs)
end
def test_version
@@ -70,7 +70,7 @@ class ResourceTests < Homebrew::TestCase
end
def test_version_from_tag
- @resource.url("http://example.com/foo-1.0.tar.gz", :tag => "v1.0.2")
+ @resource.url("http://example.com/foo-1.0.tar.gz", tag: "v1.0.2")
assert_version_equal "1.0.2", @resource.version
assert_predicate @resource.version, :detected_from_url?
end
@@ -109,7 +109,7 @@ class ResourceTests < Homebrew::TestCase
def test_verify_download_integrity_missing
fn = Pathname.new("test")
- fn.stubs(:file? => true)
+ fn.stubs(file?: true)
fn.expects(:verify_checksum).raises(ChecksumMissingError)
fn.expects(:sha256)
@@ -117,7 +117,7 @@ class ResourceTests < Homebrew::TestCase
end
def test_verify_download_integrity_mismatch
- fn = stub(:file? => true)
+ fn = stub(file?: true)
checksum = @resource.sha256(TEST_SHA256)
fn.expects(:verify_checksum).with(checksum)
diff --git a/Library/Homebrew/test/test_sandbox.rb b/Library/Homebrew/test/test_sandbox.rb
index cb33c3ffa..2a062cb10 100644
--- a/Library/Homebrew/test/test_sandbox.rb
+++ b/Library/Homebrew/test/test_sandbox.rb
@@ -49,8 +49,8 @@ class SandboxTest < Homebrew::TestCase
end
def test_complains_on_failure
- Utils.expects(:popen_read => "foo")
- ARGV.stubs(:verbose? => true)
+ Utils.expects(popen_read: "foo")
+ ARGV.stubs(verbose?: true)
out, _err = capture_io do
assert_raises(ErrorDuringExecution) { @sandbox.exec "false" }
end
@@ -63,8 +63,8 @@ class SandboxTest < Homebrew::TestCase
Mar 17 02:55:06 sandboxd[342]: Python(49765) deny file-write-unlink /System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/distutils/errors.pyc
bar
EOS
- Utils.expects(:popen_read => with_bogus_error)
- ARGV.stubs(:verbose? => true)
+ Utils.expects(popen_read: with_bogus_error)
+ ARGV.stubs(verbose?: true)
out, _err = capture_io do
assert_raises(ErrorDuringExecution) { @sandbox.exec "false" }
end
diff --git a/Library/Homebrew/test/test_software_spec.rb b/Library/Homebrew/test/test_software_spec.rb
index efd3eff95..d9226f8c3 100644
--- a/Library/Homebrew/test/test_software_spec.rb
+++ b/Library/Homebrew/test/test_software_spec.rb
@@ -36,18 +36,18 @@ class SoftwareSpecTests < Homebrew::TestCase
end
def test_set_owner
- owner = stub :name => "some_name",
- :full_name => "some_name",
- :tap => "homebrew/core"
+ owner = stub name: "some_name",
+ full_name: "some_name",
+ tap: "homebrew/core"
@spec.owner = owner
assert_equal owner, @spec.owner
end
def test_resource_owner
@spec.resource("foo") { url "foo-1.0" }
- @spec.owner = stub :name => "some_name",
- :full_name => "some_name",
- :tap => "homebrew/core"
+ @spec.owner = stub name: "some_name",
+ full_name: "some_name",
+ tap: "homebrew/core"
assert_equal "some_name", @spec.name
@spec.resources.each_value { |r| assert_equal @spec, r.owner }
end
@@ -55,9 +55,9 @@ class SoftwareSpecTests < Homebrew::TestCase
def test_resource_without_version_receives_owners_version
@spec.url("foo-42")
@spec.resource("bar") { url "bar" }
- @spec.owner = stub :name => "some_name",
- :full_name => "some_name",
- :tap => "homebrew/core"
+ @spec.owner = stub name: "some_name",
+ full_name: "some_name",
+ tap: "homebrew/core"
assert_version_equal "42", @spec.resource("bar").version
end
@@ -155,10 +155,10 @@ class BottleSpecificationTests < Homebrew::TestCase
def test_checksum_setters
checksums = {
- :snow_leopard_32 => "deadbeef"*8,
- :snow_leopard => "faceb00c"*8,
- :lion => "baadf00d"*8,
- :mountain_lion => "8badf00d"*8,
+ snow_leopard_32: "deadbeef"*8,
+ snow_leopard: "faceb00c"*8,
+ lion: "baadf00d"*8,
+ mountain_lion: "8badf00d"*8,
}
checksums.each_pair do |cat, digest|
diff --git a/Library/Homebrew/test/test_tab.rb b/Library/Homebrew/test/test_tab.rb
index 0b8fb2a64..2efaee983 100644
--- a/Library/Homebrew/test/test_tab.rb
+++ b/Library/Homebrew/test/test_tab.rb
@@ -61,7 +61,7 @@ class TabTests < Homebrew::TestCase
end
def test_universal?
- tab = Tab.new(:used_options => %w[--universal])
+ tab = Tab.new(used_options: %w[--universal])
assert_predicate tab, :universal?
end
@@ -132,7 +132,7 @@ class TabTests < Homebrew::TestCase
def test_create_from_alias
alias_path = CoreTap.instance.alias_dir/"bar"
- f = formula(:alias_path => alias_path) { url "foo-1.0" }
+ f = formula(alias_path: alias_path) { url "foo-1.0" }
compiler = DevelopmentTools.default_compiler
stdlib = :libcxx
tab = Tab.create(f, compiler, stdlib)
@@ -149,7 +149,7 @@ class TabTests < Homebrew::TestCase
def test_for_formula_from_alias
alias_path = CoreTap.instance.alias_dir/"bar"
- f = formula(:alias_path => alias_path) { url "foo-1.0" }
+ f = formula(alias_path: alias_path) { url "foo-1.0" }
tab = Tab.for_formula(f)
assert_equal alias_path.to_s, tab.source["path"]
diff --git a/Library/Homebrew/test/test_tap.rb b/Library/Homebrew/test/test_tap.rb
index dfbb89384..fafac252f 100644
--- a/Library/Homebrew/test/test_tap.rb
+++ b/Library/Homebrew/test/test_tap.rb
@@ -182,7 +182,7 @@ class TapTest < Homebrew::TestCase
already_tapped_tap = Tap.new("Homebrew", "foo")
assert_equal true, already_tapped_tap.installed?
right_remote = @tap.remote
- assert_raises(TapAlreadyTappedError) { already_tapped_tap.install :clone_target => right_remote }
+ assert_raises(TapAlreadyTappedError) { already_tapped_tap.install clone_target: right_remote }
end
def test_install_tap_remote_mismatch_error
@@ -191,13 +191,13 @@ class TapTest < Homebrew::TestCase
touch @tap.path/".git/shallow"
assert_equal true, already_tapped_tap.installed?
wrong_remote = "#{@tap.remote}-oops"
- assert_raises(TapRemoteMismatchError) { already_tapped_tap.install :clone_target => wrong_remote, :full_clone => true }
+ assert_raises(TapRemoteMismatchError) { already_tapped_tap.install clone_target: wrong_remote, full_clone: true }
end
def test_install_tap_already_unshallow_error
setup_git_repo
already_tapped_tap = Tap.new("Homebrew", "foo")
- assert_raises(TapAlreadyUnshallowError) { already_tapped_tap.install :full_clone => true }
+ assert_raises(TapAlreadyUnshallowError) { already_tapped_tap.install full_clone: true }
end
def test_uninstall_tap_unavailable_error
@@ -208,7 +208,7 @@ class TapTest < Homebrew::TestCase
def test_install_git_error
tap = Tap.new("user", "repo")
assert_raises(ErrorDuringExecution) do
- shutup { tap.install :clone_target => "file:///not/existed/remote/url" }
+ shutup { tap.install clone_target: "file:///not/existed/remote/url" }
end
refute_predicate tap, :installed?
refute_predicate Tap::TAP_DIRECTORY/"user", :exist?
@@ -219,7 +219,7 @@ class TapTest < Homebrew::TestCase
setup_git_repo
tap = Tap.new("Homebrew", "bar")
- shutup { tap.install :clone_target => @tap.path/".git" }
+ shutup { tap.install clone_target: @tap.path/".git" }
assert_predicate tap, :installed?
assert_predicate HOMEBREW_PREFIX/"share/man/man1/brew-tap-cmd.1", :file?
shutup { tap.uninstall }
diff --git a/Library/Homebrew/test/test_update_report.rb b/Library/Homebrew/test/test_update_report.rb
index d30c56fc3..b3ae865a5 100644
--- a/Library/Homebrew/test/test_update_report.rb
+++ b/Library/Homebrew/test/test_update_report.rb
@@ -30,8 +30,8 @@ class ReportTests < Homebrew::TestCase
end
def perform_update(fixture_name = "")
- Formulary.stubs(:factory).returns(stub(:pkg_version => "1.0"))
- FormulaVersions.stubs(:new).returns(stub(:formula_at_revision => "2.0"))
+ Formulary.stubs(:factory).returns(stub(pkg_version: "1.0"))
+ FormulaVersions.stubs(:new).returns(stub(formula_at_revision: "2.0"))
@reporter.diff = fixture(fixture_name)
@hub.add(@reporter) if @reporter.updated?
end
diff --git a/Library/Homebrew/test/test_utils.rb b/Library/Homebrew/test/test_utils.rb
index fa66aefe2..c88c0f416 100644
--- a/Library/Homebrew/test/test_utils.rb
+++ b/Library/Homebrew/test/test_utils.rb
@@ -227,9 +227,9 @@ class UtilTests < Homebrew::TestCase
s = truncate_text_to_approximate_size(long_s, n)
assert_equal n, s.length
assert_match(/^x+#{Regexp.escape(glue)}x+$/, s)
- s = truncate_text_to_approximate_size(long_s, n, :front_weight => 0.0)
+ s = truncate_text_to_approximate_size(long_s, n, front_weight: 0.0)
assert_equal glue + ("x" * (n - glue.length)), s
- s = truncate_text_to_approximate_size(long_s, n, :front_weight => 1.0)
+ s = truncate_text_to_approximate_size(long_s, n, front_weight: 1.0)
assert_equal(("x" * (n - glue.length)) + glue, s)
end
@@ -237,8 +237,8 @@ class UtilTests < Homebrew::TestCase
ARGV.stubs(:homebrew_developer?).returns false
e = assert_raises(FormulaMethodDeprecatedError) do
odeprecated("method", "replacement",
- :caller => ["#{HOMEBREW_LIBRARY}/Taps/homebrew/homebrew-core/"],
- :die => true)
+ caller: ["#{HOMEBREW_LIBRARY}/Taps/homebrew/homebrew-core/"],
+ die: true)
end
assert_match "method", e.message
assert_match "replacement", e.message
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb
index 734117609..2a1a33a59 100644
--- a/Library/Homebrew/test/test_versions.rb
+++ b/Library/Homebrew/test/test_versions.rb
@@ -3,7 +3,7 @@ require "version"
class VersionTests < Homebrew::TestCase
def test_accepts_objects_responding_to_to_str
- value = stub(:to_str => "0.1")
+ value = stub(to_str: "0.1")
assert_equal "0.1", Version.create(value).to_s
end
@@ -452,7 +452,7 @@ class VersionParsingTests < Homebrew::TestCase
def test_from_url
assert_version_detected "1.2.3",
- "http://github.com/foo/bar.git", :tag => "v1.2.3"
+ "http://github.com/foo/bar.git", tag: "v1.2.3"
end
end
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index bc25f8ef8..cbbc5eff1 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -73,7 +73,7 @@ module Homebrew
TEST_SHA256 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze
def formula(name = "formula_name", path = Formulary.core_path(name), spec = :stable, alias_path: nil, &block)
- @_f = Class.new(Formula, &block).new(name, path, spec, :alias_path => alias_path)
+ @_f = Class.new(Formula, &block).new(name, path, spec, alias_path: alias_path)
end
def mktmpdir(prefix_suffix = nil, &block)