From c525e3fbefadef76dde6efc5435427a1abcd355d Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Fri, 23 Sep 2016 13:48:24 -0700 Subject: [PATCH 1/3] Ignore default external warnings --- test/test_blob.rb | 22 +++++++++++++++++----- test/test_file_blob.rb | 22 +++++++++++++++++----- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/test/test_blob.rb b/test/test_blob.rb index 3322cc41..a781e466 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -3,15 +3,27 @@ require_relative "./helper" class TestBlob < Minitest::Test include Linguist + def silence_warnings + original_verbosity = $VERBOSE + $VERBOSE = nil + yield + ensure + $VERBOSE = original_verbosity + end + def setup - # git blobs are normally loaded as ASCII-8BIT since they may contain data - # with arbitrary encoding not known ahead of time - @original_external = Encoding.default_external - Encoding.default_external = Encoding.find("ASCII-8BIT") + silence_warnings do + # git blobs are normally loaded as ASCII-8BIT since they may contain data + # with arbitrary encoding not known ahead of time + @original_external = Encoding.default_external + Encoding.default_external = Encoding.find("ASCII-8BIT") + end end def teardown - Encoding.default_external = @original_external + silence_warnings do + Encoding.default_external = @original_external + end end def script_blob(name) diff --git a/test/test_file_blob.rb b/test/test_file_blob.rb index 82f3059c..383b170e 100644 --- a/test/test_file_blob.rb +++ b/test/test_file_blob.rb @@ -3,15 +3,27 @@ require_relative "./helper" class TestFileBlob < Minitest::Test include Linguist + def silence_warnings + original_verbosity = $VERBOSE + $VERBOSE = nil + yield + ensure + $VERBOSE = original_verbosity + end + def setup - # git blobs are normally loaded as ASCII-8BIT since they may contain data - # with arbitrary encoding not known ahead of time - @original_external = Encoding.default_external - Encoding.default_external = Encoding.find("ASCII-8BIT") + silence_warnings do + # git blobs are normally loaded as ASCII-8BIT since they may contain data + # with arbitrary encoding not known ahead of time + @original_external = Encoding.default_external + Encoding.default_external = Encoding.find("ASCII-8BIT") + end end def teardown - Encoding.default_external = @original_external + silence_warnings do + Encoding.default_external = @original_external + end end def script_blob(name) From 152b5ade5ead83462099c3fef2332bebcd55964c Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Fri, 23 Sep 2016 13:50:01 -0700 Subject: [PATCH 2/3] Fix shadowed path warning --- test/test_grammars.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_grammars.rb b/test/test_grammars.rb index bc193b3c..3b03ca81 100644 --- a/test/test_grammars.rb +++ b/test/test_grammars.rb @@ -154,7 +154,7 @@ class TestGrammars < Minitest::Test # Neither Licensee nor our own regex was able to detect the license, let's check the readme files = Dir[File.join(ROOT, submodule, "*")] - if readme = files.find { |path| File.basename(path) =~ /\Areadme\b/i } + if readme = files.find { |file| File.basename(file) =~ /\Areadme\b/i } classify_license(readme) end end From 39ea9be5f8aa96e4dab10567feb26b799a35af0a Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Fri, 23 Sep 2016 13:53:38 -0700 Subject: [PATCH 3/3] Ignore ace mode warning while testing --- lib/linguist/language.rb | 3 ++- test/helper.rb | 8 ++++++++ test/test_blob.rb | 8 -------- test/test_language.rb | 6 ++++-- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb index 85eade29..e823d6cf 100644 --- a/lib/linguist/language.rb +++ b/lib/linguist/language.rb @@ -267,6 +267,7 @@ module Linguist # Returns an Array of Languages. def self.ace_modes warn "This method will be deprecated in a future 5.x release. Every language now has an `ace_mode` set." + warn caller @ace_modes ||= all.select(&:ace_mode).sort_by { |lang| lang.name.downcase } end @@ -306,7 +307,7 @@ module Linguist # Set legacy search term @search_term = attributes[:search_term] || default_alias_name - # Set the language_id + # Set the language_id @language_id = attributes[:language_id] # Set extensions or default to []. diff --git a/test/helper.rb b/test/helper.rb index deb7ef5b..5f7eeb87 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -35,3 +35,11 @@ def sample_blob_memory(name) content = File.read(filepath) Linguist::Blob.new(name, content) end + +def silence_warnings + original_verbosity = $VERBOSE + $VERBOSE = nil + yield +ensure + $VERBOSE = original_verbosity +end diff --git a/test/test_blob.rb b/test/test_blob.rb index a781e466..65b88ba4 100644 --- a/test/test_blob.rb +++ b/test/test_blob.rb @@ -3,14 +3,6 @@ require_relative "./helper" class TestBlob < Minitest::Test include Linguist - def silence_warnings - original_verbosity = $VERBOSE - $VERBOSE = nil - yield - ensure - $VERBOSE = original_verbosity - end - def setup silence_warnings do # git blobs are normally loaded as ASCII-8BIT since they may contain data diff --git a/test/test_language.rb b/test/test_language.rb index fec4e29b..1456fb84 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -345,8 +345,10 @@ class TestLanguage < Minitest::Test end def test_ace_modes - assert Language.ace_modes.include?(Language['Ruby']) - assert Language.ace_modes.include?(Language['FORTRAN']) + silence_warnings do + assert Language.ace_modes.include?(Language['Ruby']) + assert Language.ace_modes.include?(Language['FORTRAN']) + end end def test_codemirror_mode