diff options
Diffstat (limited to 'Library/Homebrew/test')
53 files changed, 594 insertions, 565 deletions
diff --git a/Library/Homebrew/test/Rakefile b/Library/Homebrew/test/Rakefile index b9dfe3ebb..056da3015 100644 --- a/Library/Homebrew/test/Rakefile +++ b/Library/Homebrew/test/Rakefile @@ -1,5 +1,5 @@ -require 'rake' -require 'rake/testtask' +require "rake" +require "rake/testtask" TEST_DIRECTORY = File.dirname(File.expand_path(__FILE__)) TEST_FILES = Dir["#{TEST_DIRECTORY}/test_*.rb"] diff --git a/Library/Homebrew/test/test_ARGV.rb b/Library/Homebrew/test/test_ARGV.rb index e02c7040e..4dc3f2677 100644 --- a/Library/Homebrew/test/test_ARGV.rb +++ b/Library/Homebrew/test/test_ARGV.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'extend/ARGV' +require "testing_env" +require "extend/ARGV" class ArgvExtensionTests < Homebrew::TestCase def setup @@ -7,19 +7,19 @@ class ArgvExtensionTests < Homebrew::TestCase end def test_argv_formulae - @argv.unshift 'mxcl' + @argv.unshift "mxcl" assert_raises(FormulaUnavailableError) { @argv.formulae } end def test_argv_casks - @argv.unshift 'mxcl' + @argv.unshift "mxcl" assert_equal [], @argv.casks end def test_argv_kegs keg = HOMEBREW_CELLAR + "mxcl/10.0" keg.mkpath - @argv << 'mxcl' + @argv << "mxcl" assert_equal 1, @argv.kegs.length ensure keg.parent.rmtree @@ -49,8 +49,8 @@ class ArgvExtensionTests < Homebrew::TestCase def test_switch? @argv << "-ns" << "-i" << "--bar" - %w{n s i}.each { |s| assert @argv.switch?(s) } - %w{b ns bar --bar -n}.each { |s| assert !@argv.switch?(s) } + %w[n s i].each { |s| assert @argv.switch?(s) } + %w[b ns bar --bar -n].each { |s| assert !@argv.switch?(s) } end def test_flag? diff --git a/Library/Homebrew/test/test_ENV.rb b/Library/Homebrew/test/test_ENV.rb index 1e0568604..1d3290b5b 100644 --- a/Library/Homebrew/test/test_ENV.rb +++ b/Library/Homebrew/test/test_ENV.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'extend/ENV' +require "testing_env" +require "extend/ENV" module SharedEnvTests def setup @@ -9,16 +9,16 @@ module SharedEnvTests def test_switching_compilers @env.llvm @env.clang - assert_nil @env['LD'] - assert_equal @env['OBJC'], @env['CC'] + assert_nil @env["LD"] + assert_equal @env["OBJC"], @env["CC"] end def test_with_build_environment_restores_env before = @env.dup @env.with_build_environment do - @env['foo'] = 'bar' + @env["foo"] = "bar" end - assert_nil @env['foo'] + assert_nil @env["foo"] assert_equal before, @env end @@ -26,12 +26,12 @@ module SharedEnvTests before = @env.dup begin @env.with_build_environment do - @env['foo'] = 'bar' + @env["foo"] = "bar" raise Exception end rescue Exception end - assert_nil @env['foo'] + assert_nil @env["foo"] assert_equal before, @env end @@ -46,63 +46,63 @@ module SharedEnvTests end def test_append_existing_key - @env['foo'] = 'bar' - @env.append 'foo', '1' - assert_equal 'bar 1', @env['foo'] + @env["foo"] = "bar" + @env.append "foo", "1" + assert_equal "bar 1", @env["foo"] end def test_append_existing_key_empty - @env['foo'] = '' - @env.append 'foo', '1' - assert_equal '1', @env['foo'] + @env["foo"] = "" + @env.append "foo", "1" + assert_equal "1", @env["foo"] end def test_append_missing_key - @env.append 'foo', '1' - assert_equal '1', @env['foo'] + @env.append "foo", "1" + assert_equal "1", @env["foo"] end def test_prepend_existing_key - @env['foo'] = 'bar' - @env.prepend 'foo', '1' - assert_equal '1 bar', @env['foo'] + @env["foo"] = "bar" + @env.prepend "foo", "1" + assert_equal "1 bar", @env["foo"] end def test_prepend_existing_key_empty - @env['foo'] = '' - @env.prepend 'foo', '1' - assert_equal '1', @env['foo'] + @env["foo"] = "" + @env.prepend "foo", "1" + assert_equal "1", @env["foo"] end def test_prepend_missing_key - @env.prepend 'foo', '1' - assert_equal '1', @env['foo'] + @env.prepend "foo", "1" + assert_equal "1", @env["foo"] end # NOTE: this may be a wrong behavior; we should probably reject objects that # do not respond to #to_str. For now this documents existing behavior. def test_append_coerces_value_to_string - @env.append 'foo', 42 - assert_equal '42', @env['foo'] + @env.append "foo", 42 + assert_equal "42", @env["foo"] end def test_prepend_coerces_value_to_string - @env.prepend 'foo', 42 - assert_equal '42', @env['foo'] + @env.prepend "foo", 42 + assert_equal "42", @env["foo"] end def test_append_path - @env.append_path 'FOO', '/usr/bin' - assert_equal '/usr/bin', @env['FOO'] - @env.append_path 'FOO', '/bin' - assert_equal "/usr/bin#{File::PATH_SEPARATOR}/bin", @env['FOO'] + @env.append_path "FOO", "/usr/bin" + assert_equal "/usr/bin", @env["FOO"] + @env.append_path "FOO", "/bin" + assert_equal "/usr/bin#{File::PATH_SEPARATOR}/bin", @env["FOO"] end def test_prepend_path - @env.prepend_path 'FOO', '/usr/bin' - assert_equal '/usr/bin', @env['FOO'] - @env.prepend_path 'FOO', '/bin' - assert_equal "/bin#{File::PATH_SEPARATOR}/usr/bin", @env['FOO'] + @env.prepend_path "FOO", "/usr/bin" + assert_equal "/usr/bin", @env["FOO"] + @env.prepend_path "FOO", "/bin" + assert_equal "/bin#{File::PATH_SEPARATOR}/usr/bin", @env["FOO"] end def test_switching_compilers_updates_compiler @@ -113,11 +113,11 @@ module SharedEnvTests end def test_deparallelize_block_form_restores_makeflags - @env['MAKEFLAGS'] = '-j4' + @env["MAKEFLAGS"] = "-j4" @env.deparallelize do - assert_nil @env['MAKEFLAGS'] + assert_nil @env["MAKEFLAGS"] end - assert_equal '-j4', @env['MAKEFLAGS'] + assert_equal "-j4", @env["MAKEFLAGS"] end end diff --git a/Library/Homebrew/test/test_bottle_collector.rb b/Library/Homebrew/test/test_bottle_collector.rb index 34efe3efd..2621d1272 100644 --- a/Library/Homebrew/test/test_bottle_collector.rb +++ b/Library/Homebrew/test/test_bottle_collector.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'bottles' +require "testing_env" +require "bottles" class BottleCollectorTests < Homebrew::TestCase def setup @@ -13,7 +13,7 @@ class BottleCollectorTests < Homebrew::TestCase def test_collector_returns_passed_tags @collector[:lion] = "foo" @collector[:mountain_lion] = "bar" - assert_equal ['bar', :mountain_lion], checksum_for(:mountain_lion) + assert_equal ["bar", :mountain_lion], checksum_for(:mountain_lion) end def test_collector_returns_when_empty @@ -32,21 +32,21 @@ class BottleCollectorTests < Homebrew::TestCase def test_collector_finds_or_later_tags @collector[:lion_or_later] = "foo" - assert_equal ['foo', :lion_or_later], checksum_for(:mountain_lion) + assert_equal ["foo", :lion_or_later], checksum_for(:mountain_lion) assert_nil checksum_for(:snow_leopard) end def test_collector_prefers_exact_matches @collector[:lion_or_later] = "foo" @collector[:mountain_lion] = "bar" - assert_equal ['bar', :mountain_lion], checksum_for(:mountain_lion) + assert_equal ["bar", :mountain_lion], checksum_for(:mountain_lion) end def test_collector_finds_altivec_tags @collector[:tiger_altivec] = "foo" - assert_equal ['foo', :tiger_altivec], checksum_for(:tiger_g4) - assert_equal ['foo', :tiger_altivec], checksum_for(:tiger_g4e) - assert_equal ['foo', :tiger_altivec], checksum_for(:tiger_g5) + assert_equal ["foo", :tiger_altivec], checksum_for(:tiger_g4) + assert_equal ["foo", :tiger_altivec], checksum_for(:tiger_g4e) + assert_equal ["foo", :tiger_altivec], checksum_for(:tiger_g5) assert_nil checksum_for(:tiger_g3) end end diff --git a/Library/Homebrew/test/test_bottle_filename.rb b/Library/Homebrew/test/test_bottle_filename.rb index 0c5fdec1a..1d8cced8b 100644 --- a/Library/Homebrew/test/test_bottle_filename.rb +++ b/Library/Homebrew/test/test_bottle_filename.rb @@ -20,10 +20,10 @@ class BottleFilenameTests < Homebrew::TestCase end def test_create - f = formula { + f = formula do url "https://example.com/foo.tar.gz" version "1.0" - } + end expected = "formula_name-1.0.tag.bottle.tar.gz" assert_equal expected, Bottle::Filename.create(f, :tag, 0).to_s diff --git a/Library/Homebrew/test/test_bottle_hooks.rb b/Library/Homebrew/test/test_bottle_hooks.rb index 0b6c031bf..f2ae5a6b7 100644 --- a/Library/Homebrew/test/test_bottle_hooks.rb +++ b/Library/Homebrew/test/test_bottle_hooks.rb @@ -1,12 +1,16 @@ -require 'testing_env' -require 'formula_installer' -require 'hooks/bottles' +require "testing_env" +require "formula_installer" +require "hooks/bottles" class BottleHookTests < Homebrew::TestCase class FormulaDouble def bottle; end def local_bottle_path; end - def some_random_method; true; end + + def some_random_method + true + end + def file_modified?; end end @@ -15,9 +19,7 @@ class BottleHookTests < Homebrew::TestCase end def test_has_bottle - Homebrew::Hooks::Bottles.setup_formula_has_bottle do |f| - f.some_random_method - end + Homebrew::Hooks::Bottles.setup_formula_has_bottle(&:some_random_method) assert_predicate @fi, :pour_bottle? end @@ -29,13 +31,11 @@ class BottleHookTests < Homebrew::TestCase end def test_pour_formula_bottle - Homebrew::Hooks::Bottles.setup_formula_has_bottle do |f| + Homebrew::Hooks::Bottles.setup_formula_has_bottle do |_f| true end - Homebrew::Hooks::Bottles.setup_pour_formula_bottle do |f| - f.some_random_method - end + Homebrew::Hooks::Bottles.setup_pour_formula_bottle(&:some_random_method) @fi.pour end diff --git a/Library/Homebrew/test/test_bottle_tag.rb b/Library/Homebrew/test/test_bottle_tag.rb index e99ef462b..2bcbbf26d 100644 --- a/Library/Homebrew/test/test_bottle_tag.rb +++ b/Library/Homebrew/test/test_bottle_tag.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'bottles' +require "testing_env" +require "bottles" class BottleTagTests < Homebrew::TestCase def test_tag_tiger_ppc diff --git a/Library/Homebrew/test/test_build_environment.rb b/Library/Homebrew/test/test_build_environment.rb index 001d332a8..73a1c95f7 100644 --- a/Library/Homebrew/test/test_build_environment.rb +++ b/Library/Homebrew/test/test_build_environment.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'build_environment' +require "testing_env" +require "build_environment" class BuildEnvironmentTests < Homebrew::TestCase def setup diff --git a/Library/Homebrew/test/test_build_options.rb b/Library/Homebrew/test/test_build_options.rb index 7d2c952d9..6508e3112 100644 --- a/Library/Homebrew/test/test_build_options.rb +++ b/Library/Homebrew/test/test_build_options.rb @@ -4,8 +4,8 @@ require "options" class BuildOptionsTests < Homebrew::TestCase def setup - args = Options.create(%w(--with-foo --with-bar --without-qux)) - opts = Options.create(%w(--with-foo --with-bar --without-baz --without-qux)) + args = Options.create(%w[--with-foo --with-bar --without-qux]) + opts = Options.create(%w[--with-foo --with-bar --without-baz --without-qux]) @build = BuildOptions.new(args, opts) end diff --git a/Library/Homebrew/test/test_caveats.rb b/Library/Homebrew/test/test_caveats.rb index 5708ebc03..c9e242abd 100644 --- a/Library/Homebrew/test/test_caveats.rb +++ b/Library/Homebrew/test/test_caveats.rb @@ -1,4 +1,4 @@ -require 'testing_env' +require "testing_env" class CaveatsTests < Homebrew::TestCase def setup diff --git a/Library/Homebrew/test/test_checksum.rb b/Library/Homebrew/test/test_checksum.rb index 5e765b78a..72ddb81a3 100644 --- a/Library/Homebrew/test/test_checksum.rb +++ b/Library/Homebrew/test/test_checksum.rb @@ -1,9 +1,9 @@ -require 'testing_env' -require 'checksum' +require "testing_env" +require "checksum" class ChecksumTests < Homebrew::TestCase def test_empty? - assert_empty Checksum.new(:sha1, '') + assert_empty Checksum.new(:sha1, "") end def test_equality diff --git a/Library/Homebrew/test/test_checksum_verification.rb b/Library/Homebrew/test/test_checksum_verification.rb index c4846af14..cda35e3aa 100644 --- a/Library/Homebrew/test/test_checksum_verification.rb +++ b/Library/Homebrew/test/test_checksum_verification.rb @@ -1,4 +1,4 @@ -require 'testing_env' +require "testing_env" class ChecksumVerificationTests < Homebrew::TestCase def assert_checksum_good @@ -22,7 +22,7 @@ class ChecksumVerificationTests < Homebrew::TestCase def test_good_sha1 formula do - sha1 '482e737739d946b7c8cbaf127d9ee9c148b999f5' + sha1 "482e737739d946b7c8cbaf127d9ee9c148b999f5" end assert_checksum_good @@ -30,7 +30,7 @@ class ChecksumVerificationTests < Homebrew::TestCase def test_bad_sha1 formula do - sha1 '7ea8a98acb8f918df723c2ae73fe67d5664bfd7e' + sha1 "7ea8a98acb8f918df723c2ae73fe67d5664bfd7e" end assert_checksum_bad @@ -38,7 +38,7 @@ class ChecksumVerificationTests < Homebrew::TestCase def test_good_sha256 formula do - sha256 '1dfb13ce0f6143fe675b525fc9e168adb2215c5d5965c9f57306bb993170914f' + sha256 "1dfb13ce0f6143fe675b525fc9e168adb2215c5d5965c9f57306bb993170914f" end assert_checksum_good @@ -46,7 +46,7 @@ class ChecksumVerificationTests < Homebrew::TestCase def test_bad_sha256 formula do - sha256 'dcbf5f44743b74add648c7e35e414076632fa3b24463d68d1f6afc5be77024f8' + sha256 "dcbf5f44743b74add648c7e35e414076632fa3b24463d68d1f6afc5be77024f8" end assert_checksum_bad diff --git a/Library/Homebrew/test/test_cleaner.rb b/Library/Homebrew/test/test_cleaner.rb index ce297fc7d..1b214c2d1 100644 --- a/Library/Homebrew/test/test_cleaner.rb +++ b/Library/Homebrew/test/test_cleaner.rb @@ -1,12 +1,12 @@ -require 'testing_env' -require 'cleaner' -require 'formula' +require "testing_env" +require "cleaner" +require "formula" class CleanerTests < Homebrew::TestCase include FileUtils def setup - @f = formula("cleaner_test") { url 'foo-1.0' } + @f = formula("cleaner_test") { url "foo-1.0" } @f.prefix.mkpath end @@ -22,10 +22,10 @@ class CleanerTests < Homebrew::TestCase Cleaner.new(@f).clean - assert_equal 0100555, (@f.bin/'a.out').stat.mode - assert_equal 0100444, (@f.lib/'fat.dylib').stat.mode - assert_equal 0100444, (@f.lib/'x86_64.dylib').stat.mode - assert_equal 0100444, (@f.lib/'i386.dylib').stat.mode + assert_equal 0100555, (@f.bin/"a.out").stat.mode + assert_equal 0100444, (@f.lib/"fat.dylib").stat.mode + assert_equal 0100444, (@f.lib/"x86_64.dylib").stat.mode + assert_equal 0100444, (@f.lib/"i386.dylib").stat.mode end def test_prunes_prefix_if_empty @@ -34,7 +34,7 @@ class CleanerTests < Homebrew::TestCase end def test_prunes_empty_directories - subdir = @f.bin/'subdir' + subdir = @f.bin/"subdir" subdir.mkpath Cleaner.new(@f).clean @@ -44,7 +44,7 @@ class CleanerTests < Homebrew::TestCase end def test_skip_clean_empty_directory - @f.class.skip_clean 'bin' + @f.class.skip_clean "bin" @f.bin.mkpath Cleaner.new(@f).clean @@ -53,8 +53,8 @@ class CleanerTests < Homebrew::TestCase end def test_skip_clean_directory_with_empty_subdir - @f.class.skip_clean 'bin' - subdir = @f.bin/'subdir' + @f.class.skip_clean "bin" + subdir = @f.bin/"subdir" subdir.mkpath Cleaner.new(@f).clean @@ -64,8 +64,8 @@ class CleanerTests < Homebrew::TestCase end def test_removes_symlink_when_target_was_pruned_first - dir = @f.prefix/'b' - symlink = @f.prefix/'a' + dir = @f.prefix/"b" + symlink = @f.prefix/"a" dir.mkpath ln_s dir.basename, symlink @@ -78,8 +78,8 @@ class CleanerTests < Homebrew::TestCase end def test_removes_symlink_pointing_to_empty_directory - dir = @f.prefix/'b' - symlink = @f.prefix/'c' + dir = @f.prefix/"b" + symlink = @f.prefix/"c" dir.mkpath ln_s dir.basename, symlink @@ -92,8 +92,8 @@ class CleanerTests < Homebrew::TestCase end def test_removes_broken_symlinks - symlink = @f.prefix/'symlink' - ln_s 'target', symlink + symlink = @f.prefix/"symlink" + ln_s "target", symlink Cleaner.new(@f).clean @@ -101,9 +101,9 @@ class CleanerTests < Homebrew::TestCase end def test_skip_clean_broken_symlink - @f.class.skip_clean 'symlink' - symlink = @f.prefix/'symlink' - ln_s 'target', symlink + @f.class.skip_clean "symlink" + symlink = @f.prefix/"symlink" + ln_s "target", symlink Cleaner.new(@f).clean @@ -111,9 +111,9 @@ class CleanerTests < Homebrew::TestCase end def test_skip_clean_symlink_pointing_to_empty_directory - @f.class.skip_clean 'c' - dir = @f.prefix/'b' - symlink = @f.prefix/'c' + @f.class.skip_clean "c" + dir = @f.prefix/"b" + symlink = @f.prefix/"c" dir.mkpath ln_s dir.basename, symlink @@ -126,9 +126,9 @@ class CleanerTests < Homebrew::TestCase end def test_skip_clean_symlink_when_target_pruned - @f.class.skip_clean 'a' - dir = @f.prefix/'b' - symlink = @f.prefix/'a' + @f.class.skip_clean "a" + dir = @f.prefix/"b" + symlink = @f.prefix/"a" dir.mkpath ln_s dir.basename, symlink @@ -141,7 +141,7 @@ class CleanerTests < Homebrew::TestCase end def test_removes_la_files - file = @f.lib/'foo.la' + file = @f.lib/"foo.la" @f.lib.mkpath touch file @@ -152,7 +152,7 @@ class CleanerTests < Homebrew::TestCase end def test_skip_clean_la - file = @f.lib/'foo.la' + file = @f.lib/"foo.la" @f.class.skip_clean :la @f.lib.mkpath @@ -164,7 +164,7 @@ class CleanerTests < Homebrew::TestCase end def test_remove_charset_alias - file = @f.lib/'charset.alias' + file = @f.lib/"charset.alias" @f.lib.mkpath touch file @@ -175,8 +175,8 @@ class CleanerTests < Homebrew::TestCase end def test_skip_clean_subdir - dir = @f.lib/'subdir' - @f.class.skip_clean 'lib/subdir' + dir = @f.lib/"subdir" + @f.class.skip_clean "lib/subdir" dir.mkpath @@ -186,10 +186,10 @@ class CleanerTests < Homebrew::TestCase end def test_skip_clean_paths_are_anchored_to_prefix - dir1 = @f.bin/'a' - dir2 = @f.lib/'bin/a' + dir1 = @f.bin/"a" + dir2 = @f.lib/"bin/a" - @f.class.skip_clean 'bin/a' + @f.class.skip_clean "bin/a" dir1.mkpath dir2.mkpath diff --git a/Library/Homebrew/test/test_cmd_cleanup.rb b/Library/Homebrew/test/test_cmd_cleanup.rb index ebbff129e..109f27eba 100644 --- a/Library/Homebrew/test/test_cmd_cleanup.rb +++ b/Library/Homebrew/test/test_cmd_cleanup.rb @@ -1,6 +1,6 @@ -require 'testing_env' -require 'testball' -require 'cmd/cleanup' +require "testing_env" +require "testball" +require "cmd/cleanup" class CleanupTests < Homebrew::TestCase def test_cleanup diff --git a/Library/Homebrew/test/test_compiler_failure.rb b/Library/Homebrew/test/test_compiler_failure.rb index da656de7f..d907c93a3 100644 --- a/Library/Homebrew/test/test_compiler_failure.rb +++ b/Library/Homebrew/test/test_compiler_failure.rb @@ -32,7 +32,7 @@ class CompilerFailureTests < Homebrew::TestCase end def test_create_with_block_without_build - failure = create(:clang) { } + failure = create(:clang) {} assert_fails_with compiler(:clang, 425), failure end diff --git a/Library/Homebrew/test/test_compiler_selector.rb b/Library/Homebrew/test/test_compiler_selector.rb index a4a2986a0..907252b68 100644 --- a/Library/Homebrew/test/test_compiler_selector.rb +++ b/Library/Homebrew/test/test_compiler_selector.rb @@ -1,6 +1,6 @@ -require 'testing_env' -require 'compilers' -require 'software_spec' +require "testing_env" +require "compilers" +require "software_spec" class CompilerSelectorTests < Homebrew::TestCase class Double < SoftwareSpec diff --git a/Library/Homebrew/test/test_dependencies.rb b/Library/Homebrew/test/test_dependencies.rb index 7e4812ff7..db3b78226 100644 --- a/Library/Homebrew/test/test_dependencies.rb +++ b/Library/Homebrew/test/test_dependencies.rb @@ -1,7 +1,7 @@ -require 'testing_env' -require 'dependencies' -require 'dependency' -require 'requirements' +require "testing_env" +require "dependencies" +require "dependency" +require "requirements" class DependenciesTests < Homebrew::TestCase def setup @@ -25,7 +25,7 @@ class DependenciesTests < Homebrew::TestCase def test_repetition @deps << Dependency.new("foo") @deps << Dependency.new("bar") - assert_equal %q{foo, bar}, @deps*', ' + assert_equal "foo, bar", @deps*", " end def test_to_a @@ -109,7 +109,7 @@ class RequirementsTests < Homebrew::TestCase end def test_comparison_does_not_merge_smaller - @reqs << X11Requirement.new("x11", %w{2.6}) << X11Requirement.new + @reqs << X11Requirement.new("x11", %w[2.6]) << X11Requirement.new assert_equal [X11Requirement.new("x11", %w[2.6])], @reqs.to_a end end diff --git a/Library/Homebrew/test/test_dependency.rb b/Library/Homebrew/test/test_dependency.rb index 6f9038eae..a841467b6 100644 --- a/Library/Homebrew/test/test_dependency.rb +++ b/Library/Homebrew/test/test_dependency.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'dependency' +require "testing_env" +require "dependency" class DependableTests < Homebrew::TestCase def setup @@ -8,7 +8,7 @@ class DependableTests < Homebrew::TestCase end def test_options - assert_equal %w{--foo --bar}.sort, @dep.options.as_flags.sort + assert_equal %w[--foo --bar].sort, @dep.options.as_flags.sort end def test_interrogation @@ -20,13 +20,13 @@ end class DependencyTests < Homebrew::TestCase def test_accepts_single_tag - dep = Dependency.new("foo", %w{bar}) - assert_equal %w{bar}, dep.tags + dep = Dependency.new("foo", %w[bar]) + assert_equal %w[bar], dep.tags end def test_accepts_multiple_tags - dep = Dependency.new("foo", %w{bar baz}) - assert_equal %w{bar baz}.sort, dep.tags.sort + dep = Dependency.new("foo", %w[bar baz]) + assert_equal %w[bar baz].sort, dep.tags.sort end def test_preserves_symbol_tags diff --git a/Library/Homebrew/test/test_dependency_collector.rb b/Library/Homebrew/test/test_dependency_collector.rb index 1f4ffc784..460c60b8d 100644 --- a/Library/Homebrew/test/test_dependency_collector.rb +++ b/Library/Homebrew/test/test_dependency_collector.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'dependency_collector' +require "testing_env" +require "dependency_collector" class DependencyCollectorTests < Homebrew::TestCase def find_dependency(name) @@ -19,22 +19,22 @@ class DependencyCollectorTests < Homebrew::TestCase end def test_dependency_creation - @d.add 'foo' => :build - @d.add 'bar' => ['--universal', :optional] + @d.add "foo" => :build + @d.add "bar" => ["--universal", :optional] assert_instance_of Dependency, find_dependency("foo") assert_equal 2, find_dependency("bar").tags.length end def test_add_returns_created_dep - ret = @d.add 'foo' - assert_equal Dependency.new('foo'), ret + ret = @d.add "foo" + assert_equal Dependency.new("foo"), ret end def test_dependency_tags - assert_predicate Dependency.new('foo', [:build]), :build? - assert_predicate Dependency.new('foo', [:build, :optional]), :optional? - assert_includes Dependency.new('foo', ["universal"]).options, "--universal" - assert_empty Dependency.new('foo').tags + assert_predicate Dependency.new("foo", [:build]), :build? + assert_predicate Dependency.new("foo", [:build, :optional]), :optional? + assert_includes Dependency.new("foo", ["universal"]).options, "--universal" + assert_empty Dependency.new("foo").tags end def test_requirement_creation @@ -48,7 +48,7 @@ class DependencyCollectorTests < Homebrew::TestCase end def test_requirement_tags - @d.add :x11 => '2.5.1' + @d.add :x11 => "2.5.1" @d.add :xcode => :build assert_empty find_requirement(X11Requirement).tags assert_predicate find_requirement(XcodeRequirement), :build? @@ -60,7 +60,7 @@ 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 @@ -70,9 +70,9 @@ class DependencyCollectorTests < Homebrew::TestCase 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_equal "2.5.1", dep.min_version.to_s assert_predicate dep, :optional? end @@ -95,7 +95,7 @@ class DependencyCollectorTests < Homebrew::TestCase end def test_does_not_mutate_dependency_spec - spec = { 'foo' => :optional } + spec = { "foo" => :optional } copy = spec.dup @d.add(spec) assert_equal copy, spec diff --git a/Library/Homebrew/test/test_dependency_expansion.rb b/Library/Homebrew/test/test_dependency_expansion.rb index b653dc1bb..a542bfa93 100644 --- a/Library/Homebrew/test/test_dependency_expansion.rb +++ b/Library/Homebrew/test/test_dependency_expansion.rb @@ -1,8 +1,8 @@ -require 'testing_env' -require 'dependency' +require "testing_env" +require "dependency" class DependencyExpansionTests < Homebrew::TestCase - def build_dep(name, tags=[], deps=[]) + def build_dep(name, tags = [], deps = []) dep = Dependency.new(name.to_s, tags) dep.stubs(:to_formula).returns(stub(:deps => deps, :name => name)) dep @@ -36,7 +36,7 @@ class DependencyExpansionTests < Homebrew::TestCase def test_expand_selective_pruning deps = Dependency.expand(@f) do |_, dep| - Dependency.prune if dep.name == 'foo' + Dependency.prune if dep.name == "foo" end assert_equal [@bar, @baz, @qux], deps @@ -60,8 +60,8 @@ class DependencyExpansionTests < Homebrew::TestCase end def test_merges_repeated_deps_with_differing_options - @foo2 = build_dep(:foo, ['option']) - @baz2 = build_dep(:baz, ['option']) + @foo2 = build_dep(:foo, ["option"]) + @baz2 = build_dep(:baz, ["option"]) @deps << @foo2 << @baz2 deps = [@foo2, @bar, @baz2, @qux] deps.zip(Dependency.expand(@f)) do |expected, actual| @@ -79,21 +79,21 @@ class DependencyExpansionTests < Homebrew::TestCase end def test_merged_tags_no_dupes - @foo2 = build_dep(:foo, ['option']) - @foo3 = build_dep(:foo, ['option']) + @foo2 = build_dep(:foo, ["option"]) + @foo3 = build_dep(:foo, ["option"]) @deps << @foo2 << @foo3 - assert_equal %w{option}, Dependency.expand(@f).first.tags + assert_equal %w[option], Dependency.expand(@f).first.tags end def test_skip_skips_parent_but_yields_children f = stub(:name => "f", :deps => [ build_dep(:foo, [], [@bar, @baz]), - build_dep(:foo, [], [@baz]), + build_dep(:foo, [], [@baz]) ]) - deps = Dependency.expand(f) do |dependent, dep| - Dependency.skip if %w{foo qux}.include? dep.name + deps = Dependency.expand(f) do |_dependent, dep| + Dependency.skip if %w[foo qux].include? dep.name end assert_equal [@bar, @baz], deps @@ -104,7 +104,7 @@ class DependencyExpansionTests < Homebrew::TestCase baz = build_dep(:baz, [:build]) f = stub(:name => "f", :deps => [foo, baz]) - deps = Dependency.expand(f) do |dependent, dep| + deps = Dependency.expand(f) do |_dependent, dep| Dependency.keep_but_prune_recursive_deps if dep.build? end diff --git a/Library/Homebrew/test/test_download_strategies.rb b/Library/Homebrew/test/test_download_strategies.rb index 2f4a324ef..26ae8d822 100644 --- a/Library/Homebrew/test/test_download_strategies.rb +++ b/Library/Homebrew/test/test_download_strategies.rb @@ -1,10 +1,10 @@ -require 'testing_env' -require 'download_strategy' +require "testing_env" +require "download_strategy" class ResourceDouble attr_reader :url, :specs, :version - def initialize(url="http://example.com/foo.tar.gz", specs={}) + def initialize(url = "http://example.com/foo.tar.gz", specs = {}) @url = url @specs = specs end @@ -15,23 +15,23 @@ class AbstractDownloadStrategyTests < Homebrew::TestCase @name = "foo" @resource = ResourceDouble.new @strategy = AbstractDownloadStrategy.new(@name, @resource) - @args = %w{foo bar baz} + @args = %w[foo bar baz] 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 + assert_equal %w[foo bar baz --flag], expanded_args end def test_expand_safe_system_args_with_implicit_quiet_flag expanded_args = @strategy.expand_safe_system_args(@args) - assert_equal %w{foo bar -q baz}, expanded_args + assert_equal %w[foo bar -q baz], expanded_args end def test_expand_safe_system_args_does_not_mutate_argument result = @strategy.expand_safe_system_args(@args) - assert_equal %w{foo bar baz}, @args + assert_equal %w[foo bar baz], @args refute_same @args, result end end @@ -39,7 +39,11 @@ end class VCSDownloadStrategyTests < Homebrew::TestCase def test_cache_filename resource = ResourceDouble.new("http://example.com/bar") - strategy = Class.new(VCSDownloadStrategy) { def cache_tag; "foo"; end } + strategy = Class.new(VCSDownloadStrategy) do + def cache_tag + "foo" + end + end downloader = strategy.new("baz", resource) assert_equal HOMEBREW_CACHE.join("baz--foo"), downloader.cached_location end diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb index 3ba9c0f68..d61b0d820 100644 --- a/Library/Homebrew/test/test_formula.rb +++ b/Library/Homebrew/test/test_formula.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'testball' +require "testing_env" +require "testball" class FormulaTests < Homebrew::TestCase def test_formula_instantiation @@ -16,19 +16,19 @@ class FormulaTests < Homebrew::TestCase def test_prefix f = Testball.new - assert_equal HOMEBREW_CELLAR/f.name/'0.1', f.prefix + assert_equal HOMEBREW_CELLAR/f.name/"0.1", f.prefix assert_kind_of Pathname, f.prefix end def test_revised_prefix f = Class.new(Testball) { revision 1 }.new - assert_equal HOMEBREW_CELLAR/f.name/'0.1_1', f.prefix + assert_equal HOMEBREW_CELLAR/f.name/"0.1_1", f.prefix end def test_any_version_installed? f = formula do - url 'foo' - version '1.0' + url "foo" + version "1.0" end refute_predicate f, :any_version_installed? prefix = HOMEBREW_CELLAR+f.name+"0.1" @@ -62,10 +62,10 @@ class FormulaTests < Homebrew::TestCase def test_installed_prefix_head_installed f = formula do - head 'foo' + head "foo" devel do - url 'foo' - version '1.0' + url "foo" + version "1.0" end end prefix = HOMEBREW_CELLAR+f.name+f.head.version @@ -77,10 +77,10 @@ class FormulaTests < Homebrew::TestCase def test_installed_prefix_devel_installed f = formula do - head 'foo' + head "foo" devel do - url 'foo' - version '1.0' + url "foo" + version "1.0" end end prefix = HOMEBREW_CELLAR+f.name+f.devel.version @@ -92,10 +92,10 @@ class FormulaTests < Homebrew::TestCase def test_installed_prefix_stable_installed f = formula do - head 'foo' + head "foo" devel do - url 'foo' - version '1.0-devel' + url "foo" + version "1.0-devel" end end prefix = HOMEBREW_CELLAR+f.name+f.version @@ -107,10 +107,10 @@ class FormulaTests < Homebrew::TestCase def test_installed_prefix_head f = formula("test", Pathname.new(__FILE__).expand_path, :head) do - head 'foo' + head "foo" devel do - url 'foo' - version '1.0-devel' + url "foo" + version "1.0-devel" end end prefix = HOMEBREW_CELLAR+f.name+f.head.version @@ -119,10 +119,10 @@ class FormulaTests < Homebrew::TestCase def test_installed_prefix_devel f = formula("test", Pathname.new(__FILE__).expand_path, :devel) do - head 'foo' + head "foo" devel do - url 'foo' - version '1.0-devel' + url "foo" + version "1.0-devel" end end prefix = HOMEBREW_CELLAR+f.name+f.devel.version @@ -154,31 +154,31 @@ class FormulaTests < Homebrew::TestCase end def test_class_naming - assert_equal 'ShellFm', Formulary.class_s('shell.fm') - assert_equal 'Fooxx', Formulary.class_s('foo++') - assert_equal 'SLang', Formulary.class_s('s-lang') - assert_equal 'PkgConfig', Formulary.class_s('pkg-config') - assert_equal 'FooBar', Formulary.class_s('foo_bar') + assert_equal "ShellFm", Formulary.class_s("shell.fm") + assert_equal "Fooxx", Formulary.class_s("foo++") + assert_equal "SLang", Formulary.class_s("s-lang") + assert_equal "PkgConfig", Formulary.class_s("pkg-config") + assert_equal "FooBar", Formulary.class_s("foo_bar") end def test_formula_spec_integration f = formula do - homepage 'http://example.com' - url 'http://example.com/test-0.1.tbz' - mirror 'http://example.org/test-0.1.tbz' + homepage "http://example.com" + url "http://example.com/test-0.1.tbz" + mirror "http://example.org/test-0.1.tbz" sha1 TEST_SHA1 - 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' - mirror 'http://example.org/test-0.2.tbz' + url "http://example.com/test-0.2.tbz" + mirror "http://example.org/test-0.2.tbz" sha256 TEST_SHA256 end end - assert_equal 'http://example.com', f.homepage - assert_version_equal '0.1', f.version + assert_equal "http://example.com", f.homepage + assert_version_equal "0.1", f.version assert_predicate f, :stable? assert_version_equal "0.1", f.stable.version @@ -188,13 +188,13 @@ class FormulaTests < Homebrew::TestCase def test_formula_set_active_spec f = formula do - url 'foo' - version '1.0' + url "foo" + version "1.0" revision 1 devel do - url 'foo' - version '1.0beta' + url "foo" + version "1.0beta" end end assert_equal :stable, f.active_spec_sym @@ -208,20 +208,20 @@ class FormulaTests < Homebrew::TestCase end def test_path - name = 'foo-bar' + name = "foo-bar" assert_equal Pathname.new("#{HOMEBREW_LIBRARY}/Formula/#{name}.rb"), Formulary.core_path(name) end def test_factory - name = 'foo-bar' + name = "foo-bar" path = HOMEBREW_PREFIX+"Library/Formula/#{name}.rb" path.dirname.mkpath - File.open(path, 'w') do |f| - f << %{ + File.open(path, "w") do |f| + f << %( class #{Formulary.class_s(name)} < Formula url 'foo-1.0' end - } + ) end assert_kind_of Formula, Formulary.factory(name) ensure @@ -229,52 +229,52 @@ class FormulaTests < Homebrew::TestCase end def test_class_specs_are_always_initialized - f = formula { url 'foo-1.0' } + f = formula { url "foo-1.0" } - %w{stable devel head}.each do |spec| + %w[stable devel head].each do |spec| assert_kind_of SoftwareSpec, f.class.send(spec) end end def test_incomplete_instance_specs_are_not_accessible - f = formula { url 'foo-1.0' } + f = formula { url "foo-1.0" } - %w{devel head}.each { |spec| assert_nil f.send(spec) } + %w[devel head].each { |spec| assert_nil f.send(spec) } end def test_honors_attributes_declared_before_specs f = formula do - url 'foo-1.0' - depends_on 'foo' - devel { url 'foo-1.1' } + url "foo-1.0" + depends_on "foo" + devel { url "foo-1.1" } end - %w{stable devel head}.each do |spec| - assert_equal 'foo', f.class.send(spec).deps.first.name + %w[stable devel head].each do |spec| + assert_equal "foo", f.class.send(spec).deps.first.name end end def test_simple_version - assert_equal PkgVersion.parse('1.0'), formula { url 'foo-1.0.bar' }.pkg_version + assert_equal PkgVersion.parse("1.0"), formula { url "foo-1.0.bar" }.pkg_version end def test_version_with_revision f = formula do - url 'foo-1.0.bar' + url "foo-1.0.bar" revision 1 end - assert_equal PkgVersion.parse('1.0_1'), f.pkg_version + assert_equal PkgVersion.parse("1.0_1"), f.pkg_version end def test_head_ignores_revisions f = formula("test", Pathname.new(__FILE__).expand_path, :head) do - url 'foo-1.0.bar' + url "foo-1.0.bar" revision 1 - head 'foo' + head "foo" end - assert_equal PkgVersion.parse('HEAD'), f.pkg_version + assert_equal PkgVersion.parse("HEAD"), f.pkg_version end def test_legacy_options @@ -306,7 +306,7 @@ class FormulaTests < Homebrew::TestCase f1 = formula do url "foo-1.0" - def post_install;end + def post_install; end end f2 = formula do diff --git a/Library/Homebrew/test/test_formula_installer.rb b/Library/Homebrew/test/test_formula_installer.rb index 599099fd9..1bf3e43ba 100644 --- a/Library/Homebrew/test/test_formula_installer.rb +++ b/Library/Homebrew/test/test_formula_installer.rb @@ -40,7 +40,7 @@ class InstallTests < Homebrew::TestCase assert_predicate f.libexec, :directory? assert_equal 1, f.libexec.children.length - refute_predicate f.prefix+'main.c', :exist? + refute_predicate f.prefix+"main.c", :exist? # Test that things make it into the Cellar keg = Keg.new f.prefix diff --git a/Library/Homebrew/test/test_formula_lock.rb b/Library/Homebrew/test/test_formula_lock.rb index 1cc76d0a1..542f0d3f3 100644 --- a/Library/Homebrew/test/test_formula_lock.rb +++ b/Library/Homebrew/test/test_formula_lock.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'formula_lock' +require "testing_env" +require "formula_lock" class FormulaLockTests < Homebrew::TestCase def setup diff --git a/Library/Homebrew/test/test_formula_pin.rb b/Library/Homebrew/test/test_formula_pin.rb index 6dbf3e173..ebc51123c 100644 --- a/Library/Homebrew/test/test_formula_pin.rb +++ b/Library/Homebrew/test/test_formula_pin.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'formula_pin' +require "testing_env" +require "formula_pin" class FormulaPinTests < Homebrew::TestCase class FormulaDouble @@ -23,12 +23,12 @@ class FormulaPinTests < Homebrew::TestCase end def test_pinnable_if_kegs_exist - (@f.rack+'0.1').mkpath + (@f.rack+"0.1").mkpath assert_predicate @pin, :pinnable? end def test_unpin - (@f.rack+'0.1').mkpath + (@f.rack+"0.1").mkpath @pin.pin assert_predicate @pin, :pinned? diff --git a/Library/Homebrew/test/test_formula_spec_selection.rb b/Library/Homebrew/test/test_formula_spec_selection.rb index 12b290b1e..4cfcd504c 100644 --- a/Library/Homebrew/test/test_formula_spec_selection.rb +++ b/Library/Homebrew/test/test_formula_spec_selection.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'formula' +require "testing_env" +require "formula" class FormulaSpecSelectionTests < Homebrew::TestCase def test_selects_stable_by_default diff --git a/Library/Homebrew/test/test_formula_validation.rb b/Library/Homebrew/test/test_formula_validation.rb index 796282206..159b7ddd8 100644 --- a/Library/Homebrew/test/test_formula_validation.rb +++ b/Library/Homebrew/test/test_formula_validation.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'formula' +require "testing_env" +require "formula" class FormulaValidationTests < Homebrew::TestCase def assert_invalid(attr, &block) @@ -9,7 +9,7 @@ class FormulaValidationTests < Homebrew::TestCase def test_cant_override_brew e = assert_raises(RuntimeError) { formula { def brew; end } } - assert_match %r{You cannot override Formula#brew}, e.message + assert_match /You cannot override Formula#brew/, e.message end def test_validates_name diff --git a/Library/Homebrew/test/test_hardware.rb b/Library/Homebrew/test/test_hardware.rb index 95313583d..7d1a256a9 100644 --- a/Library/Homebrew/test/test_hardware.rb +++ b/Library/Homebrew/test/test_hardware.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'hardware' +require "testing_env" +require "hardware" class HardwareTests < Homebrew::TestCase def test_hardware_cpu_type diff --git a/Library/Homebrew/test/test_inreplace.rb b/Library/Homebrew/test/test_inreplace.rb index e7917f67f..7b0dfe64d 100644 --- a/Library/Homebrew/test/test_inreplace.rb +++ b/Library/Homebrew/test/test_inreplace.rb @@ -94,20 +94,20 @@ class InreplaceTest < Homebrew::TestCase open("test", "w") { |f| f.write "a\nb\nc\n" } - assert_raises(Utils::InreplaceError) { + assert_raises(Utils::InreplaceError) do inreplace "test", "d", "f" - } + end - assert_raises(Utils::InreplaceError) { + assert_raises(Utils::InreplaceError) do inreplace("test") { |s| s.gsub! "d", "f" } - } + end - assert_raises(Utils::InreplaceError) { - inreplace("test") { |s| + assert_raises(Utils::InreplaceError) do + inreplace("test") do |s| s.change_make_var! "VAR", "value" s.remove_make_var! "VAR2" - } - } + end + end ensure File.unlink("test") end diff --git a/Library/Homebrew/test/test_integration_cmds.rb b/Library/Homebrew/test/test_integration_cmds.rb index 82686b8cb..5538cc3ee 100644 --- a/Library/Homebrew/test/test_integration_cmds.rb +++ b/Library/Homebrew/test/test_integration_cmds.rb @@ -1,11 +1,11 @@ require "testing_env" class IntegrationCommandTests < Homebrew::TestCase - def cmd_output *args + def cmd_output(*args) cmd_args = %W[ - -W0 - -I#{HOMEBREW_LIBRARY_PATH}/test/lib - -rconfig + -W0 + -I#{HOMEBREW_LIBRARY_PATH}/test/lib + -rconfig ] cmd_args << "-rsimplecov" if ENV["HOMEBREW_TESTS_COVERAGE"] cmd_args << (HOMEBREW_LIBRARY_PATH/"../brew.rb").resolved_path.to_s @@ -18,13 +18,13 @@ class IntegrationCommandTests < Homebrew::TestCase end end - def cmd *args + def cmd(*args) output = cmd_output(*args) assert_equal 0, $?.exitstatus output end - def cmd_fail *args + def cmd_fail(*args) output = cmd_output(*args) assert_equal 1, $?.exitstatus output diff --git a/Library/Homebrew/test/test_json.rb b/Library/Homebrew/test/test_json.rb index c3d17a773..5724cf41f 100644 --- a/Library/Homebrew/test/test_json.rb +++ b/Library/Homebrew/test/test_json.rb @@ -1,16 +1,16 @@ -require 'testing_env' -require 'utils/json' +require "testing_env" +require "utils/json" class JsonSmokeTest < Homebrew::TestCase def test_encode hash = { "foo" => ["bar", "baz"] } - json = %q|{"foo":["bar","baz"]}| + json = '{"foo":["bar","baz"]}' assert_equal json, Utils::JSON.dump(hash) end def test_decode hash = { "foo" => ["bar", "baz"], "qux" => 1 } - json = %q|{"foo":["bar","baz"],"qux":1}| + json = '{"foo":["bar","baz"],"qux":1}' assert_equal hash, Utils::JSON.load(json) end end diff --git a/Library/Homebrew/test/test_keg.rb b/Library/Homebrew/test/test_keg.rb index 28cadf1c4..41f085a8c 100644 --- a/Library/Homebrew/test/test_keg.rb +++ b/Library/Homebrew/test/test_keg.rb @@ -1,6 +1,6 @@ -require 'testing_env' -require 'keg' -require 'stringio' +require "testing_env" +require "keg" +require "stringio" class LinkTests < Homebrew::TestCase include FileUtils @@ -9,7 +9,7 @@ class LinkTests < Homebrew::TestCase keg = HOMEBREW_CELLAR.join("foo", "1.0") keg.join("bin").mkpath - %w{hiworld helloworld goodbye_cruel_world}.each do |file| + %w[hiworld helloworld goodbye_cruel_world].each do |file| touch keg.join("bin", file) end @@ -54,7 +54,7 @@ class LinkTests < Homebrew::TestCase assert_equal 0, @keg.link(@mode) refute_predicate @keg, :linked? - ['hiworld', 'helloworld', 'goodbye_cruel_world'].each do |file| + ["hiworld", "helloworld", "goodbye_cruel_world"].each do |file| assert_match "#{HOMEBREW_PREFIX}/bin/#{file}", $stdout.string end assert_equal 3, $stdout.string.lines.count diff --git a/Library/Homebrew/test/test_language_module_requirement.rb b/Library/Homebrew/test/test_language_module_requirement.rb index bdc8dd3fc..9ffe05dbd 100644 --- a/Library/Homebrew/test/test_language_module_requirement.rb +++ b/Library/Homebrew/test/test_language_module_requirement.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'requirements/language_module_requirement' +require "testing_env" +require "requirements/language_module_requirement" class LanguageModuleRequirementTests < Homebrew::TestCase parallelize_me! diff --git a/Library/Homebrew/test/test_mach.rb b/Library/Homebrew/test/test_mach.rb index 0472ca141..a1f62dcf3 100644 --- a/Library/Homebrew/test/test_mach.rb +++ b/Library/Homebrew/test/test_mach.rb @@ -1,4 +1,4 @@ -require 'testing_env' +require "testing_env" class MachOPathnameTests < Homebrew::TestCase def dylib_path(name) @@ -173,7 +173,7 @@ class TextExecutableTests < Homebrew::TestCase end def test_simple_shebang - pn.write '#!/bin/sh' + pn.write "#!/bin/sh" refute_predicate pn, :universal? refute_predicate pn, :i386? refute_predicate pn, :x86_64? @@ -187,7 +187,7 @@ class TextExecutableTests < Homebrew::TestCase end def test_shebang_with_options - pn.write '#! /usr/bin/perl -w' + pn.write "#! /usr/bin/perl -w" refute_predicate pn, :universal? refute_predicate pn, :i386? refute_predicate pn, :x86_64? @@ -201,7 +201,7 @@ class TextExecutableTests < Homebrew::TestCase end def test_malformed_shebang - pn.write ' #!' + pn.write " #!" refute_predicate pn, :universal? refute_predicate pn, :i386? refute_predicate pn, :x86_64? diff --git a/Library/Homebrew/test/test_mpi_requirement.rb b/Library/Homebrew/test/test_mpi_requirement.rb index 0b8555cd4..e0f97e8ee 100644 --- a/Library/Homebrew/test/test_mpi_requirement.rb +++ b/Library/Homebrew/test/test_mpi_requirement.rb @@ -1,10 +1,10 @@ -require 'testing_env' -require 'requirements/mpi_requirement' +require "testing_env" +require "requirements/mpi_requirement" class MPIRequirementTests < Homebrew::TestCase def test_initialize_untangles_tags_and_wrapper_symbols wrappers = [:cc, :cxx, :f77] - tags = [:optional, 'some-other-tag'] + tags = [:optional, "some-other-tag"] dep = MPIRequirement.new(*wrappers + tags) assert_equal wrappers, dep.lang_list assert_equal tags, dep.tags diff --git a/Library/Homebrew/test/test_options.rb b/Library/Homebrew/test/test_options.rb index 604727961..9b123bc3c 100644 --- a/Library/Homebrew/test/test_options.rb +++ b/Library/Homebrew/test/test_options.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'options' +require "testing_env" +require "options" class OptionTests < Homebrew::TestCase def setup @@ -96,7 +96,7 @@ class OptionsTests < Homebrew::TestCase def test_as_flags @options << Option.new("foo") - assert_equal %w{--foo}, @options.as_flags + assert_equal %w[--foo], @options.as_flags end def test_to_a @@ -112,14 +112,14 @@ class OptionsTests < Homebrew::TestCase end def test_intersection - foo, bar, baz = %w{foo bar baz}.map { |o| Option.new(o) } + foo, bar, baz = %w[foo bar baz].map { |o| Option.new(o) } options = Options.new << foo << bar @options << foo << baz assert_equal [foo], (@options & options).to_a end def test_set_union - foo, bar, baz = %w{foo bar baz}.map { |o| Option.new(o) } + foo, bar, baz = %w[foo bar baz].map { |o| Option.new(o) } options = Options.new << foo << bar @options << foo << baz assert_equal [foo, bar, baz].sort, (@options | options).sort @@ -131,7 +131,7 @@ class OptionsTests < Homebrew::TestCase end def test_create_with_array - array = %w{--foo --bar} + array = %w[--foo --bar] option1 = Option.new("foo") option2 = Option.new("bar") assert_equal [option1, option2].sort, Options.create(array).sort diff --git a/Library/Homebrew/test/test_patch.rb b/Library/Homebrew/test/test_patch.rb index a70d581d8..214955ef1 100644 --- a/Library/Homebrew/test/test_patch.rb +++ b/Library/Homebrew/test/test_patch.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'patch' +require "testing_env" +require "patch" class PatchTests < Homebrew::TestCase def test_create_simple @@ -47,7 +47,7 @@ class LegacyPatchTests < Homebrew::TestCase def test_patch_array patches = Patch.normalize_legacy_patches( - %w{http://example.com/patch1.diff http://example.com/patch2.diff} + %w[http://example.com/patch1.diff http://example.com/patch2.diff] ) assert_equal 2, patches.length @@ -79,8 +79,8 @@ class LegacyPatchTests < Homebrew::TestCase :p0 => "http://example.com/patch0.diff" ) assert_equal 2, patches.length - assert_equal 1, patches.select { |p| p.strip == :p0 }.length - assert_equal 1, patches.select { |p| p.strip == :p1 }.length + assert_equal 1, patches.count { |p| p.strip == :p0 } + assert_equal 1, patches.count { |p| p.strip == :p1 } end def test_mixed_hash_to_arrays @@ -92,8 +92,8 @@ class LegacyPatchTests < Homebrew::TestCase ) assert_equal 4, patches.length - assert_equal 2, patches.select { |p| p.strip == :p0 }.length - assert_equal 2, patches.select { |p| p.strip == :p1 }.length + assert_equal 2, patches.count { |p| p.strip == :p0 } + assert_equal 2, patches.count { |p| p.strip == :p1 } end def test_nil diff --git a/Library/Homebrew/test/test_patching.rb b/Library/Homebrew/test/test_patching.rb index 02c73ef8e..a0e7acec0 100644 --- a/Library/Homebrew/test/test_patching.rb +++ b/Library/Homebrew/test/test_patching.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'formula' +require "testing_env" +require "formula" class PatchingTests < Homebrew::TestCase PATCH_URL_A = "file://#{TEST_DIRECTORY}/patches/noop-a.diff" @@ -80,19 +80,35 @@ class PatchingTests < Homebrew::TestCase end def test_patch_p0 - assert_patched formula { def patches; { :p0 => PATCH_URL_B }; end } + assert_patched formula { + def patches + { :p0 => PATCH_URL_B } + end + } end def test_patch_array - assert_patched formula { def patches; [PATCH_URL_A]; end } + assert_patched formula { + def patches + [PATCH_URL_A] + end + } end def test_patch_hash - assert_patched formula { def patches; { :p1 => PATCH_URL_A }; end } + assert_patched formula { + def patches + { :p1 => PATCH_URL_A } + end + } end def test_patch_hash_array - assert_patched formula { def patches; { :p1 => [PATCH_URL_A] } end } + assert_patched formula { + def patches + { :p1 => [PATCH_URL_A] } + end + } end def test_patch_string diff --git a/Library/Homebrew/test/test_pathname.rb b/Library/Homebrew/test/test_pathname.rb index e7f5fd896..0f36038dc 100644 --- a/Library/Homebrew/test/test_pathname.rb +++ b/Library/Homebrew/test/test_pathname.rb @@ -1,7 +1,7 @@ -require 'testing_env' -require 'tmpdir' -require 'extend/pathname' -require 'install_renamed' +require "testing_env" +require "tmpdir" +require "extend/pathname" +require "install_renamed" module PathnameTestExtension include FileUtils @@ -9,8 +9,8 @@ module PathnameTestExtension def setup @src = Pathname.new(mktmpdir) @dst = Pathname.new(mktmpdir) - @file = @src+'foo' - @dir = @src+'bar' + @file = @src+"foo" + @dir = @src+"bar" end def teardown @@ -24,41 +24,41 @@ class PathnameTests < Homebrew::TestCase def test_rmdir_if_possible mkdir_p @dir - touch @dir+'foo' + touch @dir+"foo" assert !@dir.rmdir_if_possible assert_predicate @dir, :directory? - rm_f @dir+'foo' + rm_f @dir+"foo" assert @dir.rmdir_if_possible refute_predicate @dir, :exist? end def test_rmdir_if_possible_ignore_DS_Store mkdir_p @dir - touch @dir+'.DS_Store' + touch @dir+".DS_Store" assert @dir.rmdir_if_possible refute_predicate @dir, :exist? end def test_write - @file.write('CONTENT') - assert_equal 'CONTENT', File.read(@file) + @file.write("CONTENT") + assert_equal "CONTENT", File.read(@file) end def test_write_does_not_overwrite touch @file - assert_raises(RuntimeError) { @file.write('CONTENT') } + assert_raises(RuntimeError) { @file.write("CONTENT") } end def test_atomic_write touch @file - @file.atomic_write('CONTENT') - assert_equal 'CONTENT', File.read(@file) + @file.atomic_write("CONTENT") + assert_equal "CONTENT", File.read(@file) end def test_atomic_write_preserves_permissions - File.open(@file, "w", 0100777) { } + File.open(@file, "w", 0100777) {} @file.atomic_write("CONTENT") assert_equal 0100777 & ~File.umask, @file.stat.mode end @@ -78,13 +78,13 @@ class PathnameTests < Homebrew::TestCase end def test_extname - assert_equal '.tar.gz', Pathname('foo-0.1.tar.gz').extname - assert_equal '.cpio.gz', Pathname('foo-0.1.cpio.gz').extname + assert_equal ".tar.gz", Pathname("foo-0.1.tar.gz").extname + assert_equal ".cpio.gz", Pathname("foo-0.1.cpio.gz").extname end def test_stem - assert_equal 'foo-0.1', Pathname('foo-0.1.tar.gz').stem - assert_equal 'foo-0.1', Pathname('foo-0.1.cpio.gz').stem + assert_equal "foo-0.1", Pathname("foo-0.1.tar.gz").stem + assert_equal "foo-0.1", Pathname("foo-0.1.cpio.gz").stem end def test_install_missing_file diff --git a/Library/Homebrew/test/test_pkg_version.rb b/Library/Homebrew/test/test_pkg_version.rb index f802380d7..da2fe8ebc 100644 --- a/Library/Homebrew/test/test_pkg_version.rb +++ b/Library/Homebrew/test/test_pkg_version.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'pkg_version' +require "testing_env" +require "pkg_version" class PkgVersionTests < Homebrew::TestCase def v(version) diff --git a/Library/Homebrew/test/test_requirement.rb b/Library/Homebrew/test/test_requirement.rb index a4400feb3..ee64cbba4 100644 --- a/Library/Homebrew/test/test_requirement.rb +++ b/Library/Homebrew/test/test_requirement.rb @@ -1,15 +1,15 @@ -require 'testing_env' -require 'requirement' +require "testing_env" +require "requirement" class RequirementTests < Homebrew::TestCase def test_accepts_single_tag - dep = Requirement.new(%w{bar}) - assert_equal %w{bar}, dep.tags + dep = Requirement.new(%w[bar]) + assert_equal %w[bar], dep.tags end def test_accepts_multiple_tags - dep = Requirement.new(%w{bar baz}) - assert_equal %w{bar baz}.sort, dep.tags.sort + dep = Requirement.new(%w[bar baz]) + assert_equal %w[bar baz].sort, dep.tags.sort end def test_preserves_symbol_tags @@ -100,20 +100,20 @@ class RequirementTests < Homebrew::TestCase end def test_dsl_default_formula - req = Class.new(Requirement) { default_formula 'foo' }.new + req = Class.new(Requirement) { default_formula "foo" }.new assert_predicate req, :default_formula? end def test_to_dependency - req = Class.new(Requirement) { default_formula 'foo' }.new - assert_equal Dependency.new('foo'), req.to_dependency + req = Class.new(Requirement) { default_formula "foo" }.new + assert_equal Dependency.new("foo"), req.to_dependency end def test_to_dependency_calls_requirement_modify_build_environment error = Class.new(StandardError) req = Class.new(Requirement) do - default_formula 'foo' + default_formula "foo" satisfy { true } env { raise error } end.new @@ -128,14 +128,16 @@ class RequirementTests < Homebrew::TestCase end def test_eql - a, b = Requirement.new, Requirement.new + a = Requirement.new + b = Requirement.new assert_equal a, b assert_eql a, b assert_equal a.hash, b.hash end def test_not_eql - a, b = Requirement.new([:optional]), Requirement.new + a = Requirement.new([:optional]) + b = Requirement.new refute_equal a, b refute_eql a, b refute_equal a.hash, b.hash diff --git a/Library/Homebrew/test/test_resource.rb b/Library/Homebrew/test/test_resource.rb index ac72836e2..55845eac3 100644 --- a/Library/Homebrew/test/test_resource.rb +++ b/Library/Homebrew/test/test_resource.rb @@ -1,40 +1,40 @@ -require 'testing_env' -require 'resource' +require "testing_env" +require "resource" class ResourceTests < Homebrew::TestCase def setup - @resource = Resource.new('test') + @resource = Resource.new("test") end def test_url - @resource.url('foo') - assert_equal 'foo', @resource.url + @resource.url("foo") + assert_equal "foo", @resource.url end def test_url_with_specs - @resource.url('foo', :branch => 'master') - assert_equal 'foo', @resource.url - assert_equal({ :branch => 'master' }, @resource.specs) + @resource.url("foo", :branch => "master") + assert_equal "foo", @resource.url + assert_equal({ :branch => "master" }, @resource.specs) end def test_url_with_custom_download_strategy_class strategy = Class.new(AbstractDownloadStrategy) - @resource.url('foo', :using => strategy) - assert_equal 'foo', @resource.url + @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') - assert_equal 'foo', @resource.url - assert_equal({ :branch => 'master' }, @resource.specs) + @resource.url("foo", :using => strategy, :branch => "master") + assert_equal "foo", @resource.url + 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) - assert_equal 'foo', @resource.url + @resource.url("foo", :using => :git) + assert_equal "foo", @resource.url assert_equal GitDownloadStrategy, @resource.download_strategy end @@ -43,35 +43,35 @@ class ResourceTests < Homebrew::TestCase end def test_does_not_mutate_specs_hash - specs = { :using => :git, :branch => 'master' } - @resource.url('foo', specs) - assert_equal({ :branch => 'master' }, @resource.specs) + specs = { :using => :git, :branch => "master" } + @resource.url("foo", 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 - @resource.version('1.0') - assert_version_equal '1.0', @resource.version + @resource.version("1.0") + assert_version_equal "1.0", @resource.version refute_predicate @resource.version, :detected_from_url? end def test_version_from_url - @resource.url('http://example.com/foo-1.0.tar.gz') - assert_version_equal '1.0', @resource.version + @resource.url("http://example.com/foo-1.0.tar.gz") + assert_version_equal "1.0", @resource.version assert_predicate @resource.version, :detected_from_url? end def test_version_with_scheme klass = Class.new(Version) @resource.version klass.new("1.0") - assert_version_equal '1.0', @resource.version + assert_version_equal "1.0", @resource.version assert_instance_of klass, @resource.version end def test_version_from_tag - @resource.url('http://example.com/foo-1.0.tar.gz', :tag => 'v1.0.2') - assert_version_equal '1.0.2', @resource.version + @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 @@ -87,9 +87,9 @@ class ResourceTests < Homebrew::TestCase def test_mirrors assert_empty @resource.mirrors - @resource.mirror('foo') - @resource.mirror('bar') - assert_equal %w{foo bar}, @resource.mirrors + @resource.mirror("foo") + @resource.mirror("bar") + assert_equal %w[foo bar], @resource.mirrors end def test_checksum_setters @@ -109,7 +109,7 @@ class ResourceTests < Homebrew::TestCase end def test_verify_download_integrity_missing - fn = Pathname.new('test') + fn = Pathname.new("test") fn.stubs(:file? => true) fn.expects(:verify_checksum).raises(ChecksumMissingError) diff --git a/Library/Homebrew/test/test_software_spec.rb b/Library/Homebrew/test/test_software_spec.rb index eb828f95c..71eb3762f 100644 --- a/Library/Homebrew/test/test_software_spec.rb +++ b/Library/Homebrew/test/test_software_spec.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'software_spec' +require "testing_env" +require "software_spec" class SoftwareSpecTests < Homebrew::TestCase def setup @@ -7,54 +7,62 @@ class SoftwareSpecTests < Homebrew::TestCase end def test_resource - @spec.resource('foo') { url 'foo-1.0' } + @spec.resource("foo") { url "foo-1.0" } assert @spec.resource_defined?("foo") end def test_raises_when_duplicate_resources_are_defined - @spec.resource('foo') { url 'foo-1.0' } + @spec.resource("foo") { url "foo-1.0" } assert_raises(DuplicateResourceError) do - @spec.resource('foo') { url 'foo-1.0' } + @spec.resource("foo") { url "foo-1.0" } end end def test_raises_when_accessing_missing_resources @spec.owner = Class.new do - def name; "test"; end - def full_name; "test"; end - def tap; "Homebrew/homebrew"; end + def name + "test" + end + + def full_name + "test" + end + + def tap + "Homebrew/homebrew" + end end.new - assert_raises(ResourceMissingError) { @spec.resource('foo') } + assert_raises(ResourceMissingError) { @spec.resource("foo") } end def test_set_owner - owner = stub :name => 'some_name', - :full_name => 'some_name', + owner = stub :name => "some_name", + :full_name => "some_name", :tap => "Homebrew/homebrew" @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', + @spec.resource("foo") { url "foo-1.0" } + @spec.owner = stub :name => "some_name", + :full_name => "some_name", :tap => "Homebrew/homebrew" - assert_equal 'some_name', @spec.name + assert_equal "some_name", @spec.name @spec.resources.each_value { |r| assert_equal @spec, r.owner } end 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', + @spec.url("foo-42") + @spec.resource("bar") { url "bar" } + @spec.owner = stub :name => "some_name", + :full_name => "some_name", :tap => "Homebrew/homebrew" - assert_version_equal '42', @spec.resource('bar').version + assert_version_equal "42", @spec.resource("bar").version end def test_option - @spec.option('foo') + @spec.option("foo") assert @spec.option_defined?("foo") end @@ -83,14 +91,14 @@ class SoftwareSpecTests < Homebrew::TestCase end def test_deprecated_option - @spec.deprecated_option('foo' => 'bar') + @spec.deprecated_option("foo" => "bar") refute_empty @spec.deprecated_options assert_equal "foo", @spec.deprecated_options.first.old assert_equal "bar", @spec.deprecated_options.first.current end def test_deprecated_options - @spec.deprecated_option(['foo1', 'foo2'] => 'bar1', 'foo3' => ['bar2', 'bar3']) + @spec.deprecated_option(["foo1", "foo2"] => "bar1", "foo3" => ["bar2", "bar3"]) assert_includes @spec.deprecated_options, DeprecatedOption.new("foo1", "bar1") assert_includes @spec.deprecated_options, DeprecatedOption.new("foo2", "bar1") assert_includes @spec.deprecated_options, DeprecatedOption.new("foo3", "bar2") @@ -102,20 +110,20 @@ class SoftwareSpecTests < Homebrew::TestCase end def test_depends_on - @spec.depends_on('foo') - assert_equal 'foo', @spec.deps.first.name + @spec.depends_on("foo") + assert_equal "foo", @spec.deps.first.name end def test_dependency_option_integration - @spec.depends_on 'foo' => :optional - @spec.depends_on 'bar' => :recommended + @spec.depends_on "foo" => :optional + @spec.depends_on "bar" => :recommended assert @spec.option_defined?("with-foo") assert @spec.option_defined?("without-bar") end def test_explicit_options_override_default_dep_option_description - @spec.option('with-foo', 'blah') - @spec.depends_on('foo' => :optional) + @spec.option("with-foo", "blah") + @spec.depends_on("foo" => :optional) assert_equal "blah", @spec.options.first.description end @@ -132,7 +140,7 @@ class HeadSoftwareSpecTests < Homebrew::TestCase end def test_version - assert_version_equal 'HEAD', @spec.version + assert_version_equal "HEAD", @spec.version end def test_verify_download_integrity @@ -147,10 +155,10 @@ class BottleSpecificationTests < Homebrew::TestCase def test_checksum_setters checksums = { - :snow_leopard_32 => 'deadbeef'*5, - :snow_leopard => 'faceb00c'*5, - :lion => 'baadf00d'*5, - :mountain_lion => '8badf00d'*5, + :snow_leopard_32 => "deadbeef"*5, + :snow_leopard => "faceb00c"*5, + :lion => "baadf00d"*5, + :mountain_lion => "8badf00d"*5 } checksums.each_pair do |cat, sha1| @@ -158,14 +166,14 @@ class BottleSpecificationTests < Homebrew::TestCase end checksums.each_pair do |cat, sha1| - checksum, _ = @spec.checksum_for(cat) + checksum, = @spec.checksum_for(cat) assert_equal Checksum.new(:sha1, sha1), checksum end end def test_other_setters double = Object.new - %w{root_url prefix cellar revision}.each do |method| + %w[root_url prefix cellar revision].each do |method| @spec.send(method, double) assert_equal double, @spec.send(method) end diff --git a/Library/Homebrew/test/test_stdlib.rb b/Library/Homebrew/test/test_stdlib.rb index 9ed69d3b7..eb423f283 100644 --- a/Library/Homebrew/test/test_stdlib.rb +++ b/Library/Homebrew/test/test_stdlib.rb @@ -1,6 +1,6 @@ -require 'testing_env' -require 'formula' -require 'cxxstdlib' +require "testing_env" +require "formula" +require "cxxstdlib" class CxxStdlibTests < Homebrew::TestCase def setup @@ -8,8 +8,8 @@ class CxxStdlibTests < Homebrew::TestCase @gcc = CxxStdlib.create(:libstdcxx, :gcc) @llvm = CxxStdlib.create(:libstdcxx, :llvm) @gcc4 = CxxStdlib.create(:libstdcxx, :gcc_4_0) - @gcc48 = CxxStdlib.create(:libstdcxx, 'gcc-4.8') - @gcc49 = CxxStdlib.create(:libstdcxx, 'gcc-4.9') + @gcc48 = CxxStdlib.create(:libstdcxx, "gcc-4.8") + @gcc49 = CxxStdlib.create(:libstdcxx, "gcc-4.9") @lcxx = CxxStdlib.create(:libcxx, :clang) @purec = CxxStdlib.create(nil, :clang) end diff --git a/Library/Homebrew/test/test_string.rb b/Library/Homebrew/test/test_string.rb index 7de81d56d..1d8c3c246 100644 --- a/Library/Homebrew/test/test_string.rb +++ b/Library/Homebrew/test/test_string.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'extend/string' +require "testing_env" +require "extend/string" class StringTest < Homebrew::TestCase def test_undent diff --git a/Library/Homebrew/test/test_tab.rb b/Library/Homebrew/test/test_tab.rb index af537267c..453f8984c 100644 --- a/Library/Homebrew/test/test_tab.rb +++ b/Library/Homebrew/test/test_tab.rb @@ -4,24 +4,22 @@ require "formula" class TabTests < Homebrew::TestCase def setup - @used = Options.create(%w(--with-foo --without-bar)) - @unused = Options.create(%w(--with-baz --without-qux)) - - @tab = Tab.new({ - "used_options" => @used.as_flags, - "unused_options" => @unused.as_flags, - "built_as_bottle" => false, - "poured_from_bottle" => true, - "time" => nil, - "HEAD" => TEST_SHA1, - "compiler" => "clang", - "stdlib" => "libcxx", - "source" => { - "tap" => "Homebrew/homebrew", - "path" => nil, - "spec" => "stable", - }, - }) + @used = Options.create(%w[--with-foo --without-bar]) + @unused = Options.create(%w[--with-baz --without-qux]) + + @tab = Tab.new("used_options" => @used.as_flags, + "unused_options" => @unused.as_flags, + "built_as_bottle" => false, + "poured_from_bottle" => true, + "time" => nil, + "HEAD" => TEST_SHA1, + "compiler" => "clang", + "stdlib" => "libcxx", + "source" => { + "tap" => "Homebrew/homebrew", + "path" => nil, + "spec" => "stable" + }) end def test_defaults diff --git a/Library/Homebrew/test/test_updater.rb b/Library/Homebrew/test/test_updater.rb index 374910cad..9c3c02979 100644 --- a/Library/Homebrew/test/test_updater.rb +++ b/Library/Homebrew/test/test_updater.rb @@ -1,7 +1,7 @@ -require 'testing_env' -require 'cmd/update' +require "testing_env" +require "cmd/update" require "formula_versions" -require 'yaml' +require "yaml" class UpdaterTests < Homebrew::TestCase class UpdaterMock < ::Updater @@ -14,14 +14,14 @@ class UpdaterTests < Homebrew::TestCase @called = [] end - def in_repo_expect(cmd, output = '') + def in_repo_expect(cmd, output = "") @expected << cmd @outputs[cmd] << output end def `(*args) cmd = args.join(" ") - if @expected.include?(cmd) and !@outputs[cmd].empty? + if @expected.include?(cmd) && !@outputs[cmd].empty? @called << cmd @outputs[cmd].shift else @@ -53,7 +53,7 @@ class UpdaterTests < Homebrew::TestCase FileUtils.rm_rf HOMEBREW_LIBRARY.join("Taps") end - def perform_update(fixture_name="") + def perform_update(fixture_name = "") Formulary.stubs(:factory).returns(stub(:pkg_version => "1.0")) FormulaVersions.stubs(:new).returns(stub(:formula_at_revision => "2.0")) @updater.diff = fixture(fixture_name) @@ -82,13 +82,13 @@ class UpdaterTests < Homebrew::TestCase def test_update_homebrew_with_formulae_changes perform_update("update_git_diff_output_with_formulae_changes") - assert_equal %w{ xar yajl }, @report.select_formula(:M) - assert_equal %w{ antiword bash-completion ddrescue dict lua }, @report.select_formula(:A) + assert_equal %w[xar yajl], @report.select_formula(:M) + assert_equal %w[antiword bash-completion ddrescue dict lua], @report.select_formula(:A) end def test_update_homebrew_with_removed_formulae perform_update("update_git_diff_output_with_removed_formulae") - assert_equal %w{libgsasl}, @report.select_formula(:D) + assert_equal %w[libgsasl], @report.select_formula(:D) end def test_update_homebrew_with_changed_filetype @@ -102,7 +102,7 @@ class UpdaterTests < Homebrew::TestCase perform_update("update_git_diff_output_with_restructured_tap") - assert_equal %w{foo/bar/git foo/bar/lua}, @report.select_formula(:A) + assert_equal %w[foo/bar/git foo/bar/lua], @report.select_formula(:A) assert_empty @report.select_formula(:D) end @@ -114,7 +114,7 @@ class UpdaterTests < Homebrew::TestCase perform_update("update_git_diff_simulate_homebrew_php_restructuring") assert_empty @report.select_formula(:A) - assert_equal %w{foo/bar/git foo/bar/lua}, @report.select_formula(:D) + assert_equal %w[foo/bar/git foo/bar/lua], @report.select_formula(:D) end def test_update_homebrew_with_tap_formulae_changes @@ -124,8 +124,8 @@ class UpdaterTests < Homebrew::TestCase perform_update("update_git_diff_output_with_tap_formulae_changes") - assert_equal %w{foo/bar/lua}, @report.select_formula(:A) - assert_equal %w{foo/bar/git}, @report.select_formula(:M) + assert_equal %w[foo/bar/lua], @report.select_formula(:A) + assert_equal %w[foo/bar/git], @report.select_formula(:M) assert_empty @report.select_formula(:D) end end diff --git a/Library/Homebrew/test/test_utils.rb b/Library/Homebrew/test/test_utils.rb index 120ef6541..07bb65c90 100644 --- a/Library/Homebrew/test/test_utils.rb +++ b/Library/Homebrew/test/test_utils.rb @@ -1,4 +1,4 @@ -require 'testing_env' +require "testing_env" class UtilTests < Homebrew::TestCase def test_put_columns_empty diff --git a/Library/Homebrew/test/test_version_subclasses.rb b/Library/Homebrew/test/test_version_subclasses.rb index 75ee2f286..b2f226efa 100644 --- a/Library/Homebrew/test/test_version_subclasses.rb +++ b/Library/Homebrew/test/test_version_subclasses.rb @@ -1,6 +1,6 @@ -require 'testing_env' -require 'version' -require 'os/mac/version' +require "testing_env" +require "version" +require "os/mac/version" class MacOSVersionTests < Homebrew::TestCase def setup diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb index 2c8fc6463..b39dbcb3b 100644 --- a/Library/Homebrew/test/test_versions.rb +++ b/Library/Homebrew/test/test_versions.rb @@ -1,10 +1,10 @@ -require 'testing_env' -require 'version' +require "testing_env" +require "version" class VersionTests < Homebrew::TestCase def test_accepts_objects_responding_to_to_str - value = stub(:to_str => '0.1') - assert_equal '0.1', Version.new(value).to_s + value = stub(:to_str => "0.1") + assert_equal "0.1", Version.new(value).to_s end def test_raises_for_non_string_objects @@ -16,39 +16,39 @@ end class VersionComparisonTests < Homebrew::TestCase def test_version_comparisons - assert_operator version('0.1'), :==, version('0.1.0') - assert_operator version('0.1'), :<, version('0.2') - assert_operator version('1.2.3'), :>, version('1.2.2') - assert_operator version('1.2.4'), :<, version('1.2.4.1') + assert_operator version("0.1"), :==, version("0.1.0") + assert_operator version("0.1"), :<, version("0.2") + assert_operator version("1.2.3"), :>, version("1.2.2") + assert_operator version("1.2.4"), :<, version("1.2.4.1") end def test_patchlevel - assert_operator version('1.2.3-p34'), :>, version('1.2.3-p33') - assert_operator version('1.2.3-p33'), :<, version('1.2.3-p34') - assert_operator version('1.2.3-p10'), :>, version('1.2.3-p9') + assert_operator version("1.2.3-p34"), :>, version("1.2.3-p33") + assert_operator version("1.2.3-p33"), :<, version("1.2.3-p34") + assert_operator version("1.2.3-p10"), :>, version("1.2.3-p9") end def test_HEAD - assert_operator version('HEAD'), :>, version('1.2.3') - assert_operator version('1.2.3'), :<, version('HEAD') + assert_operator version("HEAD"), :>, version("1.2.3") + assert_operator version("1.2.3"), :<, version("HEAD") end def test_alpha_beta_rc - assert_operator version('3.2.0b4'), :<, version('3.2.0') - assert_operator version('1.0beta6'), :<, version('1.0b7') - assert_operator version('1.0b6'), :<, version('1.0beta7') - assert_operator version('1.1alpha4'), :<, version('1.1beta2') - assert_operator version('1.1beta2'), :<, version('1.1rc1') - assert_operator version('1.0.0beta7'), :<, version('1.0.0') - assert_operator version('3.2.1'), :>, version('3.2beta4') + assert_operator version("3.2.0b4"), :<, version("3.2.0") + assert_operator version("1.0beta6"), :<, version("1.0b7") + assert_operator version("1.0b6"), :<, version("1.0beta7") + assert_operator version("1.1alpha4"), :<, version("1.1beta2") + assert_operator version("1.1beta2"), :<, version("1.1rc1") + assert_operator version("1.0.0beta7"), :<, version("1.0.0") + assert_operator version("3.2.1"), :>, version("3.2beta4") end def test_comparing_unevenly_padded_versions - assert_operator version('2.1.0-p194'), :<, version('2.1-p195') - assert_operator version('2.1-p195'), :>, version('2.1.0-p194') - assert_operator version('2.1-p194'), :<, version('2.1.0-p195') - assert_operator version('2.1.0-p195'), :>, version('2.1-p194') - assert_operator version('2-p194'), :<, version('2.1-p195') + assert_operator version("2.1.0-p194"), :<, version("2.1-p195") + assert_operator version("2.1-p195"), :>, version("2.1.0-p194") + assert_operator version("2.1-p194"), :<, version("2.1.0-p195") + assert_operator version("2.1.0-p195"), :>, version("2.1-p194") + assert_operator version("2-p194"), :<, version("2.1-p195") end def test_comparison_returns_nil_for_non_version @@ -58,19 +58,19 @@ class VersionComparisonTests < Homebrew::TestCase end def test_compare_patchlevel_to_non_patchlevel - assert_operator version('9.9.3-P1'), :>, version('9.9.3') + assert_operator version("9.9.3-P1"), :>, version("9.9.3") end def test_erlang_version - versions = %w{R16B R15B03-1 R15B03 R15B02 R15B01 R14B04 R14B03 - R14B02 R14B01 R14B R13B04 R13B03 R13B02-1}.reverse + versions = %w[R16B R15B03-1 R15B03 R15B02 R15B01 R14B04 R14B03 + R14B02 R14B01 R14B R13B04 R13B03 R13B02-1].reverse assert_equal versions, versions.sort_by { |v| version(v) } end def test_hash_equality - v1 = version('0.1.0') - v2 = version('0.1.0') - v3 = version('0.1.1') + v1 = version("0.1.0") + v2 = version("0.1.0") + v3 = version("0.1.1") assert_eql v1, v2 refute_eql v1, v3 @@ -83,271 +83,271 @@ end class VersionParsingTests < Homebrew::TestCase def test_pathname_version - d = HOMEBREW_CELLAR/'foo-0.1.9' + d = HOMEBREW_CELLAR/"foo-0.1.9" d.mkpath - assert_equal version('0.1.9'), d.version + assert_equal version("0.1.9"), d.version ensure d.unlink end def test_no_version - assert_version_nil 'http://example.com/blah.tar' - assert_version_nil 'foo' + assert_version_nil "http://example.com/blah.tar" + assert_version_nil "foo" end def test_version_all_dots - assert_version_detected '1.14', 'http://example.com/foo.bar.la.1.14.zip' + assert_version_detected "1.14", "http://example.com/foo.bar.la.1.14.zip" end def test_version_underscore_separator - assert_version_detected '1.1', 'http://example.com/grc_1.1.tar.gz' + assert_version_detected "1.1", "http://example.com/grc_1.1.tar.gz" end def test_boost_version_style - assert_version_detected '1.39.0', 'http://example.com/boost_1_39_0.tar.bz2' + assert_version_detected "1.39.0", "http://example.com/boost_1_39_0.tar.bz2" end def test_erlang_version_style - assert_version_detected 'R13B', 'http://erlang.org/download/otp_src_R13B.tar.gz' + assert_version_detected "R13B", "http://erlang.org/download/otp_src_R13B.tar.gz" end def test_another_erlang_version_style - assert_version_detected 'R15B01', 'https://github.com/erlang/otp/tarball/OTP_R15B01' + assert_version_detected "R15B01", "https://github.com/erlang/otp/tarball/OTP_R15B01" end def test_yet_another_erlang_version_style - assert_version_detected 'R15B03-1', 'https://github.com/erlang/otp/tarball/OTP_R15B03-1' + assert_version_detected "R15B03-1", "https://github.com/erlang/otp/tarball/OTP_R15B03-1" end def test_p7zip_version_style - assert_version_detected '9.04', - 'http://kent.dl.sourceforge.net/sourceforge/p7zip/p7zip_9.04_src_all.tar.bz2' + assert_version_detected "9.04", + "http://kent.dl.sourceforge.net/sourceforge/p7zip/p7zip_9.04_src_all.tar.bz2" end def test_new_github_style - assert_version_detected '1.1.4', 'https://github.com/sam-github/libnet/tarball/libnet-1.1.4' + assert_version_detected "1.1.4", "https://github.com/sam-github/libnet/tarball/libnet-1.1.4" end def test_gloox_beta_style - assert_version_detected '1.0-beta7', 'http://camaya.net/download/gloox-1.0-beta7.tar.bz2' + assert_version_detected "1.0-beta7", "http://camaya.net/download/gloox-1.0-beta7.tar.bz2" end def test_sphinx_beta_style - assert_version_detected '1.10-beta', 'http://sphinxsearch.com/downloads/sphinx-1.10-beta.tar.gz' + assert_version_detected "1.10-beta", "http://sphinxsearch.com/downloads/sphinx-1.10-beta.tar.gz" end def test_astyle_verson_style - assert_version_detected '1.23', 'http://kent.dl.sourceforge.net/sourceforge/astyle/astyle_1.23_macosx.tar.gz' + assert_version_detected "1.23", "http://kent.dl.sourceforge.net/sourceforge/astyle/astyle_1.23_macosx.tar.gz" end def test_version_dos2unix - assert_version_detected '3.1', 'http://www.sfr-fresh.com/linux/misc/dos2unix-3.1.tar.gz' + assert_version_detected "3.1", "http://www.sfr-fresh.com/linux/misc/dos2unix-3.1.tar.gz" end def test_version_internal_dash - assert_version_detected '1.1-2', 'http://example.com/foo-arse-1.1-2.tar.gz' + assert_version_detected "1.1-2", "http://example.com/foo-arse-1.1-2.tar.gz" end def test_version_single_digit - assert_version_detected '45', 'http://example.com/foo_bar.45.tar.gz' + assert_version_detected "45", "http://example.com/foo_bar.45.tar.gz" end def test_noseparator_single_digit - assert_version_detected '45', 'http://example.com/foo_bar45.tar.gz' + assert_version_detected "45", "http://example.com/foo_bar45.tar.gz" end def test_version_developer_that_hates_us_format - assert_version_detected '1.2.3', 'http://example.com/foo-bar-la.1.2.3.tar.gz' + assert_version_detected "1.2.3", "http://example.com/foo-bar-la.1.2.3.tar.gz" end def test_version_regular - assert_version_detected '1.21', 'http://example.com/foo_bar-1.21.tar.gz' + assert_version_detected "1.21", "http://example.com/foo_bar-1.21.tar.gz" end def test_version_sourceforge_download - assert_version_detected '1.21', 'http://sourceforge.net/foo_bar-1.21.tar.gz/download' - assert_version_detected '1.21', 'http://sf.net/foo_bar-1.21.tar.gz/download' + assert_version_detected "1.21", "http://sourceforge.net/foo_bar-1.21.tar.gz/download" + assert_version_detected "1.21", "http://sf.net/foo_bar-1.21.tar.gz/download" end def test_version_github - assert_version_detected '1.0.5', 'http://github.com/lloyd/yajl/tarball/1.0.5' + assert_version_detected "1.0.5", "http://github.com/lloyd/yajl/tarball/1.0.5" end def test_version_github_with_high_patch_number - assert_version_detected '1.2.34', 'http://github.com/lloyd/yajl/tarball/v1.2.34' + assert_version_detected "1.2.34", "http://github.com/lloyd/yajl/tarball/v1.2.34" end def test_yet_another_version - assert_version_detected '0.15.1b', 'http://example.com/mad-0.15.1b.tar.gz' + assert_version_detected "0.15.1b", "http://example.com/mad-0.15.1b.tar.gz" end def test_lame_version_style - assert_version_detected '398-2', 'http://kent.dl.sourceforge.net/sourceforge/lame/lame-398-2.tar.gz' + assert_version_detected "398-2", "http://kent.dl.sourceforge.net/sourceforge/lame/lame-398-2.tar.gz" end def test_ruby_version_style - assert_version_detected '1.9.1-p243', 'ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-p243.tar.gz' + assert_version_detected "1.9.1-p243", "ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-p243.tar.gz" end def test_omega_version_style - assert_version_detected '0.80.2', 'http://www.alcyone.com/binaries/omega/omega-0.80.2-src.tar.gz' + assert_version_detected "0.80.2", "http://www.alcyone.com/binaries/omega/omega-0.80.2-src.tar.gz" end def test_rc_style - assert_version_detected '1.2.2rc1', 'http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.2rc1.tar.bz2' + assert_version_detected "1.2.2rc1", "http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.2rc1.tar.bz2" end def test_dash_rc_style - assert_version_detected '1.8.0-rc1', 'http://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz' + assert_version_detected "1.8.0-rc1", "http://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz" end def test_angband_version_style - assert_version_detected '3.0.9b', 'http://rephial.org/downloads/3.0/angband-3.0.9b-src.tar.gz' + assert_version_detected "3.0.9b", "http://rephial.org/downloads/3.0/angband-3.0.9b-src.tar.gz" end def test_stable_suffix - assert_version_detected '1.4.14b', 'http://www.monkey.org/~provos/libevent-1.4.14b-stable.tar.gz' + assert_version_detected "1.4.14b", "http://www.monkey.org/~provos/libevent-1.4.14b-stable.tar.gz" end def test_debian_style_1 - assert_version_detected '3.03', 'http://ftp.de.debian.org/debian/pool/main/s/sl/sl_3.03.orig.tar.gz' + assert_version_detected "3.03", "http://ftp.de.debian.org/debian/pool/main/s/sl/sl_3.03.orig.tar.gz" end def test_debian_style_2 - assert_version_detected '1.01b', 'http://ftp.de.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz' + assert_version_detected "1.01b", "http://ftp.de.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz" end def test_bottle_style - assert_version_detected '4.8.0', 'https://homebrew.bintray.com/bottles/qt-4.8.0.lion.bottle.tar.gz' + assert_version_detected "4.8.0", "https://homebrew.bintray.com/bottles/qt-4.8.0.lion.bottle.tar.gz" end def test_versioned_bottle_style - assert_version_detected '4.8.1', 'https://homebrew.bintray.com/bottles/qt-4.8.1.lion.bottle.1.tar.gz' + assert_version_detected "4.8.1", "https://homebrew.bintray.com/bottles/qt-4.8.1.lion.bottle.1.tar.gz" end def test_erlang_bottle_style - assert_version_detected 'R15B', 'https://homebrew.bintray.com/bottles/erlang-R15B.lion.bottle.tar.gz' + assert_version_detected "R15B", "https://homebrew.bintray.com/bottles/erlang-R15B.lion.bottle.tar.gz" end def test_another_erlang_bottle_style - assert_version_detected 'R15B01', 'https://homebrew.bintray.com/bottles/erlang-R15B01.mountain_lion.bottle.tar.gz' + assert_version_detected "R15B01", "https://homebrew.bintray.com/bottles/erlang-R15B01.mountain_lion.bottle.tar.gz" end def test_yet_another_erlang_bottle_style - assert_version_detected 'R15B03-1', 'https://homebrew.bintray.com/bottles/erlang-R15B03-1.mountainlion.bottle.tar.gz' + assert_version_detected "R15B03-1", "https://homebrew.bintray.com/bottles/erlang-R15B03-1.mountainlion.bottle.tar.gz" end def test_imagemagick_style - assert_version_detected '6.7.5-7', 'http://downloads.sf.net/project/machomebrew/mirror/ImageMagick-6.7.5-7.tar.bz2' + assert_version_detected "6.7.5-7", "http://downloads.sf.net/project/machomebrew/mirror/ImageMagick-6.7.5-7.tar.bz2" end def test_imagemagick_bottle_style - assert_version_detected '6.7.5-7', 'https://homebrew.bintray.com/bottles/imagemagick-6.7.5-7.lion.bottle.tar.gz' + assert_version_detected "6.7.5-7", "https://homebrew.bintray.com/bottles/imagemagick-6.7.5-7.lion.bottle.tar.gz" end def test_imagemagick_versioned_bottle_style - assert_version_detected '6.7.5-7', 'https://homebrew.bintray.com/bottles/imagemagick-6.7.5-7.lion.bottle.1.tar.gz' + assert_version_detected "6.7.5-7", "https://homebrew.bintray.com/bottles/imagemagick-6.7.5-7.lion.bottle.1.tar.gz" end def test_dash_version_dash_style - assert_version_detected '3.4', 'http://www.antlr.org/download/antlr-3.4-complete.jar' + assert_version_detected "3.4", "http://www.antlr.org/download/antlr-3.4-complete.jar" end def test_jenkins_version_style - assert_version_detected '1.486', 'http://mirrors.jenkins-ci.org/war/1.486/jenkins.war' + assert_version_detected "1.486", "http://mirrors.jenkins-ci.org/war/1.486/jenkins.war" end def test_apache_version_style - assert_version_detected '1.2.0-rc2', 'http://www.apache.org/dyn/closer.cgi?path=/cassandra/1.2.0/apache-cassandra-1.2.0-rc2-bin.tar.gz' + assert_version_detected "1.2.0-rc2", "http://www.apache.org/dyn/closer.cgi?path=/cassandra/1.2.0/apache-cassandra-1.2.0-rc2-bin.tar.gz" end def test_jpeg_style - assert_version_detected '8d', 'http://www.ijg.org/files/jpegsrc.v8d.tar.gz' + assert_version_detected "8d", "http://www.ijg.org/files/jpegsrc.v8d.tar.gz" end def test_version_ghc_style - assert_version_detected '7.0.4', 'http://www.haskell.org/ghc/dist/7.0.4/ghc-7.0.4-x86_64-apple-darwin.tar.bz2' - assert_version_detected '7.0.4', 'http://www.haskell.org/ghc/dist/7.0.4/ghc-7.0.4-i386-apple-darwin.tar.bz2' + assert_version_detected "7.0.4", "http://www.haskell.org/ghc/dist/7.0.4/ghc-7.0.4-x86_64-apple-darwin.tar.bz2" + assert_version_detected "7.0.4", "http://www.haskell.org/ghc/dist/7.0.4/ghc-7.0.4-i386-apple-darwin.tar.bz2" end def test_pypy_version - assert_version_detected '1.4.1', 'http://pypy.org/download/pypy-1.4.1-osx.tar.bz2' + assert_version_detected "1.4.1", "http://pypy.org/download/pypy-1.4.1-osx.tar.bz2" end def test_openssl_version - assert_version_detected '0.9.8s', 'http://www.openssl.org/source/openssl-0.9.8s.tar.gz' + assert_version_detected "0.9.8s", "http://www.openssl.org/source/openssl-0.9.8s.tar.gz" end def test_xaw3d_version - assert_version_detected '1.5E', 'ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-1.5E.tar.gz' + assert_version_detected "1.5E", "ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-1.5E.tar.gz" end def test_assimp_version - assert_version_detected '2.0.863', 'http://downloads.sourceforge.net/project/assimp/assimp-2.0/assimp--2.0.863-sdk.zip' + assert_version_detected "2.0.863", "http://downloads.sourceforge.net/project/assimp/assimp-2.0/assimp--2.0.863-sdk.zip" end def test_cmucl_version - assert_version_detected '20c', 'http://common-lisp.net/project/cmucl/downloads/release/20c/cmucl-20c-x86-darwin.tar.bz2' + assert_version_detected "20c", "http://common-lisp.net/project/cmucl/downloads/release/20c/cmucl-20c-x86-darwin.tar.bz2" end def test_fann_version - assert_version_detected '2.1.0beta', 'http://downloads.sourceforge.net/project/fann/fann/2.1.0beta/fann-2.1.0beta.zip' + assert_version_detected "2.1.0beta", "http://downloads.sourceforge.net/project/fann/fann/2.1.0beta/fann-2.1.0beta.zip" end def test_grads_version - assert_version_detected '2.0.1', 'ftp://iges.org/grads/2.0/grads-2.0.1-bin-darwin9.8-intel.tar.gz' + assert_version_detected "2.0.1", "ftp://iges.org/grads/2.0/grads-2.0.1-bin-darwin9.8-intel.tar.gz" end def test_haxe_version - assert_version_detected '2.08', 'http://haxe.org/file/haxe-2.08-osx.tar.gz' + assert_version_detected "2.08", "http://haxe.org/file/haxe-2.08-osx.tar.gz" end def test_imap_version - assert_version_detected '2007f', 'ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz' + assert_version_detected "2007f", "ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz" end def test_suite3270_version - assert_version_detected '3.3.12ga7', 'http://downloads.sourceforge.net/project/x3270/x3270/3.3.12ga7/suite3270-3.3.12ga7-src.tgz' + assert_version_detected "3.3.12ga7", "http://downloads.sourceforge.net/project/x3270/x3270/3.3.12ga7/suite3270-3.3.12ga7-src.tgz" end def test_wwwoffle_version - assert_version_detected '2.9h', 'http://www.gedanken.demon.co.uk/download-wwwoffle/wwwoffle-2.9h.tgz' + assert_version_detected "2.9h", "http://www.gedanken.demon.co.uk/download-wwwoffle/wwwoffle-2.9h.tgz" end def test_synergy_version - assert_version_detected '1.3.6p2', 'http://synergy.googlecode.com/files/synergy-1.3.6p2-MacOSX-Universal.zip' + assert_version_detected "1.3.6p2", "http://synergy.googlecode.com/files/synergy-1.3.6p2-MacOSX-Universal.zip" end def test_fontforge_version - assert_version_detected '20120731', 'http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-20120731-b.tar.bz2' + assert_version_detected "20120731", "http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-20120731-b.tar.bz2" end def test_ezlupdate_version - assert_version_detected '2011.10', 'https://github.com/downloads/ezsystems/ezpublish-legacy/ezpublish_community_project-2011.10-with_ezc.tar.bz2' + assert_version_detected "2011.10", "https://github.com/downloads/ezsystems/ezpublish-legacy/ezpublish_community_project-2011.10-with_ezc.tar.bz2" end def test_aespipe_version_style - assert_version_detected '2.4c', - 'http://loop-aes.sourceforge.net/aespipe/aespipe-v2.4c.tar.bz2' + assert_version_detected "2.4c", + "http://loop-aes.sourceforge.net/aespipe/aespipe-v2.4c.tar.bz2" end def test_win_style - assert_version_detected '0.9.17', - 'http://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-0.9.17-w32.zip' - assert_version_detected '1.29', - 'http://ftpmirror.gnu.org/libidn/libidn-1.29-win64.zip' + assert_version_detected "0.9.17", + "http://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-0.9.17-w32.zip" + assert_version_detected "1.29", + "http://ftpmirror.gnu.org/libidn/libidn-1.29-win64.zip" end def test_with_arch - assert_version_detected '4.0.18-1', - 'http://ftpmirror.gnu.org/mtools/mtools-4.0.18-1.i686.rpm' - assert_version_detected '5.5.7-5', - 'http://ftpmirror.gnu.org/autogen/autogen-5.5.7-5.i386.rpm' - assert_version_detected '2.8', - 'http://ftpmirror.gnu.org/libtasn1/libtasn1-2.8-x86.zip' - assert_version_detected '2.8', - 'http://ftpmirror.gnu.org/libtasn1/libtasn1-2.8-x64.zip' - assert_version_detected '4.0.18', - 'http://ftpmirror.gnu.org/mtools/mtools_4.0.18_i386.deb' + assert_version_detected "4.0.18-1", + "http://ftpmirror.gnu.org/mtools/mtools-4.0.18-1.i686.rpm" + assert_version_detected "5.5.7-5", + "http://ftpmirror.gnu.org/autogen/autogen-5.5.7-5.i386.rpm" + assert_version_detected "2.8", + "http://ftpmirror.gnu.org/libtasn1/libtasn1-2.8-x86.zip" + assert_version_detected "2.8", + "http://ftpmirror.gnu.org/libtasn1/libtasn1-2.8-x64.zip" + assert_version_detected "4.0.18", + "http://ftpmirror.gnu.org/mtools/mtools_4.0.18_i386.deb" end end diff --git a/Library/Homebrew/test/test_x11_requirement.rb b/Library/Homebrew/test/test_x11_requirement.rb index 0f7ffe004..fff43b71f 100644 --- a/Library/Homebrew/test/test_x11_requirement.rb +++ b/Library/Homebrew/test/test_x11_requirement.rb @@ -1,5 +1,5 @@ -require 'testing_env' -require 'requirements/x11_requirement' +require "testing_env" +require "requirements/x11_requirement" class X11RequirementTests < Homebrew::TestCase def test_eql_instances_are_eql diff --git a/Library/Homebrew/test/testball.rb b/Library/Homebrew/test/testball.rb index 53ba83221..276296023 100644 --- a/Library/Homebrew/test/testball.rb +++ b/Library/Homebrew/test/testball.rb @@ -1,11 +1,12 @@ class Testball < Formula - def initialize(name="testball", path=Pathname.new(__FILE__).expand_path, spec=:stable) + def initialize(name = "testball", path = Pathname.new(__FILE__).expand_path, spec = :stable) self.class.instance_eval do stable.url "file://#{File.expand_path("..", __FILE__)}/tarballs/testball-0.1.tbz" stable.sha256 "1dfb13ce0f6143fe675b525fc9e168adb2215c5d5965c9f57306bb993170914f" end super end + def install prefix.install "bin" prefix.install "libexec" diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb index e5913627a..b13dbb81f 100644 --- a/Library/Homebrew/test/testing_env.rb +++ b/Library/Homebrew/test/testing_env.rb @@ -5,8 +5,8 @@ require "simplecov" if ENV["HOMEBREW_TESTS_COVERAGE"] require "global" # Test environment setup -%w{ENV Formula}.each { |d| HOMEBREW_LIBRARY.join(d).mkpath } -%w{cache formula_cache cellar logs}.each { |d| HOMEBREW_PREFIX.parent.join(d).mkpath } +%w[ENV Formula].each { |d| HOMEBREW_LIBRARY.join(d).mkpath } +%w[cache formula_cache cellar logs].each { |d| HOMEBREW_PREFIX.parent.join(d).mkpath } # Test fixtures and files can be found relative to this path TEST_DIRECTORY = File.dirname(File.expand_path(__FILE__)) @@ -21,19 +21,19 @@ end module Homebrew module VersionAssertions - def version v + def version(v) Version.new(v) end - def assert_version_equal expected, actual + def assert_version_equal(expected, actual) assert_equal Version.new(expected), actual end - def assert_version_detected expected, url + def assert_version_detected(expected, url) assert_equal expected, Version.parse(url).to_s end - def assert_version_nil url + def assert_version_nil(url) assert_nil Version.parse(url) end end @@ -68,7 +68,7 @@ module Homebrew TEST_SHA1 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze TEST_SHA256 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze - def formula(name="formula_name", path=Formulary.core_path(name), spec=:stable, &block) + def formula(name = "formula_name", path = Formulary.core_path(name), spec = :stable, &block) @_f = Class.new(Formula, &block).new(name, path, spec) end @@ -88,7 +88,7 @@ module Homebrew end end - def mktmpdir(prefix_suffix=nil, &block) + def mktmpdir(prefix_suffix = nil, &block) Dir.mktmpdir(prefix_suffix, HOMEBREW_TEMP, &block) end @@ -96,12 +96,12 @@ module Homebrew yield end - def assert_eql(exp, act, msg=nil) + def assert_eql(exp, act, msg = nil) msg = message(msg, "") { diff exp, act } assert exp.eql?(act), msg end - def refute_eql(exp, act, msg=nil) + def refute_eql(exp, act, msg = nil) msg = message(msg) { "Expected #{mu_pp(act)} to not be eql to #{mu_pp(exp)}" } |