Merge branch 'master' into 1623-local

Conflicts:
	lib/linguist/heuristics.rb
This commit is contained in:
Arfon Smith
2014-11-02 19:58:50 -06:00
parent 49c2793bf5
commit 9d8ab16a38
20 changed files with 1552 additions and 24 deletions

View File

@@ -77,6 +77,12 @@ class TestHeuristcs < Test::Unit::TestCase
assert_equal Language["IDL"], results.first
end
def test_asc_asciidoc_by_heuristics
languages = ["AGS Script", "AsciiDoc"]
results = Heuristics.disambiguate_asc(fixture("AsciiDoc/list.asc"), languages)
assert_equal Language["AsciiDoc"], results.first
end
def test_ts_typescript_by_heuristics
languages = ["TypeScript", "XML"]
results = Heuristics.disambiguate_ts(fixture("TypeScript/classes.ts"), languages)

View File

@@ -16,11 +16,11 @@ class TestSamples < Test::Unit::TestCase
warn "Samples database is out of date. Run `bundle exec rake samples`."
expected = Tempfile.new('expected.json')
expected.write Yajl::Encoder.encode(serialized, :pretty => true)
expected.write Yajl.dump(serialized, :pretty => true)
expected.close
actual = Tempfile.new('actual.json')
actual.write Yajl::Encoder.encode(latest, :pretty => true)
actual.write Yajl.dump(latest, :pretty => true)
actual.close
expected.unlink