MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-10-30 22:54:14 +00:00
Code Issues Releases Wiki Activity

#253: Use a better name for that env var

Browse Source
This commit is contained in:
Pablo Santiago Blum de Aguiar
2016-04-06 23:11:19 -03:00
parent db6053b301
commit cdccf1881e
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/shells/test_fish.py
View File

@@ -19,15 +19,16 @@ class TestFish(object):
return mock return mock
@pytest.fixture @pytest.fixture
def tf_overridden(self, monkeypatch, aliases): def os_environ(self, monkeypatch, key, value):
monkeypatch.setattr('os.environ', {'TF_OVERRIDDEN_ALIASES': aliases}) monkeypatch.setattr('os.environ', {key: value})
@pytest.mark.parametrize('aliases', [ @pytest.mark.parametrize('key, value', [
'cut,git,sed', ('TF_OVERRIDDEN_ALIASES', 'cut,git,sed'), # legacy
'cut, git, sed', ('THEFUCK_OVERRIDDEN_ALIASES', 'cut,git,sed'),
' cut,\tgit,sed\n', ('THEFUCK_OVERRIDDEN_ALIASES', 'cut, git, sed'),
'\ncut,\n\ngit,\tsed\r']) ('THEFUCK_OVERRIDDEN_ALIASES', ' cut,\tgit,sed\n'),
def test_get_overridden_aliases(self, shell, tf_overridden): ('THEFUCK_OVERRIDDEN_ALIASES', '\ncut,\n\ngit,\tsed\r')])
def test_get_overridden_aliases(self, shell, os_environ):
assert shell._get_overridden_aliases() == {'cd', 'cut', 'git', 'grep', assert shell._get_overridden_aliases() == {'cd', 'cut', 'git', 'grep',
'ls', 'man', 'open', 'sed'} 'ls', 'man', 'open', 'sed'}

4
thefuck/shells/fish.py
View File

@@ -7,8 +7,10 @@ from .generic import Generic
class Fish(Generic): class Fish(Generic):
def _get_overridden_aliases(self): def _get_overridden_aliases(self):
overridden = os.environ.get('THEFUCK_OVERRIDDEN_ALIASES',
os.environ.get('TF_OVERRIDDEN_ALIASES', ''))
default = {'cd', 'grep', 'ls', 'man', 'open'} default = {'cd', 'grep', 'ls', 'man', 'open'}
for alias in os.environ.get('TF_OVERRIDDEN_ALIASES', '').split(','): for alias in overridden.split(','):
default.add(alias.strip()) default.add(alias.strip())
return default return default