2016-12-11 12:37:09 -05:00
|
|
|
import pytest
|
|
|
|
from thefuck.rules.git_stash_pop import match, get_new_command
|
|
|
|
from tests.utils import Command
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.fixture
|
|
|
|
def stderr():
|
|
|
|
return '''error: Your local changes to the following files would be overwritten by merge:'''
|
|
|
|
|
|
|
|
|
|
|
|
def test_match(stderr):
|
|
|
|
assert match(Command('git stash pop', stderr=stderr))
|
|
|
|
assert not match(Command('git stash'))
|
|
|
|
|
|
|
|
|
|
|
|
def test_get_new_command(stderr):
|
2017-03-08 12:39:24 -05:00
|
|
|
assert (get_new_command(Command('git stash pop', stderr=stderr))
|
2017-03-21 20:12:15 -04:00
|
|
|
== "git add --update && git stash pop && git reset .")
|