lavatech/rana-cli
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Support language argument for non file types

Browse source
This commit is contained in:
Alan Hamlett 2018-12-05 21:32:53 -08:00
parent 1d2318a937
commit ae834f679f
3 changed files with 54 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

37
tests/test_languages.py
View file

@ -25,14 +25,15 @@ class LanguagesTestCase(utils.TestCase):
['wakatime.session_cache.SessionCache.connect', None],
]
def shared(self, expected_language='', entity='', extra_args=[]):
def shared(self, expected_language='', entity='', entity_type='file', extra_args=[]):
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].return_value = CustomResponse()
config = 'tests/samples/configs/good_config.cfg'
entity = os.path.join('tests/samples/codefiles', entity)
if entity_type == 'file':
entity = os.path.join('tests/samples/codefiles', entity)
now = u(int(time.time()))
args = ['--file', entity, '--config', config, '--time', now] + extra_args
args = ['--entity', entity, '--config', config, '--time', now] + extra_args
retval = execute(args)
self.assertEquals(retval, SUCCESS)
@ -41,12 +42,12 @@ class LanguagesTestCase(utils.TestCase):
heartbeat = {
'language': expected_language,
'lines': ANY,
'entity': os.path.realpath(entity),
'entity': os.path.realpath(entity) if entity_type == 'file' else entity,
'project': ANY,
'branch': ANY,
'dependencies': ANY,
'time': float(now),
'type': 'file',
'type': entity_type,
'is_write': False,
'user_agent': ANY,
}
@ -124,7 +125,7 @@ class LanguagesTestCase(utils.TestCase):
self.shared(
expected_language='Java',
entity='python.py',
extra_args=['--language', 'JAVA']
extra_args=['--language', 'JAVA'],
)
def test_language_arg_is_used_when_not_guessed(self):
@ -137,6 +138,30 @@ class LanguagesTestCase(utils.TestCase):
extra_args=['--language', 'JAVA']
)
def test_language_defaults_to_none_for_entity_type_app(self):
self.shared(
expected_language=None,
entity='not-a-file',
entity_type='domain',
extra_args=['--entity-type', 'domain'],
)
def test_language_arg_used_for_entity_type_app(self):
self.shared(
expected_language='Java',
entity='not-a-file',
entity_type='app',
extra_args=['--entity-type', 'app', '--language', 'JAVA'],
)
def test_language_arg_used_for_entity_type_domain(self):
self.shared(
expected_language='Java',
entity='not-a-file',
entity_type='domain',
extra_args=['--entity-type', 'domain', '--language', 'JAVA'],
)
def test_vim_language_arg_is_used_when_not_guessed(self):
with utils.mock.patch('wakatime.stats.smart_guess_lexer') as mock_guess_lexer:
mock_guess_lexer.return_value = None

2
tests/test_offlinequeue.py
View file

@ -724,7 +724,7 @@ class OfflineQueueTestCase(TestCase):
args = ['--file', entity, '--key', key, '--config', config, '--time', now]
with mock.patch('wakatime.stats.standardize_language') as mock_language:
mock_language.return_value = (language, None)
mock_language.return_value = language
with mock.patch('wakatime.heartbeat.get_project_info') as mock_project:
mock_project.return_value = (project, branch)