diff options
| author | Michael Muré <batolettre@gmail.com> | 2018-09-07 17:10:40 +0200 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2018-09-07 17:10:40 +0200 |
| commit | 61a1173ec3f202b9dc71236205de785e2a454791 (patch) | |
| tree | 80b9661b1da37baacd324f32421d7fa6fc18e3ff /tests | |
| parent | 265ecd81d22c39cc6daccd938a1d41c5ffab23ad (diff) | |
| download | git-bug-61a1173ec3f202b9dc71236205de785e2a454791.tar.gz | |
bug: refactor the Pull code to have the message formating in the upper layers
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bug_actions_test.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/bug_actions_test.go b/tests/bug_actions_test.go index 64f9aa97..afd6e4b4 100644 --- a/tests/bug_actions_test.go +++ b/tests/bug_actions_test.go @@ -80,7 +80,7 @@ func TestPushPull(t *testing.T) { _, err = bug.Push(repoA, "origin") checkErr(t, err) - err = bug.Pull(repoB, nil, "origin") + err = bug.Pull(repoB, "origin") checkErr(t, err) bugs := allBugs(t, bug.ReadAllLocalBugs(repoB)) @@ -98,7 +98,7 @@ func TestPushPull(t *testing.T) { _, err = bug.Push(repoB, "origin") checkErr(t, err) - err = bug.Pull(repoA, nil, "origin") + err = bug.Pull(repoA, "origin") checkErr(t, err) bugs = allBugs(t, bug.ReadAllLocalBugs(repoA)) @@ -149,7 +149,7 @@ func _RebaseTheirs(t testing.TB) { checkErr(t, err) // remote --> B - err = bug.Pull(repoB, nil, "origin") + err = bug.Pull(repoB, "origin") checkErr(t, err) bug2, err := bug.ReadLocalBug(repoB, bug1.Id()) @@ -166,7 +166,7 @@ func _RebaseTheirs(t testing.TB) { checkErr(t, err) // remote --> A - err = bug.Pull(repoA, nil, "origin") + err = bug.Pull(repoA, "origin") checkErr(t, err) bugs := allBugs(t, bug.ReadAllLocalBugs(repoB)) @@ -207,7 +207,7 @@ func _RebaseOurs(t testing.TB) { checkErr(t, err) // remote --> B - err = bug.Pull(repoB, nil, "origin") + err = bug.Pull(repoB, "origin") checkErr(t, err) operations.Comment(bug1, rene, "message2") @@ -229,7 +229,7 @@ func _RebaseOurs(t testing.TB) { checkErr(t, err) // remote --> A - err = bug.Pull(repoA, nil, "origin") + err = bug.Pull(repoA, "origin") checkErr(t, err) bugs := allBugs(t, bug.ReadAllLocalBugs(repoA)) @@ -279,7 +279,7 @@ func _RebaseConflict(t testing.TB) { checkErr(t, err) // remote --> B - err = bug.Pull(repoB, nil, "origin") + err = bug.Pull(repoB, "origin") checkErr(t, err) operations.Comment(bug1, rene, "message2") @@ -326,7 +326,7 @@ func _RebaseConflict(t testing.TB) { checkErr(t, err) // remote --> B - err = bug.Pull(repoB, nil, "origin") + err = bug.Pull(repoB, "origin") checkErr(t, err) bugs := allBugs(t, bug.ReadAllLocalBugs(repoB)) @@ -347,7 +347,7 @@ func _RebaseConflict(t testing.TB) { checkErr(t, err) // remote --> A - err = bug.Pull(repoA, nil, "origin") + err = bug.Pull(repoA, "origin") checkErr(t, err) bugs = allBugs(t, bug.ReadAllLocalBugs(repoA)) |