From 2c78dd2c66bef6da17d1f0beb59a394037f66477 Mon Sep 17 00:00:00 2001 From: Brandon Black Date: Wed, 7 Dec 2016 11:39:49 -0800 Subject: [PATCH] Bumping to v4.8.18 (#3370) * make tests great again :sparkles: * version bump * removing empty line in gemspec --- github-linguist.gemspec | 1 - lib/linguist/version.rb | 2 +- test/test_language.rb | 6 +++--- test/test_modelines.rb | 6 +++++- test/test_shebang.rb | 6 +++++- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/github-linguist.gemspec b/github-linguist.gemspec index f9f6ccc6..69152aa4 100644 --- a/github-linguist.gemspec +++ b/github-linguist.gemspec @@ -27,5 +27,4 @@ Gem::Specification.new do |s| s.add_development_dependency 'color-proximity', '~> 0.2.1' s.add_development_dependency 'licensed' s.add_development_dependency 'licensee', '>= 8.6.0' - end diff --git a/lib/linguist/version.rb b/lib/linguist/version.rb index 3540174f..6e7db910 100644 --- a/lib/linguist/version.rb +++ b/lib/linguist/version.rb @@ -1,3 +1,3 @@ module Linguist - VERSION = "4.8.17" + VERSION = "4.8.18" end diff --git a/test/test_language.rb b/test/test_language.rb index a82040e2..ca01d0cd 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -297,9 +297,9 @@ class TestLanguage < Minitest::Test end def test_doesnt_blow_up_with_blank_lookup - assert_equal nil, Language.find_by_alias('') - assert_equal nil, Language.find_by_name(nil) - assert_equal nil, Language[""] + assert_nil Language.find_by_alias('') + assert_nil Language.find_by_name(nil) + assert_nil Language[""] end def test_name diff --git a/test/test_modelines.rb b/test/test_modelines.rb index aac84ada..17b953e2 100644 --- a/test/test_modelines.rb +++ b/test/test_modelines.rb @@ -4,7 +4,11 @@ class TestModelines < Minitest::Test include Linguist def assert_modeline(language, blob) - assert_equal language, Linguist::Strategy::Modeline.call(blob).first + if language.nil? + assert_nil Linguist::Strategy::Modeline.call(blob).first + else + assert_equal language, Linguist::Strategy::Modeline.call(blob).first + end end def test_modeline_strategy diff --git a/test/test_shebang.rb b/test/test_shebang.rb index de3344ec..e9e93d82 100644 --- a/test/test_shebang.rb +++ b/test/test_shebang.rb @@ -4,7 +4,11 @@ class TestShebang < Minitest::Test include Linguist def assert_interpreter(interpreter, body) - assert_equal interpreter, Shebang.interpreter(body) + if interpreter.nil? + assert_nil Shebang.interpreter(body) + else + assert_equal interpreter, Shebang.interpreter(body) + end end def test_shebangs