Skip to content
This repository was archived by the owner on Feb 16, 2023. It is now read-only.

Commit dd3fe4d

Browse files
Marton6Marton6
committed
Fix improper assertion of parameters
1 parent 3d1b9d9 commit dd3fe4d

9 files changed

Lines changed: 54 additions & 17 deletions

‎internals/secrethub/acl_check_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ func TestACLCheckCommand_Run(t *testing.T) {
109109
tc.cmd.io = io
110110

111111
lister := tc.lister
112-
112+
var argPath string
113113
tc.cmd.newClient = func() (secrethub.ClientInterface, error) {
114114
return fakeclient.Client{
115115
AccessRuleService: &fakeclient.AccessRuleService{
116116
ListLevelsFunc: func(path string) ([]*api.AccessLevel, error) {
117-
assert.Equal(t, path, tc.listerArgPath)
117+
argPath = path
118118
return lister(path)
119119
},
120120
},
@@ -127,6 +127,7 @@ func TestACLCheckCommand_Run(t *testing.T) {
127127
// Assert
128128
assert.Equal(t, err, tc.err)
129129
assert.Equal(t, io.StdOut.String(), tc.out)
130+
assert.Equal(t, argPath, tc.listerArgPath)
130131
})
131132
}
132133
}

‎internals/secrethub/acl_rm_test.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,14 @@ func TestACLRmCommand_Run(t *testing.T) {
9191
io.PromptErr = tc.promptErr
9292
tc.cmd.io = io
9393

94+
var argPath string
95+
var argAccountName string
9496
tc.cmd.newClient = func() (secrethub.ClientInterface, error) {
9597
return fakeclient.Client{
9698
AccessRuleService: &fakeclient.AccessRuleService{
9799
DeleteFunc: func(path string, accountName string) error {
98-
assert.Equal(t, path, tc.argPath)
99-
assert.Equal(t, accountName, tc.argAccountName)
100+
argPath = path
101+
argAccountName = accountName
100102
return tc.deleteErr
101103
},
102104
},
@@ -110,6 +112,8 @@ func TestACLRmCommand_Run(t *testing.T) {
110112
assert.Equal(t, err, tc.err)
111113
assert.Equal(t, io.StdOut.String(), tc.out)
112114
assert.Equal(t, io.PromptOut.String(), tc.promptOut)
115+
assert.Equal(t, argPath, tc.argPath)
116+
assert.Equal(t, argAccountName, tc.argAccountName)
113117
})
114118
}
115119
}

‎internals/secrethub/generate_test.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,16 @@ func TestGenerateSecretCommand_run(t *testing.T) {
168168

169169
for name, tc := range cases {
170170
t.Run(name, func(t *testing.T) {
171+
var argPath string
172+
var argData []byte
173+
171174
// Setup
172175
tc.cmd.newClient = func() (secrethub.ClientInterface, error) {
173176
return fakeclient.Client{
174177
SecretService: &fakeclient.SecretService{
175178
WriteFunc: func(path string, data []byte) (*api.SecretVersion, error) {
176-
assert.Equal(t, path, tc.path)
177-
assert.Equal(t, data, tc.data)
179+
argPath = path
180+
argData = data
178181
return tc.writeFunc(path, data)
179182
},
180183
},
@@ -189,6 +192,8 @@ func TestGenerateSecretCommand_run(t *testing.T) {
189192

190193
// Assert
191194
assert.Equal(t, err, tc.err)
195+
assert.Equal(t, argPath, tc.path)
196+
assert.Equal(t, argData, tc.data)
192197
assert.Equal(t, io.StdOut.String(), tc.out)
193198
})
194199
}

‎internals/secrethub/org_list_users_test.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,15 @@ func TestOrgListUsersCommand_run(t *testing.T) {
6868

6969
for name, tc := range cases {
7070
t.Run(name, func(t *testing.T) {
71+
var argOrg string
72+
7173
// Setup
7274
tc.cmd.newClient = func() (secrethub.ClientInterface, error) {
7375
return fakeclient.Client{
7476
OrgService: &fakeclient.OrgService{
7577
MembersService: &fakeclient.OrgMemberService{
7678
ListFunc: func(org string) ([]*api.OrgMember, error) {
77-
assert.Equal(t, org, tc.ArgListOrgMember)
79+
argOrg = org
7880
return tc.listFunc(org)
7981
},
8082
},
@@ -91,6 +93,7 @@ func TestOrgListUsersCommand_run(t *testing.T) {
9193
// Assert
9294
assert.Equal(t, err, tc.err)
9395
assert.Equal(t, io.StdOut.String(), tc.out)
96+
assert.Equal(t, argOrg, tc.ArgListOrgMember)
9497
})
9598
}
9699
}

‎internals/secrethub/org_rm_test.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,14 @@ func TestOrgRmCommand_Run(t *testing.T) {
8282

8383
for name, tc := range cases {
8484
t.Run(name, func(t *testing.T) {
85+
var argName string
86+
8587
// Setup
8688
tc.cmd.newClient = func() (secrethub.ClientInterface, error) {
8789
return fakeclient.Client{
8890
OrgService: &fakeclient.OrgService{
8991
DeleteFunc: func(name string) error {
90-
assert.Equal(t, name, tc.argName)
92+
argName = name
9193
return tc.deleteFunc(name)
9294
}},
9395
}, tc.newClientErr
@@ -104,6 +106,7 @@ func TestOrgRmCommand_Run(t *testing.T) {
104106
// Assert
105107
assert.Equal(t, err, tc.err)
106108
assert.Equal(t, io.PromptOut.String(), tc.promptOut)
109+
assert.Equal(t, argName, tc.argName)
107110
assert.Equal(t, io.StdOut.String(), tc.out)
108111
})
109112
}

‎internals/secrethub/org_set_role_test.go‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,19 @@ func TestOrgSetRoleCommand_Run(t *testing.T) {
6060

6161
for name, tc := range cases {
6262
t.Run(name, func(t *testing.T) {
63+
var argOrgName string
64+
var argUsername string
65+
var argRole string
66+
6367
// Setup
6468
tc.cmd.newClient = func() (secrethub.ClientInterface, error) {
6569
return fakeclient.Client{
6670
OrgService: &fakeclient.OrgService{
6771
MembersService: &fakeclient.OrgMemberService{
6872
UpdateFunc: func(org string, username string, role string) (*api.OrgMember, error) {
69-
assert.Equal(t, org, tc.ArgOrgName)
70-
assert.Equal(t, username, tc.ArgUsername)
71-
assert.Equal(t, role, tc.ArgRole)
73+
argOrgName = org
74+
argUsername = username
75+
argRole = role
7276
return tc.updateFunc(org, username, role)
7377
},
7478
},
@@ -85,6 +89,9 @@ func TestOrgSetRoleCommand_Run(t *testing.T) {
8589
// Assert
8690
assert.Equal(t, err, tc.err)
8791
assert.Equal(t, io.StdOut.String(), tc.out)
92+
assert.Equal(t, argOrgName, tc.ArgOrgName)
93+
assert.Equal(t, argUsername, tc.ArgUsername)
94+
assert.Equal(t, argRole, tc.ArgRole)
8895
})
8996
}
9097
}

‎internals/secrethub/repo_init_test.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ func TestRepoInitCommand_Run(t *testing.T) {
4848

4949
for name, tc := range cases {
5050
t.Run(name, func(t *testing.T) {
51+
var argPath string
52+
5153
// Setup
5254
cmd := RepoInitCommand{
5355
path: tc.path,
@@ -62,7 +64,7 @@ func TestRepoInitCommand_Run(t *testing.T) {
6264
return fakeclient.Client{
6365
RepoService: &fakeclient.RepoService{
6466
CreateFunc: func(path string) (*api.Repo, error) {
65-
assert.Equal(t, path, tc.argPath)
67+
argPath = path
6668
return tc.createFunc(path)
6769
},
6870
},
@@ -79,6 +81,7 @@ func TestRepoInitCommand_Run(t *testing.T) {
7981
// Assert
8082
assert.Equal(t, err, tc.err)
8183
assert.Equal(t, io.StdOut.String(), tc.out)
84+
assert.Equal(t, argPath, tc.argPath)
8285
})
8386
}
8487
}

‎internals/secrethub/repo_invite_test.go‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ func TestRepoInviteCommand_Run(t *testing.T) {
6868

6969
for name, tc := range cases {
7070
t.Run(name, func(t *testing.T) {
71+
var argInviteUsername string
72+
var argGetUsername string
73+
var argPath string
74+
7175
// Setup
7276
if tc.newClientErr != nil {
7377
tc.cmd.newClient = func() (secrethub.ClientInterface, error) {
@@ -79,15 +83,15 @@ func TestRepoInviteCommand_Run(t *testing.T) {
7983
RepoService: &fakeclient.RepoService{
8084
UserService: &fakeclient.RepoUserService{
8185
InviteFunc: func(path string, username string) (*api.RepoMember, error) {
82-
assert.Equal(t, username, tc.inviteArgUsername)
83-
assert.Equal(t, path, tc.inviteArgPath)
86+
argPath = path
87+
argInviteUsername = username
8488
return tc.InviteFunc(path, username)
8589
},
8690
},
8791
},
8892
UserService: &fakeclient.UserService{
8993
GetFunc: func(username string) (*api.User, error) {
90-
assert.Equal(t, username, tc.getArgUsername)
94+
argGetUsername = username
9195
return tc.GetFunc(username)
9296
},
9397
},
@@ -104,6 +108,9 @@ func TestRepoInviteCommand_Run(t *testing.T) {
104108
// Assert
105109
assert.Equal(t, err, tc.err)
106110
assert.Equal(t, io.StdOut.String(), tc.out)
111+
assert.Equal(t, argGetUsername, tc.getArgUsername)
112+
assert.Equal(t, argInviteUsername, tc.inviteArgUsername)
113+
assert.Equal(t, argPath, tc.inviteArgPath)
107114
})
108115
}
109116
}

‎internals/secrethub/write_test.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,15 @@ func TestWriteCommand_Run(t *testing.T) {
185185

186186
for name, tc := range cases {
187187
t.Run(name, func(t *testing.T) {
188+
var argPath string
189+
var argData []byte
188190
// Setup
189191
tc.cmd.newClient = func() (secrethub.ClientInterface, error) {
190192
return fakeclient.Client{
191193
SecretService: &fakeclient.SecretService{
192194
WriteFunc: func(path string, data []byte) (*api.SecretVersion, error) {
193-
assert.Equal(t, path, tc.path)
194-
assert.Equal(t, data, tc.data)
195+
argPath = path
196+
argData = data
195197
return tc.writeFunc(path, data)
196198
},
197199
},
@@ -212,6 +214,8 @@ func TestWriteCommand_Run(t *testing.T) {
212214

213215
// Assert
214216
assert.Equal(t, err, tc.err)
217+
assert.Equal(t, argPath, tc.path)
218+
assert.Equal(t, argData, tc.data)
215219
assert.Equal(t, io.PromptOut.String(), tc.promptOut)
216220
assert.Equal(t, io.StdOut.String(), tc.out)
217221
})

0 commit comments

Comments
 (0)