@@ -5,76 +5,53 @@ import (
55 "path/filepath"
66 "testing"
77
8+ "github.com/stretchr/testify/assert"
89 "github.com/stretchr/testify/require"
910)
1011
1112func TestStashWorktreeError (t * testing.T ) {
1213 _ , err := testrepo .StashList ()
13- if err == nil {
14- t .Errorf ("StashList() error = %v, wantErr %v" , err , true )
15- return
16- }
14+ assert .Errorf (t , err , "StashList() should return an error when not run in a work tree" )
1715}
1816
1917func TestStash (t * testing.T ) {
2018 tmp := t .TempDir ()
2119 path , err := filepath .Abs (repoPath )
22- if err != nil {
23- t .Fatal (err )
24- }
20+ require .NoError (t , err )
2521
26- if err := Clone ("file://" + path , tmp ); err != nil {
27- t .Fatal (err )
28- }
22+ require .NoError (t , Clone ("file://" + path , tmp ))
2923
3024 repo , err := Open (tmp )
31- if err != nil {
32- t .Fatal (err )
33- }
25+ require .NoError (t , err )
3426
35- if err := os .WriteFile (tmp + "/resources/newfile" , []byte ("hello, world!" ), 0o644 ); err != nil {
36- t .Fatal (err )
37- }
27+ err = os .WriteFile (tmp + "/resources/newfile" , []byte ("hello, world!" ), 0o644 )
28+ require .NoError (t , err )
3829
3930 f , err := os .OpenFile (tmp + "/README.txt" , os .O_APPEND | os .O_WRONLY , 0o644 )
40- if err != nil {
41- t .Fatal (err )
42- }
31+ require .NoError (t , err )
4332
44- if _ , err := f .WriteString ("\n \n git-module" ); err != nil {
45- t .Fatal (err )
46- }
33+ _ , err = f .WriteString ("\n \n git-module" )
34+ require .NoError (t , err )
4735
4836 f .Close ()
49- if err := repo .Add (AddOptions {
50- All : true ,
51- }); err != nil {
52- t .Fatal (err )
53- }
37+ err = repo .Add (AddOptions {All : true })
38+ require .NoError (t , err )
5439
55- if err := repo .StashPush ("" ); err != nil {
56- t .Fatal (err )
57- }
40+ err = repo .StashPush ("" )
41+ require .NoError (t , err )
5842
5943 f , err = os .OpenFile (tmp + "/README.txt" , os .O_APPEND | os .O_WRONLY , 0o644 )
60- if err != nil {
61- t .Fatal (err )
62- }
44+ require .NoError (t , err )
6345
64- if _ , err := f .WriteString ("\n \n stash 1" ); err != nil {
65- t .Fatal (err )
66- }
46+ _ , err = f .WriteString ("\n \n stash 1" )
47+ require .NoError (t , err )
6748
6849 f .Close ()
69- if err := repo .Add (AddOptions {
70- All : true ,
71- }); err != nil {
72- t .Fatal (err )
73- }
50+ err = repo .Add (AddOptions {All : true })
51+ require .NoError (t , err )
7452
75- if err := repo .StashPush ("custom message" ); err != nil {
76- t .Fatal (err )
77- }
53+ err = repo .StashPush ("custom message" )
54+ require .NoError (t , err )
7855
7956 want := []* Stash {
8057 {
0 commit comments