Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions internal/api/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -484,8 +484,8 @@ func TestClient_DeveloperAppInstall_RequestAppApproval(t *testing.T) {
requestJSON: `{"app":"A1234","reason":"This request has been automatically generated according to project environment settings."}`,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
ctx := slackcontext.MockContext(t.Context())

// prepare
Expand All @@ -495,14 +495,14 @@ func TestClient_DeveloperAppInstall_RequestAppApproval(t *testing.T) {
result := fmt.Sprintf(
`{"ok":false,"error":"%s","team_id":"%s"}`,
slackerror.ErrAppApprovalRequestEligible,
tt.teamID,
tc.teamID,
)
_, err := fmt.Fprintln(w, result)
require.NoError(t, err)
}

if strings.Contains(r.URL.Path, appApprovalRequestCreateMethod) {
expectedJSON := tt.requestJSON
expectedJSON := tc.requestJSON
payload, err := io.ReadAll(r.Body)
require.NoError(t, err)
require.Equal(t, expectedJSON, string(payload))
Expand All @@ -518,7 +518,7 @@ func TestClient_DeveloperAppInstall_RequestAppApproval(t *testing.T) {
iostreamMock.On("PrintTrace", mock.Anything, mock.Anything, mock.Anything).Return()

// execute
_, _, err := c.DeveloperAppInstall(ctx, iostreamMock, "token", tt.app, []string{}, []string{}, tt.orgGrantWorkspaceID, true)
_, _, err := c.DeveloperAppInstall(ctx, iostreamMock, "token", tc.app, []string{}, []string{}, tc.orgGrantWorkspaceID, true)
require.NoError(t, err)
})
}
Expand Down
8 changes: 4 additions & 4 deletions internal/api/debug_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ func Test_RedactPII(t *testing.T) {
expected: `Operating System (OS): darwin`,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
redacted := goutils.RedactPII(tt.text)
require.Equal(t, redacted, tt.expected)
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
redacted := goutils.RedactPII(tc.text)
require.Equal(t, redacted, tc.expected)
})
}
}
6 changes: 3 additions & 3 deletions internal/app/app_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -692,14 +692,14 @@ func TestAppClient_CleanupAppsJSONFiles(t *testing.T) {
},
}

for _, tt := range tests {
for _, tc := range tests {
ac, _, _, pathToAppsJSON, pathToDevAppsJSON, teardown := setup(t)
defer teardown(t)
ctx := slackcontext.MockContext(t.Context())

err := afero.WriteFile(ac.fs, pathToAppsJSON, tt.appsJSON, 0600)
err := afero.WriteFile(ac.fs, pathToAppsJSON, tc.appsJSON, 0600)
require.NoError(t, err)
err = afero.WriteFile(ac.fs, pathToDevAppsJSON, tt.devAppsJSON, 0600)
err = afero.WriteFile(ac.fs, pathToDevAppsJSON, tc.devAppsJSON, 0600)
require.NoError(t, err)

_, err = ac.fs.Stat(pathToAppsJSON)
Expand Down
8 changes: 4 additions & 4 deletions internal/app/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ func Test_RegexReplaceAppNameInManifest(t *testing.T) {
expectedSrc: testdata.ManifestSDKTSAppName,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
actualSrc := regexReplaceAppNameInManifest(tt.src, tt.appName)
require.Equal(t, tt.expectedSrc, actualSrc)
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
actualSrc := regexReplaceAppNameInManifest(tc.src, tc.appName)
require.Equal(t, tc.expectedSrc, actualSrc)
})
}
}
16 changes: 8 additions & 8 deletions internal/goutils/slices_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ func Test_AppendStringIfNotMember(t *testing.T) {
expectedSlice: []string{"one"},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
actualSlice := AppendStringIfNotMember(tt.originalSlice, tt.newElement)
require.ElementsMatch(t, tt.expectedSlice, actualSlice)
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
actualSlice := AppendStringIfNotMember(tc.originalSlice, tc.newElement)
require.ElementsMatch(t, tc.expectedSlice, actualSlice)
})
}
}
Expand All @@ -68,10 +68,10 @@ func Test_Contains(t *testing.T) {
{name: "not_case_sensitive_fail", listToCheck: []string{"hi", "hey", "hello", "apple", "pear"}, toFind: "Peach", isCaseSensitive: false, want: false},
{name: "not_case_sensitive_substring", listToCheck: []string{"hi", "hey hello"}, toFind: "hey", isCaseSensitive: false, want: false},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := Contains(tt.listToCheck, tt.toFind, tt.isCaseSensitive); got != tt.want {
t.Errorf("method() = %v, want %v", got, tt.want)
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
if got := Contains(tc.listToCheck, tc.toFind, tc.isCaseSensitive); got != tc.want {
t.Errorf("method() = %v, want %v", got, tc.want)
}
})
}
Expand Down
50 changes: 25 additions & 25 deletions internal/goutils/strings_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ func Test_HashString(t *testing.T) {
expected: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
hash1, err1 := HashString(tt.text1)
hash2, err2 := HashString(tt.text2)
require.Equal(t, hash1 == hash2, tt.expected)
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
hash1, err1 := HashString(tc.text1)
hash2, err2 := HashString(tc.text2)
require.Equal(t, hash1 == hash2, tc.expected)
require.NoError(t, err1)
require.NoError(t, err2)
})
Expand Down Expand Up @@ -121,10 +121,10 @@ func Test_ExtractFirstJSONFromString(t *testing.T) {
expected: "",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
actualRes := ExtractFirstJSONFromString(tt.text)
require.Equal(t, tt.expected, actualRes)
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
actualRes := ExtractFirstJSONFromString(tc.text)
require.Equal(t, tc.expected, actualRes)
})
}
}
Expand Down Expand Up @@ -155,10 +155,10 @@ func Test_addLogWhenValExist(t *testing.T) {
expected: "hello world: [slack]\n",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
output := AddLogWhenValExist(tt.title, tt.val)
require.Equal(t, output, tt.expected)
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
output := AddLogWhenValExist(tc.title, tc.val)
require.Equal(t, output, tc.expected)
})
}
}
Expand Down Expand Up @@ -380,10 +380,10 @@ func Test_RedactPII(t *testing.T) {
expected: `slack variables remove ...`,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
redacted := RedactPII(tt.text)
require.Equal(t, tt.expected, redacted)
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
redacted := RedactPII(tc.text)
require.Equal(t, tc.expected, redacted)
})
}
}
Expand Down Expand Up @@ -414,10 +414,10 @@ func Test_UpperCaseTrimAll(t *testing.T) {
expected: "HELLO,WORLD",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
output := UpperCaseTrimAll(tt.namedEntities)
require.Equal(t, output, tt.expected)
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
output := UpperCaseTrimAll(tc.namedEntities)
require.Equal(t, output, tc.expected)
})
}
}
Expand All @@ -444,10 +444,10 @@ func Test_ToHTTPS(t *testing.T) {
expected: "https://www.xyz.com",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
output := ToHTTPS(tt.urlAddr)
require.Equal(t, output, tt.expected)
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
output := ToHTTPS(tc.urlAddr)
require.Equal(t, output, tc.expected)
})
}
}
12 changes: 6 additions & 6 deletions internal/pkg/externalauth/prompt_provider_auth_select_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,18 @@ func TestPrompt_ProviderAuthSelectPrompt_no_selected_auth(t *testing.T) {
},
}

for _, tt := range tests {
for _, tc := range tests {
var mockProviderFlag string
ctx := slackcontext.MockContext(t.Context())
clientsMock := shared.NewClientsMock()
clients := shared.NewClientFactory(clientsMock.MockClientFactory())
clientsMock.Config.Flags.StringVar(&mockProviderFlag, "provider", "", "mock provider flag")
if tt.ProviderFlag != "" {
_ = clientsMock.Config.Flags.Set("provider", tt.ProviderFlag)
if tc.ProviderFlag != "" {
_ = clientsMock.Config.Flags.Set("provider", tc.ProviderFlag)
}
clientsMock.IO.On("SelectPrompt", mock.Anything, "Select a provider", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{
Flag: clients.Config.Flags.Lookup("provider"),
})).Return(tt.Selection, nil)
})).Return(tc.Selection, nil)

clientsMock.AddDefaultMocks()

Expand Down Expand Up @@ -149,15 +149,15 @@ func TestPrompt_ProviderAuthSelectPrompt_with_selected_auth(t *testing.T) {
},
}

for _, tt := range tests {
for _, tc := range tests {
var mockProviderFlag string
ctx := slackcontext.MockContext(t.Context())
clientsMock := shared.NewClientsMock()
clients := shared.NewClientFactory(clientsMock.MockClientFactory())
clientsMock.Config.Flags.StringVar(&mockProviderFlag, "provider", "", "mock provider flag")
clientsMock.IO.On("SelectPrompt", mock.Anything, "Select a provider", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{
Flag: clientsMock.Config.Flags.Lookup("provider"),
})).Return(tt.Selection, nil)
})).Return(tc.Selection, nil)
clientsMock.AddDefaultMocks()

selectedProvider, err := ProviderAuthSelectPrompt(ctx, clients, workflowsInfo)
Expand Down
12 changes: 6 additions & 6 deletions internal/pkg/externalauth/prompt_provider_select_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ func TestPrompt_ProviderSelectPrompt_no_token(t *testing.T) {
},
}

for _, tt := range tests {
for _, tc := range tests {
var mockProviderFlag string
ctx := slackcontext.MockContext(t.Context())
clientsMock := shared.NewClientsMock()
clients := shared.NewClientFactory(clientsMock.MockClientFactory())
clientsMock.Config.Flags.StringVar(&mockProviderFlag, "provider", "", "mock provider flag")
clientsMock.IO.On("SelectPrompt", mock.Anything, "Select a provider", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{
Flag: clientsMock.Config.Flags.Lookup("provider"),
})).Return(tt.Selection, nil)
})).Return(tc.Selection, nil)
clientsMock.AddDefaultMocks()

selectedProvider, err := ProviderSelectPrompt(ctx, clients, authorizationInfoLists)
Expand Down Expand Up @@ -134,18 +134,18 @@ func TestPrompt_ProviderSelectPrompt_with_token(t *testing.T) {
},
}

for _, tt := range tests {
for _, tc := range tests {
var mockProviderFlag string
ctx := slackcontext.MockContext(t.Context())
clientsMock := shared.NewClientsMock()
clients := shared.NewClientFactory(clientsMock.MockClientFactory())
clientsMock.Config.Flags.StringVar(&mockProviderFlag, "provider", "", "mock provider flag")
if tt.ProviderFlag != "" {
_ = clientsMock.Config.Flags.Set("provider", tt.ProviderFlag)
if tc.ProviderFlag != "" {
_ = clientsMock.Config.Flags.Set("provider", tc.ProviderFlag)
}
clientsMock.IO.On("SelectPrompt", mock.Anything, "Select a provider", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{
Flag: clientsMock.Config.Flags.Lookup("provider"),
})).Return(tt.Selection, nil)
})).Return(tc.Selection, nil)
clientsMock.AddDefaultMocks()

selectedProvider, err := ProviderSelectPrompt(ctx, clients, authorizationInfoLists)
Expand Down
8 changes: 4 additions & 4 deletions internal/pkg/externalauth/prompt_token_select_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,17 @@ func TestPrompt_TokenSelectPrompt_with_token(t *testing.T) {
}

var externalAccountFlag string
for _, tt := range tests {
for _, tc := range tests {
ctx := slackcontext.MockContext(t.Context())
clientsMock := shared.NewClientsMock()
clients := shared.NewClientFactory(clientsMock.MockClientFactory())
clientsMock.Config.Flags.StringVar(&externalAccountFlag, "external-account", "", "mock external-account flag")
if tt.ExternalAccountFlag != "" {
_ = clientsMock.Config.Flags.Set("external-account", tt.ExternalAccountFlag)
if tc.ExternalAccountFlag != "" {
_ = clientsMock.Config.Flags.Set("external-account", tc.ExternalAccountFlag)
}
clientsMock.IO.On("SelectPrompt", mock.Anything, "Select an external account", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{
Flag: clientsMock.Config.Flags.Lookup("external-account"),
})).Return(tt.Selection, nil)
})).Return(tc.Selection, nil)
clientsMock.AddDefaultMocks()

selectedToken, err := TokenSelectPrompt(ctx, clients, authorizationInfo)
Expand Down
8 changes: 4 additions & 4 deletions internal/pkg/externalauth/prompt_workflow_select_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,18 +142,18 @@ func TestPrompt_WorkflowSelectPrompt_with_workflows(t *testing.T) {
},
}

for _, tt := range tests {
for _, tc := range tests {
var mockWorkflowFlag string
ctx := slackcontext.MockContext(t.Context())
clientsMock := shared.NewClientsMock()
clients := shared.NewClientFactory(clientsMock.MockClientFactory())
clientsMock.Config.Flags.StringVar(&mockWorkflowFlag, "workflow", "", "mock workflow flag")
if tt.WorkflowFlag != "" {
_ = clientsMock.Config.Flags.Set("workflow", tt.WorkflowFlag)
if tc.WorkflowFlag != "" {
_ = clientsMock.Config.Flags.Set("workflow", tc.WorkflowFlag)
}
clientsMock.IO.On("SelectPrompt", mock.Anything, "Select a workflow", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{
Flag: clientsMock.Config.Flags.Lookup("workflow"),
})).Return(tt.Selection, nil)
})).Return(tc.Selection, nil)
clientsMock.AddDefaultMocks()

selectedWorkflow, err := WorkflowSelectPrompt(ctx, clients, authorizationInfoLists)
Expand Down
8 changes: 4 additions & 4 deletions internal/pkg/platform/activity_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ func Test_prettifyActivity(t *testing.T) {
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
actualResult := prettifyActivity(tt.activity)
for _, expectedResult := range tt.expectedResults {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
actualResult := prettifyActivity(tc.activity)
for _, expectedResult := range tc.expectedResults {
require.Contains(t, actualResult, expectedResult)
}
// Confirm no nil pointers leak to output
Expand Down
Loading
Loading