Skip to content

test: mock context in TableTestCommand.ExpectedAsserts #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mwbrooks merged 10 commits into from
Apr 10, 2025
Merged

test: mock context in TableTestCommand.ExpectedAsserts #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4add4cc
refactor: Add slackcontext package to DRY context management
mwbrooks Apr 2, 2025
6c8907a
refactor: Revert changes to unrelated error codes
mwbrooks Apr 2, 2025
f7b9014
test: mock context in TableTestCommand
mwbrooks Apr 7, 2025
b8f68e9
test: mock context in TableTestCommand ExpectedAsserts
mwbrooks Apr 8, 2025
9c816be
test: use ctx in mocked ExpectedAsserts
mwbrooks Apr 8, 2025
5f69d23
test: use ctx in mocked ExpectedAsserts to link_test.go
mwbrooks Apr 8, 2025
c4b7697
test: use ctx in mocked ExpectedAsserts to update_test.go
mwbrooks Apr 8, 2025
ad91292
test: update context references for .Setup
mwbrooks Apr 8, 2025
8b92a2a
Merge branch 'main' into mbrooks-slackcontext-tabletestcommand-expect…
mwbrooks Apr 9, 2025
d0aa8ef
Merge branch 'main' into mbrooks-slackcontext-tabletestcommand-expect…
mwbrooks Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/app/add_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ func TestAppAddCommand(t *testing.T) {
mockProjectConfig.On("Cache").Return(mockProjectCache)
cm.Config.ProjectConfig = mockProjectConfig
},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
Copy link
Member Author

@mwbrooks mwbrooks Apr 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: Every reference to ExpectedAsserts: func(...) had to be updated to include ctx. 🔁

Copy link
Member

@zimeg zimeg Apr 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another tedious change - thanks for rolling up the sleeves - but this matches actual command execution so much better 🙏 ✨

cm.ApiInterface.AssertCalled(t, "DeveloperAppInstall", mock.Anything, mock.Anything, mockOrgAuth.Token, mock.Anything, mock.Anything, mock.Anything, "T123", mock.Anything)
},
},
Expand Down
4 changes: 2 additions & 2 deletions cmd/app/delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func TestAppsDeleteCommand(t *testing.T) {
appClientMock.On("Remove", mock.Anything, mock.Anything).Return(fakeDeployedApp, nil)
cf.AppClient().AppClientInterface = appClientMock
},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
cm.ApiInterface.AssertCalled(t, "DeleteApp", mock.Anything, mock.Anything, fakeDeployedApp.AppID)
},
ExpectedStdoutOutputs: []string{
Expand Down Expand Up @@ -107,7 +107,7 @@ func TestAppsDeleteCommand(t *testing.T) {
appClientMock.On("Remove", mock.Anything, mock.Anything).Return(fakeLocalApp, nil)
cf.AppClient().AppClientInterface = appClientMock
},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
cm.ApiInterface.AssertCalled(t, "DeleteApp", mock.Anything, mock.Anything, fakeLocalApp.AppID)
},
ExpectedStdoutOutputs: []string{
Expand Down
30 changes: 14 additions & 16 deletions cmd/app/link_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ func Test_Apps_Link(t *testing.T) {
).Return(api.GetAppStatusResult{}, nil)
},
CmdArgs: []string{},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
expectedApp := types.App{
AppID: mockLinkAppID1,
TeamDomain: mockLinkSlackAuth1.TeamDomain,
TeamID: mockLinkSlackAuth1.TeamID,
EnterpriseID: mockLinkSlackAuth1.EnterpriseID,
}
actualApp, err := cm.AppClient.GetDeployed(
context.Background(),
ctx,
Copy link
Member Author

@mwbrooks mwbrooks Apr 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: The main motivation of this PR is to replace context.Background() references with the mocked context ctx. Here's one example.

Copy link
Member

@zimeg zimeg Apr 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replacing these instances with the shared mock ctx IMO is a huge win for all of our tests 😭

mockLinkSlackAuth1.TeamID,
)
require.NoError(t, err)
Expand Down Expand Up @@ -153,7 +153,7 @@ func Test_Apps_Link(t *testing.T) {
).Return(api.GetAppStatusResult{}, nil)
},
CmdArgs: []string{},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
expectedApp := types.App{
AppID: mockLinkAppID2,
TeamDomain: mockLinkSlackAuth2.TeamDomain,
Expand All @@ -162,7 +162,7 @@ func Test_Apps_Link(t *testing.T) {
UserID: mockLinkSlackAuth2.UserID,
}
actualApp, err := cm.AppClient.GetLocal(
context.Background(),
ctx,
mockLinkSlackAuth2.TeamID,
)
require.NoError(t, err)
Expand Down Expand Up @@ -220,15 +220,15 @@ func Test_Apps_Link(t *testing.T) {
).Return(api.GetAppStatusResult{}, nil)
},
CmdArgs: []string{},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
expectedApp := types.App{
AppID: mockLinkAppID1,
TeamDomain: mockLinkSlackAuth1.TeamDomain,
TeamID: mockLinkSlackAuth1.TeamID,
EnterpriseID: mockLinkSlackAuth1.EnterpriseID,
}
actualApp, err := cm.AppClient.GetDeployed(
context.Background(),
ctx,
mockLinkSlackAuth1.TeamID,
)
require.NoError(t, err)
Expand Down Expand Up @@ -289,21 +289,21 @@ func Test_Apps_Link(t *testing.T) {
).Return(api.GetAppStatusResult{}, nil)
},
CmdArgs: []string{},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
expectedApp := types.App{
AppID: mockLinkAppID1,
TeamDomain: mockLinkSlackAuth1.TeamDomain,
TeamID: mockLinkSlackAuth1.TeamID,
EnterpriseID: mockLinkSlackAuth1.EnterpriseID,
}
actualApp, err := cm.AppClient.GetDeployed(
context.Background(),
ctx,
mockLinkSlackAuth1.TeamID,
)
require.NoError(t, err)
assert.Equal(t, expectedApp, actualApp)
unsavedApp, err := cm.AppClient.GetLocal(
context.Background(),
ctx,
mockLinkSlackAuth1.TeamID,
)
require.NoError(t, err)
Expand Down Expand Up @@ -365,7 +365,7 @@ func Test_Apps_Link(t *testing.T) {
).Return(api.GetAppStatusResult{}, nil)
},
CmdArgs: []string{"--force"},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
expectedApp := types.App{
AppID: mockLinkAppID1,
TeamDomain: mockLinkSlackAuth2.TeamDomain,
Expand All @@ -374,7 +374,7 @@ func Test_Apps_Link(t *testing.T) {
UserID: mockLinkSlackAuth2.UserID,
}
actualApp, err := cm.AppClient.GetLocal(
context.Background(),
ctx,
mockLinkSlackAuth2.TeamID,
)
require.NoError(t, err)
Expand Down Expand Up @@ -481,15 +481,15 @@ func Test_Apps_Link(t *testing.T) {
).Return(api.GetAppStatusResult{}, nil)
},
CmdArgs: []string{},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
expectedApp := types.App{
AppID: mockLinkAppID1,
TeamDomain: mockLinkSlackAuth1.TeamDomain,
TeamID: mockLinkSlackAuth1.TeamID,
EnterpriseID: mockLinkSlackAuth1.EnterpriseID,
}
actualApp, err := cm.AppClient.GetDeployed(
context.Background(),
ctx,
mockLinkSlackAuth1.TeamID,
)
require.NoError(t, err)
Expand Down Expand Up @@ -518,9 +518,7 @@ func Test_Apps_Link(t *testing.T) {
).Return(false, nil)
},
CmdArgs: []string{},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ctx := t.Context()

ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
// Assert manifest confirmation prompt accepted
cm.IO.AssertCalled(t, "ConfirmPrompt",
mock.Anything,
Expand Down
2 changes: 1 addition & 1 deletion cmd/auth/login_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func TestLoginCommmand(t *testing.T) {
nil,
)
},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
cm.ApiInterface.AssertCalled(t, "ExchangeAuthTicket", mock.Anything, mock.Anything, mockChallengeCode, mock.Anything)
},
},
Expand Down
20 changes: 10 additions & 10 deletions cmd/auth/logout_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func TestLogoutCommand(t *testing.T) {
clientsMock.AuthInterface.On("DeleteAuth", mock.Anything, fakeAuthsByTeamSlice[1]).Return(types.SlackAuth{}, nil)
},
ExpectedOutputs: []string{"Authorization successfully revoked for all teams"},
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, fakeAuthsByTeamSlice[0].Token)
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, fakeAuthsByTeamSlice[0].RefreshToken)
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, fakeAuthsByTeamSlice[1].Token)
Expand All @@ -74,7 +74,7 @@ func TestLogoutCommand(t *testing.T) {
clientsMock.AuthInterface.On("DeleteAuth", mock.Anything, fakeAuthsByTeamSlice[0]).Return(types.SlackAuth{}, nil)
},
ExpectedOutputs: []string{"Authorization successfully revoked for team1"},
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, fakeAuthsByTeamSlice[0].Token)
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, fakeAuthsByTeamSlice[0].RefreshToken)
clients.AuthInterface.AssertCalled(t, "DeleteAuth", mock.Anything, fakeAuthsByTeamSlice[0])
Expand All @@ -98,7 +98,7 @@ func TestLogoutCommand(t *testing.T) {
clientsMock.AuthInterface.On("DeleteAuth", mock.Anything, fakeAuthsByTeamSlice[1]).Return(types.SlackAuth{}, nil)
},
ExpectedOutputs: []string{"Authorization successfully revoked for team2"},
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, fakeAuthsByTeamSlice[1].Token)
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, fakeAuthsByTeamSlice[1].RefreshToken)
clients.AuthInterface.AssertCalled(t, "DeleteAuth", mock.Anything, fakeAuthsByTeamSlice[1])
Expand All @@ -108,7 +108,7 @@ func TestLogoutCommand(t *testing.T) {
"require a team value with the flag": {
CmdArgs: []string{"--team", ""},
ExpectedErrorStrings: []string{"The argument is missing from the --team flag (missing_flag)"},
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertNotCalled(t, "RevokeToken")
clients.IO.AssertNotCalled(t, "SelectPrompt", mock.Anything, "Select an workspace authorization to revoke", mock.Anything, mock.Anything)
},
Expand All @@ -125,7 +125,7 @@ func TestLogoutCommand(t *testing.T) {
}, nil)
},
ExpectedErrorStrings: []string{"invalid_auth", "Cannot revoke authentication tokens for 'randomteamdomain'"},
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertNotCalled(t, "RevokeToken")
clients.IO.AssertCalled(t, "SelectPrompt", mock.Anything, "Select an authorization to revoke", mock.Anything, mock.Anything)
},
Expand All @@ -151,7 +151,7 @@ func TestLogoutCommand(t *testing.T) {
clientsMock.AuthInterface.On("DeleteAuth", mock.Anything, fakeAuthsByTeamSlice[1]).Return(types.SlackAuth{}, nil)
},
ExpectedOutputs: []string{"Authorization successfully revoked for team2"},
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, fakeAuthsByTeamSlice[1].Token)
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, fakeAuthsByTeamSlice[1].RefreshToken)
clients.AuthInterface.AssertCalled(t, "DeleteAuth", mock.Anything, fakeAuthsByTeamSlice[1])
Expand All @@ -171,7 +171,7 @@ func TestLogoutCommand(t *testing.T) {
clientsMock.AuthInterface.On("DeleteAuth", mock.Anything, fakeAuthsByTeamSlice[0]).Return(types.SlackAuth{}, nil)
},
ExpectedOutputs: []string{"Authorization successfully revoked for team1"},
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, fakeAuthsByTeamSlice[0].Token)
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, fakeAuthsByTeamSlice[0].RefreshToken)
clients.AuthInterface.AssertCalled(t, "DeleteAuth", mock.Anything, fakeAuthsByTeamSlice[0])
Expand All @@ -192,7 +192,7 @@ func TestLogoutCommand(t *testing.T) {
}, nil)
},
ExpectedErrorStrings: []string{"invalid_auth", "Cannot revoke authentication tokens for 'anotherteam'"},
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertNotCalled(t, "RevokeToken")
clients.IO.AssertCalled(t, "SelectPrompt", mock.Anything, "Select an authorization to revoke", mock.Anything, mock.Anything)
},
Expand All @@ -203,7 +203,7 @@ func TestLogoutCommand(t *testing.T) {
clientsMock.AuthInterface.On("Auths", mock.Anything).Return([]types.SlackAuth{}, nil)
},
ExpectedOutputs: []string{"All authorizations successfully revoked"},
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertNotCalled(t, "RevokeToken")
clients.IO.AssertNotCalled(t, "SelectPrompt", mock.Anything, "Select an authorization to revoke", mock.Anything, mock.Anything)
},
Expand All @@ -219,7 +219,7 @@ func TestLogoutCommand(t *testing.T) {
Option: "someteam",
}, nil)
},
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertNotCalled(t, "RevokeToken")
clients.IO.AssertCalled(t, "SelectPrompt", mock.Anything, "Select an authorization to revoke", mock.Anything, mock.Anything)
},
Expand Down
8 changes: 4 additions & 4 deletions cmd/auth/revoke_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestRevokeCommand(t *testing.T) {
clientsMock.AuthInterface.On("RevokeToken", mock.Anything, "xoxp-example-1234").Return(nil)
},
ExpectedOutputs: []string{"Authorization successfully revoked"},
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, "xoxp-example-1234")
},
},
Expand All @@ -53,7 +53,7 @@ func TestRevokeCommand(t *testing.T) {
})).Return(iostreams.PasswordPromptResponse{}, slackerror.New(slackerror.ErrMissingFlag))
},
ExpectedErrorStrings: []string{"Failed to collect a token to revoke", "no_token_found", "missing_flag"},
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertNotCalled(t, "RevokeToken")
},
},
Expand All @@ -69,7 +69,7 @@ func TestRevokeCommand(t *testing.T) {
clientsMock.AuthInterface.On("RevokeToken", mock.Anything, "xoxp-example-1234").Return(nil)
},
ExpectedOutputs: []string{"Authorization successfully revoked"},
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, "xoxp-example-1234")
},
},
Expand All @@ -85,7 +85,7 @@ func TestRevokeCommand(t *testing.T) {
clientsMock.AuthInterface.On("RevokeToken", mock.Anything, "xoxp-example-1234").Return(slackerror.New(slackerror.ErrNotAuthed))
},
ExpectedError: slackerror.New(slackerror.ErrNotAuthed),
ExpectedAsserts: func(t *testing.T, clients *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, clients *shared.ClientsMock) {
clients.AuthInterface.AssertCalled(t, "RevokeToken", mock.Anything, "xoxp-example-1234")
clients.IO.AssertNotCalled(t, "PrintTrace", mock.Anything, slacktrace.AuthRevokeSuccess)
},
Expand Down
10 changes: 5 additions & 5 deletions cmd/collaborators/add_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ func TestAddCommand(t *testing.T) {
appSelectMock.On("TeamAppSelectPrompt").Return(prompts.SelectedApp{App: types.App{AppID: "A123"}, Auth: types.SlackAuth{}}, nil)
// Set experiment flag
cm.Config.ExperimentsFlag = append(cm.Config.ExperimentsFlag, "read-only-collaborators")
cm.Config.LoadExperiments(context.Background(), cm.IO.PrintDebug)
cm.Config.LoadExperiments(ctx, cm.IO.PrintDebug)
// Mock API call
cm.ApiInterface.On("AddCollaborator", mock.Anything, mock.Anything,
"A123",
types.SlackUser{ID: "U123", PermissionType: types.READER}).Return(nil)
},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
cm.ApiInterface.AssertCalled(t, "AddCollaborator", mock.Anything, mock.Anything,
"A123",
types.SlackUser{ID: "U123", PermissionType: types.READER})
Expand All @@ -63,14 +63,14 @@ func TestAddCommand(t *testing.T) {
appSelectMock.On("TeamAppSelectPrompt").Return(prompts.SelectedApp{App: types.App{AppID: "A123"}, Auth: types.SlackAuth{}}, nil)
// Set experiment flag
cm.Config.ExperimentsFlag = append(cm.Config.ExperimentsFlag, "read-only-collaborators")
cm.Config.LoadExperiments(context.Background(), cm.IO.PrintDebug)
cm.Config.LoadExperiments(ctx, cm.IO.PrintDebug)
// Mock API call
cm.ApiInterface.On("AddCollaborator", mock.Anything, mock.Anything,
"A123",
types.SlackUser{Email: "[email protected]", PermissionType: types.OWNER}).Return(nil)
addFlags.permissionType = "owner"
},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
cm.ApiInterface.AssertCalled(t, "AddCollaborator", mock.Anything, mock.Anything,
"A123",
types.SlackUser{Email: "[email protected]", PermissionType: types.OWNER})
Expand All @@ -90,7 +90,7 @@ func TestAddCommand(t *testing.T) {
cm.ApiInterface.On("AddCollaborator", mock.Anything, mock.Anything, mock.Anything, mock.Anything).
Return(nil)
},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
cm.ApiInterface.AssertCalled(t, "AddCollaborator", mock.Anything, mock.Anything,
"A123",
types.SlackUser{Email: "[email protected]", PermissionType: types.OWNER})
Expand Down
6 changes: 3 additions & 3 deletions cmd/collaborators/remove_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func TestRemoveCommand(t *testing.T) {
cm.ApiInterface.On("RemoveCollaborator", mock.Anything, mock.Anything, mock.Anything, mock.Anything).
Return(nil)
},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
collaborator := types.SlackUser{
ID: "USLACKBOT",
}
Expand All @@ -83,7 +83,7 @@ func TestRemoveCommand(t *testing.T) {
cm.IO.On("SelectPrompt", mock.Anything, "Remove a collaborator", mock.Anything, mock.Anything).
Return(iostreams.SelectPromptResponse{Prompt: true, Index: 1}, nil)
},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
cm.ApiInterface.AssertCalled(t, "RemoveCollaborator", mock.Anything, mock.Anything, "A001", mockCollaborators[1])
cm.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.CollaboratorRemoveSuccess, mock.Anything)
cm.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.CollaboratorRemoveCollaborator, []string{"[email protected]"})
Expand All @@ -106,7 +106,7 @@ func TestRemoveCommand(t *testing.T) {
cm.IO.On("ConfirmPrompt", mock.Anything, "Are you sure you want to remove yourself?", mock.Anything, mock.Anything).
Return(false, nil)
},
ExpectedAsserts: func(t *testing.T, cm *shared.ClientsMock) {
ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
cm.ApiInterface.AssertNotCalled(t, "RemoveCollaborator", mock.Anything, mock.Anything, mock.Anything, mock.Anything)
},
ExpectedError: slackerror.New(slackerror.ErrProcessInterrupted),
Expand Down
Loading
Loading