KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2026-01-07 01:45:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:github/linguist into chapel-lang

Browse Source 
Conflicts:
	lib/linguist/samples.json
This commit is contained in:
Thomas Van Doren
2014-08-12 11:10:55 -05:00
parent ad4d273241 41c880afc7
commit e03b3e5ec4
15 changed files with 1337 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/test_blob.rb
View File

@@ -192,9 +192,9 @@ class TestBlob < Test::Unit::TestCase
assert !blob("Text/README").generated?
# Xcode project files
assert blob("XML/MainMenu.xib").generated?
assert !blob("XML/MainMenu.xib").generated?
assert blob("Binary/MainMenu.nib").generated?
assert blob("XML/project.pbxproj").generated?
assert !blob("XML/project.pbxproj").generated?
# Gemfile.locks
assert blob("Gemfile.lock").generated?

2
test/test_language.rb
View File

@@ -169,7 +169,7 @@ class TestLanguage < Test::Unit::TestCase
assert_equal 'pot', Language['Gettext Catalog'].search_term
assert_equal 'irc', Language['IRC log'].search_term
assert_equal 'lhs', Language['Literate Haskell'].search_term
assert_equal 'ruby', Language['Mirah'].search_term
assert_equal 'mirah', Language['Mirah'].search_term
assert_equal 'raw', Language['Raw token data'].search_term
assert_equal 'bash', Language['Shell'].search_term
assert_equal 'vim', Language['VimL'].search_term