From 11aa4f78cb6028b18e37ba3b67832b58b1643c7a Mon Sep 17 00:00:00 2001 From: Michael Brooks Date: Tue, 27 Jan 2026 19:31:47 -0800 Subject: [PATCH 1/4] refactor(tests): use tests/tc naming in table tests using the slice pattern --- internal/api/app_test.go | 10 +-- internal/api/debug_test.go | 8 +-- internal/app/app_client_test.go | 6 +- internal/app/app_test.go | 8 +-- internal/goutils/slices_test.go | 16 ++--- internal/goutils/strings_test.go | 50 +++++++------- .../prompt_provider_auth_select_test.go | 12 ++-- .../prompt_provider_select_test.go | 12 ++-- .../externalauth/prompt_token_select_test.go | 8 +-- .../prompt_workflow_select_test.go | 8 +-- internal/pkg/platform/activity_test.go | 8 +-- internal/runtime/deno/deno_test.go | 68 +++++++++---------- internal/runtime/node/node_test.go | 52 +++++++------- internal/runtime/python/python_test.go | 56 +++++++-------- internal/runtime/runtime_test.go | 16 ++--- internal/shared/types/app_manifest_test.go | 10 +-- internal/shared/types/auth_test.go | 18 ++--- internal/shared/types/channel_test.go | 6 +- internal/shared/types/icon_test.go | 20 +++--- internal/shared/types/permissions_test.go | 58 ++++++++-------- internal/shared/types/team_test.go | 8 +-- internal/shared/types/triggers_test.go | 8 +-- internal/shared/types/user_test.go | 16 ++--- 23 files changed, 241 insertions(+), 241 deletions(-) diff --git a/internal/api/app_test.go b/internal/api/app_test.go index 26d44d4a..ae14caf7 100644 --- a/internal/api/app_test.go +++ b/internal/api/app_test.go @@ -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 @@ -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)) @@ -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) }) } diff --git a/internal/api/debug_test.go b/internal/api/debug_test.go index fb8722bc..d166bde1 100644 --- a/internal/api/debug_test.go +++ b/internal/api/debug_test.go @@ -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) }) } } diff --git a/internal/app/app_client_test.go b/internal/app/app_client_test.go index 1a55c7cd..805e39ab 100644 --- a/internal/app/app_client_test.go +++ b/internal/app/app_client_test.go @@ -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) diff --git a/internal/app/app_test.go b/internal/app/app_test.go index f4f374fc..4976f34c 100644 --- a/internal/app/app_test.go +++ b/internal/app/app_test.go @@ -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) }) } } diff --git a/internal/goutils/slices_test.go b/internal/goutils/slices_test.go index 4c1a28d7..7527543d 100644 --- a/internal/goutils/slices_test.go +++ b/internal/goutils/slices_test.go @@ -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) }) } } @@ -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) } }) } diff --git a/internal/goutils/strings_test.go b/internal/goutils/strings_test.go index 938f5f8a..2d4ef724 100644 --- a/internal/goutils/strings_test.go +++ b/internal/goutils/strings_test.go @@ -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) }) @@ -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) }) } } @@ -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) }) } } @@ -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) }) } } @@ -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) }) } } @@ -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) }) } } diff --git a/internal/pkg/externalauth/prompt_provider_auth_select_test.go b/internal/pkg/externalauth/prompt_provider_auth_select_test.go index 843b4916..38c18559 100644 --- a/internal/pkg/externalauth/prompt_provider_auth_select_test.go +++ b/internal/pkg/externalauth/prompt_provider_auth_select_test.go @@ -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() @@ -149,7 +149,7 @@ 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() @@ -157,7 +157,7 @@ func TestPrompt_ProviderAuthSelectPrompt_with_selected_auth(t *testing.T) { 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) diff --git a/internal/pkg/externalauth/prompt_provider_select_test.go b/internal/pkg/externalauth/prompt_provider_select_test.go index 9dac701e..9d42dfbb 100644 --- a/internal/pkg/externalauth/prompt_provider_select_test.go +++ b/internal/pkg/externalauth/prompt_provider_select_test.go @@ -72,7 +72,7 @@ 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() @@ -80,7 +80,7 @@ func TestPrompt_ProviderSelectPrompt_no_token(t *testing.T) { 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) @@ -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) diff --git a/internal/pkg/externalauth/prompt_token_select_test.go b/internal/pkg/externalauth/prompt_token_select_test.go index b78a260c..3ab25f71 100644 --- a/internal/pkg/externalauth/prompt_token_select_test.go +++ b/internal/pkg/externalauth/prompt_token_select_test.go @@ -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) diff --git a/internal/pkg/externalauth/prompt_workflow_select_test.go b/internal/pkg/externalauth/prompt_workflow_select_test.go index f1753aa8..1c2e9eb5 100644 --- a/internal/pkg/externalauth/prompt_workflow_select_test.go +++ b/internal/pkg/externalauth/prompt_workflow_select_test.go @@ -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) diff --git a/internal/pkg/platform/activity_test.go b/internal/pkg/platform/activity_test.go index de8e2142..7d109951 100644 --- a/internal/pkg/platform/activity_test.go +++ b/internal/pkg/platform/activity_test.go @@ -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 diff --git a/internal/runtime/deno/deno_test.go b/internal/runtime/deno/deno_test.go index 270f5486..4e507cbf 100644 --- a/internal/runtime/deno/deno_test.go +++ b/internal/runtime/deno/deno_test.go @@ -43,10 +43,10 @@ func Test_Deno_New(t *testing.T) { expectedDeno: &Deno{version: defaultVersion}, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { d := New() - require.Equal(t, tt.expectedDeno, d) + require.Equal(t, tc.expectedDeno, d) }) } } @@ -61,10 +61,10 @@ func Test_Deno_IgnoreDirectories(t *testing.T) { expectedIgnoreDirectories: []string{}, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { d := New() - require.Equal(t, tt.expectedIgnoreDirectories, d.IgnoreDirectories()) + require.Equal(t, tc.expectedIgnoreDirectories, d.IgnoreDirectories()) }) } } @@ -131,15 +131,15 @@ func Test_Deno_InstallProjectDependencies(t *testing.T) { expectedHookExecutorCalls: 1, // Cache dependencies script executed }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { // Setup ctx := slackcontext.MockContext(t.Context()) projectDirPath := "/path/to/project-name" fs := slackdeps.NewFsMock() os := slackdeps.NewOsMock() - os.On("LookPath", mock.Anything).Return("", tt.lookPathError) + os.On("LookPath", mock.Anything).Return("", tc.lookPathError) os.AddDefaultMocks() cfg := config.NewConfig(fs, os) @@ -148,10 +148,10 @@ func Test_Deno_InstallProjectDependencies(t *testing.T) { ios.AddDefaultMocks() mockHookExecutor := &hooks.MockHookExecutor{} - mockHookExecutor.On("Execute", mock.Anything, mock.Anything).Return("text output", tt.hookExecutorError) + mockHookExecutor.On("Execute", mock.Anything, mock.Anything).Return("text output", tc.hookExecutorError) // Create files - for _, filePath := range tt.existingFilePaths { + for _, filePath := range tc.existingFilePaths { filePathAbs := filepath.Join(projectDirPath, filePath) // Create the directory if err := fs.MkdirAll(filepath.Dir(filePathAbs), 0755); err != nil { @@ -168,9 +168,9 @@ func Test_Deno_InstallProjectDependencies(t *testing.T) { response, err := d.InstallProjectDependencies(ctx, projectDirPath, mockHookExecutor, ios, fs, os) // Assertions - require.Contains(t, response, tt.expectedResponse) - require.Equal(t, tt.expectedError, err) - mockHookExecutor.AssertNumberOfCalls(t, "Execute", tt.expectedHookExecutorCalls) + require.Contains(t, response, tc.expectedResponse) + require.Equal(t, tc.expectedError, err) + mockHookExecutor.AssertNumberOfCalls(t, "Execute", tc.expectedHookExecutorCalls) }) } } @@ -202,9 +202,9 @@ func Test_Deno_Version(t *testing.T) { expectedVersion: defaultVersion, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - require.Equal(t, tt.expectedVersion, tt.deno.Version()) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + require.Equal(t, tc.expectedVersion, tc.deno.Version()) }) } } @@ -226,11 +226,11 @@ func Test_Deno_SetVersion(t *testing.T) { expectedVersion: "deno@2", }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { d := New() - d.SetVersion(tt.version) - require.Equal(t, tt.expectedVersion, d.Version()) + d.SetVersion(tc.version) + require.Equal(t, tc.expectedVersion, d.Version()) }) } } @@ -252,16 +252,16 @@ func Test_Deno_HooksJSONTemplate(t *testing.T) { expectedErrorType: &json.SyntaxError{}, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { // Setup var anyJSON map[string]interface{} // Test - err := json.Unmarshal(tt.hooksJSONTemplate, &anyJSON) + err := json.Unmarshal(tc.hooksJSONTemplate, &anyJSON) // Assertions - require.IsType(t, tt.expectedErrorType, err) + require.IsType(t, tc.expectedErrorType, err) }) } } @@ -283,8 +283,8 @@ func Test_Deno_PreparePackage(t *testing.T) { expectedPreparePackageError: slackerror.New(slackerror.ErrSDKHookInvocationFailed), }, } - 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()) // Setup SDKConfig @@ -296,7 +296,7 @@ func Test_Deno_PreparePackage(t *testing.T) { // Setup HookExecutor mockHookExecutor := &hooks.MockHookExecutor{} - mockHookExecutor.On("Execute", mock.Anything, mock.Anything).Return("text output", tt.hookExecutorError) + mockHookExecutor.On("Execute", mock.Anything, mock.Anything).Return("text output", tc.hookExecutorError) // Setup mockOpts := types.PreparePackageOpts{} @@ -309,7 +309,7 @@ func Test_Deno_PreparePackage(t *testing.T) { err := d.PreparePackage(ctx, mockSDKConfig, mockHookExecutor, mockOpts) // Assertions - require.Equal(t, tt.expectedPreparePackageError, err) + require.Equal(t, tc.expectedPreparePackageError, err) }) } } @@ -346,15 +346,15 @@ func Test_Deno_IsRuntimeForProject(t *testing.T) { expectedBool: true, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { // Setup ctx := slackcontext.MockContext(t.Context()) fs := slackdeps.NewFsMock() projectDirPath := "/path/to/project-name" // Create files - for _, filePath := range tt.existingFilePaths { + for _, filePath := range tc.existingFilePaths { filePathAbs := filepath.Join(projectDirPath, filePath) // Create the directory if err := fs.MkdirAll(filepath.Dir(filePathAbs), 0755); err != nil { @@ -367,10 +367,10 @@ func Test_Deno_IsRuntimeForProject(t *testing.T) { } // Test - b := IsRuntimeForProject(ctx, fs, projectDirPath, hooks.SDKCLIConfig{Runtime: tt.sdkConfigRuntime}) + b := IsRuntimeForProject(ctx, fs, projectDirPath, hooks.SDKCLIConfig{Runtime: tc.sdkConfigRuntime}) // Assertions - require.Equal(t, tt.expectedBool, b) + require.Equal(t, tc.expectedBool, b) }) } } diff --git a/internal/runtime/node/node_test.go b/internal/runtime/node/node_test.go index 31ca966a..ebfb2e5f 100644 --- a/internal/runtime/node/node_test.go +++ b/internal/runtime/node/node_test.go @@ -42,8 +42,8 @@ func Test_Node_New(t *testing.T) { expectedNode: &Node{}, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { n := New() require.IsType(t, Node{}, *n) }) @@ -60,10 +60,10 @@ func Test_Node_IgnoreDirectories(t *testing.T) { expectedIgnoreDirectories: []string{"node_modules"}, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { n := New() - require.Equal(t, tt.expectedIgnoreDirectories, n.IgnoreDirectories()) + require.Equal(t, tc.expectedIgnoreDirectories, n.IgnoreDirectories()) }) } } @@ -188,8 +188,8 @@ func Test_Node_InstallProjectDependencies(t *testing.T) { }, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { // Setup ctx := slackcontext.MockContext(t.Context()) projectDirPath := "/path/to/project-name" @@ -200,7 +200,7 @@ func Test_Node_InstallProjectDependencies(t *testing.T) { ios := iostreams.NewIOStreamsMock(cfg, fs, os) mockHookExecutor := &hooks.MockHookExecutor{} - npmMock := tt.npmMock() + npmMock := tc.npmMock() // Test n := New() @@ -208,10 +208,10 @@ func Test_Node_InstallProjectDependencies(t *testing.T) { output, err := n.InstallProjectDependencies(ctx, projectDirPath, mockHookExecutor, ios, fs, os) // Assertions - for _, expectedOutput := range tt.expectedOutputs { + for _, expectedOutput := range tc.expectedOutputs { require.Contains(t, output, expectedOutput) } - require.Equal(t, tt.expectedError, err) + require.Equal(t, tc.expectedError, err) }) } } @@ -231,10 +231,10 @@ func Test_Node_Version(t *testing.T) { expectedVersion: "node", }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { n := New() - require.Equal(t, tt.expectedVersion, n.Version()) + require.Equal(t, tc.expectedVersion, n.Version()) }) } } @@ -263,16 +263,16 @@ func Test_Node_HooksJSONTemplate(t *testing.T) { expectedErrorType: &json.SyntaxError{}, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { // Setup var anyJSON map[string]interface{} // Test - err := json.Unmarshal(tt.hooksJSONTemplate, &anyJSON) + err := json.Unmarshal(tc.hooksJSONTemplate, &anyJSON) // Assertions - require.IsType(t, tt.expectedErrorType, err) + require.IsType(t, tc.expectedErrorType, err) }) } } @@ -289,8 +289,8 @@ func Test_Node_PreparePackage(t *testing.T) { expectedPreparePackageError: nil, }, } - 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()) // Setup SDKConfig @@ -302,7 +302,7 @@ func Test_Node_PreparePackage(t *testing.T) { // Setup HookExecutor mockHookExecutor := &hooks.MockHookExecutor{} - mockHookExecutor.On("Execute", mock.Anything, mock.Anything).Return("text output", tt.hookExecutorError) + mockHookExecutor.On("Execute", mock.Anything, mock.Anything).Return("text output", tc.hookExecutorError) // Setup mockOpts := types.PreparePackageOpts{} @@ -315,7 +315,7 @@ func Test_Node_PreparePackage(t *testing.T) { err := d.PreparePackage(ctx, mockSDKConfig, mockHookExecutor, mockOpts) // Assertions - require.Equal(t, tt.expectedPreparePackageError, err) + require.Equal(t, tc.expectedPreparePackageError, err) }) } } @@ -346,15 +346,15 @@ func Test_Node_IsRuntimeForProject(t *testing.T) { expectedBool: true, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { // Setup ctx := slackcontext.MockContext(t.Context()) fs := slackdeps.NewFsMock() projectDirPath := "/path/to/project-name" // Create files - for _, filePath := range tt.existingFilePaths { + for _, filePath := range tc.existingFilePaths { filePathAbs := filepath.Join(projectDirPath, filePath) // Create the directory if err := fs.MkdirAll(filepath.Dir(filePathAbs), 0755); err != nil { @@ -367,10 +367,10 @@ func Test_Node_IsRuntimeForProject(t *testing.T) { } // Test - b := IsRuntimeForProject(ctx, fs, projectDirPath, hooks.SDKCLIConfig{Runtime: tt.sdkConfigRuntime}) + b := IsRuntimeForProject(ctx, fs, projectDirPath, hooks.SDKCLIConfig{Runtime: tc.sdkConfigRuntime}) // Assertions - require.Equal(t, tt.expectedBool, b) + require.Equal(t, tc.expectedBool, b) }) } } diff --git a/internal/runtime/python/python_test.go b/internal/runtime/python/python_test.go index 767607ac..bd1ec955 100644 --- a/internal/runtime/python/python_test.go +++ b/internal/runtime/python/python_test.go @@ -41,10 +41,10 @@ func Test_Python_New(t *testing.T) { expectedPython: &Python{}, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { p := New() - require.Equal(t, tt.expectedPython, p) + require.Equal(t, tc.expectedPython, p) }) } } @@ -59,10 +59,10 @@ func Test_Python_IgnoreDirectories(t *testing.T) { expectedIgnoreDirectories: []string{}, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { p := New() - require.Equal(t, tt.expectedIgnoreDirectories, p.IgnoreDirectories()) + require.Equal(t, tc.expectedIgnoreDirectories, p.IgnoreDirectories()) }) } } @@ -167,8 +167,8 @@ func Test_Python_InstallProjectDependencies(t *testing.T) { expectedOutputs: "Manually setup a Python virtual environment", }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { // Setup ctx := slackcontext.MockContext(t.Context()) fs := slackdeps.NewFsMock() @@ -183,7 +183,7 @@ func Test_Python_InstallProjectDependencies(t *testing.T) { projectDirPath := "/path/to/project-name" // Create files - for filePath, fileData := range tt.existingFiles { + for filePath, fileData := range tc.existingFiles { filePathAbs := filepath.Join(projectDirPath, filePath) // Create the directory if err := fs.MkdirAll(filepath.Dir(filePathAbs), 0755); err != nil { @@ -200,16 +200,16 @@ func Test_Python_InstallProjectDependencies(t *testing.T) { outputs, err := p.InstallProjectDependencies(ctx, projectDirPath, mockHookExecutor, ios, fs, os) // Assertions - for filePath, fileData := range tt.expectedFiles { + for filePath, fileData := range tc.expectedFiles { filePathAbs := filepath.Join(projectDirPath, filePath) d, err := afero.ReadFile(fs, filePathAbs) require.NoError(t, err) require.Equal(t, fileData, string(d)) } - require.Contains(t, outputs, tt.expectedOutputs) + require.Contains(t, outputs, tc.expectedOutputs) - if tt.expectedError { + if tc.expectedError { require.Error(t, err) } else { require.NoError(t, err) @@ -233,10 +233,10 @@ func Test_Python_Version(t *testing.T) { expectedVersion: "python", }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { p := New() - require.Equal(t, tt.expectedVersion, p.Version()) + require.Equal(t, tc.expectedVersion, p.Version()) }) } } @@ -265,16 +265,16 @@ func Test_Python_HooksJSONTemplate(t *testing.T) { expectedErrorType: &json.SyntaxError{}, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { // Setup var anyJSON map[string]interface{} // Test - err := json.Unmarshal(tt.hooksJSONTemplate, &anyJSON) + err := json.Unmarshal(tc.hooksJSONTemplate, &anyJSON) // Assertions - require.IsType(t, tt.expectedErrorType, err) + require.IsType(t, tc.expectedErrorType, err) }) } } @@ -291,8 +291,8 @@ func Test_Python_PreparePackage(t *testing.T) { expectedPreparePackageError: nil, }, } - 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()) // Setup SDKConfig @@ -304,7 +304,7 @@ func Test_Python_PreparePackage(t *testing.T) { // Setup HookExecutor mockHookExecutor := &hooks.MockHookExecutor{} - mockHookExecutor.On("Execute", mock.Anything, mock.Anything).Return("text output", tt.hookExecutorError) + mockHookExecutor.On("Execute", mock.Anything, mock.Anything).Return("text output", tc.hookExecutorError) // Setup mockOpts := types.PreparePackageOpts{} @@ -317,7 +317,7 @@ func Test_Python_PreparePackage(t *testing.T) { err := p.PreparePackage(ctx, mockSDKConfig, mockHookExecutor, mockOpts) // Assertions - require.Equal(t, tt.expectedPreparePackageError, err) + require.Equal(t, tc.expectedPreparePackageError, err) }) } } @@ -348,15 +348,15 @@ func Test_Python_IsRuntimeForProject(t *testing.T) { expectedBool: true, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { // Setup ctx := slackcontext.MockContext(t.Context()) fs := slackdeps.NewFsMock() projectDirPath := "/path/to/project-name" // Create files - for _, filePath := range tt.existingFilePaths { + for _, filePath := range tc.existingFilePaths { filePathAbs := filepath.Join(projectDirPath, filePath) // Create the directory if err := fs.MkdirAll(filepath.Dir(filePathAbs), 0755); err != nil { @@ -369,10 +369,10 @@ func Test_Python_IsRuntimeForProject(t *testing.T) { } // Test - b := IsRuntimeForProject(ctx, fs, projectDirPath, hooks.SDKCLIConfig{Runtime: tt.sdkConfigRuntime}) + b := IsRuntimeForProject(ctx, fs, projectDirPath, hooks.SDKCLIConfig{Runtime: tc.sdkConfigRuntime}) // Assertions - require.Equal(t, tt.expectedBool, b) + require.Equal(t, tc.expectedBool, b) }) } } diff --git a/internal/runtime/runtime_test.go b/internal/runtime/runtime_test.go index 85c3b7ee..53263a7a 100644 --- a/internal/runtime/runtime_test.go +++ b/internal/runtime/runtime_test.go @@ -53,11 +53,11 @@ func Test_Runtime_New(t *testing.T) { expectedRuntimeType: nil, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { // Run the test - rt, _ := New(tt.runtime) - require.IsType(t, tt.expectedRuntimeType, rt) + rt, _ := New(tc.runtime) + require.IsType(t, tc.expectedRuntimeType, rt) }) } } @@ -89,16 +89,16 @@ func Test_Runtime_NewDetectProject(t *testing.T) { expectedRuntimeType: nil, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { // Setup ctx := slackcontext.MockContext(t.Context()) fs := afero.NewMemMapFs() projectDirPath := "/path/to/project-name" // Run the test - rt, _ := NewDetectProject(ctx, fs, projectDirPath, tt.sdkConfig) - require.IsType(t, tt.expectedRuntimeType, rt) + rt, _ := NewDetectProject(ctx, fs, projectDirPath, tc.sdkConfig) + require.IsType(t, tc.expectedRuntimeType, rt) }) } } diff --git a/internal/shared/types/app_manifest_test.go b/internal/shared/types/app_manifest_test.go index c68d5572..a6cd7d5a 100644 --- a/internal/shared/types/app_manifest_test.go +++ b/internal/shared/types/app_manifest_test.go @@ -39,13 +39,13 @@ func Test_RawJSON_UnmarshalJSON(t *testing.T) { expectedJSONData: `{ "name": "foo" }`, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { rawJSON := &RawJSON{} - err := rawJSON.UnmarshalJSON([]byte(tt.blob)) + err := rawJSON.UnmarshalJSON([]byte(tc.blob)) - require.IsType(t, err, tt.expectedErrorType) - require.Equal(t, tt.expectedJSONData, string(*rawJSON.JSONData)) + require.IsType(t, err, tc.expectedErrorType) + require.Equal(t, tc.expectedJSONData, string(*rawJSON.JSONData)) }) } } diff --git a/internal/shared/types/auth_test.go b/internal/shared/types/auth_test.go index 0182b87e..b8c199a1 100644 --- a/internal/shared/types/auth_test.go +++ b/internal/shared/types/auth_test.go @@ -38,9 +38,9 @@ func Test_SlackAuth_AuthLevel(t *testing.T) { expectedAuthLevel: AuthLevelEnterprise, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - require.Equal(t, tt.auth.AuthLevel(), tt.expectedAuthLevel) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + require.Equal(t, tc.auth.AuthLevel(), tc.expectedAuthLevel) }) } } @@ -86,9 +86,9 @@ func Test_SlackAuth_ShouldRotateToken(t *testing.T) { expected: true, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - require.Equal(t, tt.expected, tt.input.ShouldRotateToken()) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + require.Equal(t, tc.expected, tc.input.ShouldRotateToken()) }) } } @@ -123,9 +123,9 @@ func Test_SlackAuth_TokenIsExpired(t *testing.T) { expected: false, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - require.Equal(t, tt.expected, tt.input.TokenIsExpired()) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + require.Equal(t, tc.expected, tc.input.TokenIsExpired()) }) } } diff --git a/internal/shared/types/channel_test.go b/internal/shared/types/channel_test.go index 13d2f45b..dc9c35ad 100644 --- a/internal/shared/types/channel_test.go +++ b/internal/shared/types/channel_test.go @@ -49,9 +49,9 @@ func Test_SlackChannel_String(t *testing.T) { expectedString: "", }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - require.Equal(t, tt.channel.String(), tt.expectedString) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + require.Equal(t, tc.channel.String(), tc.expectedString) }) } } diff --git a/internal/shared/types/icon_test.go b/internal/shared/types/icon_test.go index 8c0ccb6b..eb45ccc4 100644 --- a/internal/shared/types/icon_test.go +++ b/internal/shared/types/icon_test.go @@ -52,12 +52,12 @@ func Test_Icons_MarshalJSON(t *testing.T) { }, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - returnedBlob, err := json.Marshal(tt.icons) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + returnedBlob, err := json.Marshal(tc.icons) - require.IsType(t, err, tt.expectedErrorType) - for _, expectedBlob := range tt.expectedBlobs { + require.IsType(t, err, tc.expectedErrorType) + for _, expectedBlob := range tc.expectedBlobs { require.Contains(t, string(returnedBlob), expectedBlob) } }) @@ -122,12 +122,12 @@ func Test_Icons_UnmarshalJSON(t *testing.T) { expectedIcons: &Icons{"image_96": "path/to/image_96.png", "image_192": "path/to/image_192.png"}, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - err := json.Unmarshal([]byte(tt.blob), &tt.icons) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + err := json.Unmarshal([]byte(tc.blob), &tc.icons) - require.IsType(t, err, tt.expectedErrorType) - require.Equal(t, tt.expectedIcons, tt.icons) + require.IsType(t, err, tc.expectedErrorType) + require.Equal(t, tc.expectedIcons, tc.icons) }) } } diff --git a/internal/shared/types/permissions_test.go b/internal/shared/types/permissions_test.go index 106043b1..f2e780dc 100644 --- a/internal/shared/types/permissions_test.go +++ b/internal/shared/types/permissions_test.go @@ -48,12 +48,12 @@ func Test_Permissions_StringToAppCollaboratorPermission(t *testing.T) { expectedAppCollaboratorPermission: "", }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - appCollaboratorPermission, err := StringToAppCollaboratorPermission(tt.input) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + appCollaboratorPermission, err := StringToAppCollaboratorPermission(tc.input) - require.IsType(t, err, tt.expectedErrorType) - require.Equal(t, tt.expectedAppCollaboratorPermission, appCollaboratorPermission) + require.IsType(t, err, tc.expectedErrorType) + require.Equal(t, tc.expectedAppCollaboratorPermission, appCollaboratorPermission) }) } } @@ -80,11 +80,11 @@ func Test_Permissions_AppCollaboratorPermissionF(t *testing.T) { expectedString: "a collaborator", }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - returnedString := tt.acp.AppCollaboratorPermissionF() + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + returnedString := tc.acp.AppCollaboratorPermissionF() - require.Equal(t, tt.expectedString, returnedString) + require.Equal(t, tc.expectedString, returnedString) }) } } @@ -126,11 +126,11 @@ func Test_Permission_IsValid(t *testing.T) { expectedIsValid: false, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - returnedIsValid := tt.permission.IsValid() + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + returnedIsValid := tc.permission.IsValid() - require.Equal(t, tt.expectedIsValid, returnedIsValid) + require.Equal(t, tc.expectedIsValid, returnedIsValid) }) } } @@ -162,11 +162,11 @@ func Test_Permission_ToString(t *testing.T) { expectedString: "", }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - returnedString := tt.permission.ToString() + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + returnedString := tc.permission.ToString() - require.Equal(t, tt.expectedString, returnedString) + require.Equal(t, tc.expectedString, returnedString) }) } } @@ -237,7 +237,7 @@ func Test_Permissions_IsNamedEntityFlag(t *testing.T) { expectedIsNamedEntityFlag: false, }, } - for _, tt := range tests { + for _, tc := range tests { flags := pflag.NewFlagSet("entities", pflag.ContinueOnError) // Define the flags @@ -249,16 +249,16 @@ func Test_Permissions_IsNamedEntityFlag(t *testing.T) { // Set the flags based on the test values everyoneFlag := "" - if tt.flags.everyoneValue { + if tc.flags.everyoneValue { everyoneFlag = "--everyone" } args := []string{ everyoneFlag, - fmt.Sprintf("--channels=%s", tt.flags.channelsValue), - fmt.Sprintf("--organizations=%s", tt.flags.organizationsValue), - fmt.Sprintf("--users=%s", tt.flags.usersValue), - fmt.Sprintf("--workspaces=%s", tt.flags.workspacesValue), + fmt.Sprintf("--channels=%s", tc.flags.channelsValue), + fmt.Sprintf("--organizations=%s", tc.flags.organizationsValue), + fmt.Sprintf("--users=%s", tc.flags.usersValue), + fmt.Sprintf("--workspaces=%s", tc.flags.workspacesValue), } // Parse the flagset @@ -266,9 +266,9 @@ func Test_Permissions_IsNamedEntityFlag(t *testing.T) { require.Fail(t, err.Error(), "Flags parse error") } - t.Run(tt.name, func(t *testing.T) { + t.Run(tc.name, func(t *testing.T) { returnedIsNamedEntityFlag := IsNamedEntityFlag(flags) - require.Equal(t, tt.expectedIsNamedEntityFlag, returnedIsNamedEntityFlag) + require.Equal(t, tc.expectedIsNamedEntityFlag, returnedIsNamedEntityFlag) }) } } @@ -297,10 +297,10 @@ func Test_Permissions_GetAccessTypeDescriptionForEveryone(t *testing.T) { expectedString: "everyone in the workspace", }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - returnedString := GetAccessTypeDescriptionForEveryone(tt.app) - require.Equal(t, tt.expectedString, returnedString) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + returnedString := GetAccessTypeDescriptionForEveryone(tc.app) + require.Equal(t, tc.expectedString, returnedString) }) } } diff --git a/internal/shared/types/team_test.go b/internal/shared/types/team_test.go index a34ac9e6..f23fcf56 100644 --- a/internal/shared/types/team_test.go +++ b/internal/shared/types/team_test.go @@ -47,10 +47,10 @@ func Test_SlackTeam_String(t *testing.T) { expectedString: "", }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - returnedString := tt.slackTeam.String() - require.Equal(t, tt.expectedString, returnedString) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + returnedString := tc.slackTeam.String() + require.Equal(t, tc.expectedString, returnedString) }) } } diff --git a/internal/shared/types/triggers_test.go b/internal/shared/types/triggers_test.go index 041bf253..501a21cd 100644 --- a/internal/shared/types/triggers_test.go +++ b/internal/shared/types/triggers_test.go @@ -62,10 +62,10 @@ func Test_Triggers_IsKnownType(t *testing.T) { expectedBool: false, }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - returnedBool := tt.trigger.IsKnownType() - require.Equal(t, tt.expectedBool, returnedBool) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + returnedBool := tc.trigger.IsKnownType() + require.Equal(t, tc.expectedBool, returnedBool) }) } } diff --git a/internal/shared/types/user_test.go b/internal/shared/types/user_test.go index 4335dba6..dbe5a720 100644 --- a/internal/shared/types/user_test.go +++ b/internal/shared/types/user_test.go @@ -57,10 +57,10 @@ func Test_SlackUser_String(t *testing.T) { expectedString: " (U1234, owner)", // TODO - confirm that this is the result we want }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - returnedString := tt.slackUser.String() - require.Equal(t, tt.expectedString, returnedString) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + returnedString := tc.slackUser.String() + require.Equal(t, tc.expectedString, returnedString) }) } } @@ -92,10 +92,10 @@ func Test_SlackUser_ShorthandF(t *testing.T) { expectedString: "", }, } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - returnedString := tt.slackUser.ShorthandF() - require.Equal(t, tt.expectedString, returnedString) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + returnedString := tc.slackUser.ShorthandF() + require.Equal(t, tc.expectedString, returnedString) }) } } From 3933f612ae7f9aa5fc371e7d4ec7783b8f031703 Mon Sep 17 00:00:00 2001 From: Michael Brooks Date: Wed, 28 Jan 2026 12:47:51 -0800 Subject: [PATCH 2/4] test: update map pattern table tests to use common naming pattern --- cmd/app/link_test.go | 8 +- cmd/app/list_test.go | 8 +- cmd/collaborators/collaborators_test.go | 14 +- cmd/collaborators/list_test.go | 14 +- cmd/datastore/bulk_delete_test.go | 28 +-- cmd/datastore/bulk_get_test.go | 28 +-- cmd/datastore/bulk_put_test.go | 28 +-- cmd/datastore/count_test.go | 16 +- cmd/datastore/datastore_test.go | 16 +- cmd/datastore/delete_test.go | 32 +-- cmd/datastore/get_test.go | 32 +-- cmd/datastore/put_test.go | 32 +-- cmd/datastore/query_test.go | 44 ++-- cmd/datastore/update_test.go | 32 +-- cmd/doctor/check_test.go | 44 ++-- cmd/doctor/doctor_test.go | 10 +- cmd/env/add_test.go | 16 +- cmd/env/list_test.go | 16 +- cmd/env/remove_test.go | 16 +- cmd/externalauth/add_secret_test.go | 16 +- cmd/externalauth/add_test.go | 16 +- cmd/externalauth/remove_test.go | 16 +- cmd/externalauth/select_auth_test.go | 16 +- cmd/function/access_test.go | 28 +-- cmd/function/prompt_test.go | 18 +- cmd/help/help_test.go | 8 +- cmd/platform/deploy_test.go | 42 ++-- cmd/platform/run_test.go | 16 +- cmd/project/create_samples_test.go | 16 +- cmd/project/create_test.go | 10 +- cmd/root_test.go | 20 +- cmd/triggers/generate_test.go | 78 +++---- internal/api/app_test.go | 56 ++--- internal/api/datastore_test.go | 90 ++++---- internal/api/externalauth_test.go | 54 ++--- internal/api/functiondistribution_test.go | 36 +-- internal/api/teams_test.go | 12 +- internal/api/triggerpermissions_test.go | 224 +++++++++---------- internal/api/workflows_test.go | 62 ++--- internal/app/app_test.go | 10 +- internal/app/manifest_test.go | 34 +-- internal/auth/auth_test.go | 38 ++-- internal/auth/revoke_test.go | 14 +- internal/cache/cache_test.go | 6 +- internal/cache/hash_test.go | 16 +- internal/cache/manifest_test.go | 16 +- internal/cmdutil/project_test.go | 16 +- internal/config/config_test.go | 8 +- internal/config/dotenv_test.go | 14 +- internal/config/experiments_test.go | 28 +-- internal/config/flags_test.go | 12 +- internal/config/manifest_test.go | 24 +- internal/config/project_test.go | 106 ++++----- internal/config/survey_test.go | 10 +- internal/deputil/url_test.go | 8 +- internal/experiment/experiment_test.go | 4 +- internal/goutils/json_test.go | 28 +-- internal/goutils/map_test.go | 6 +- internal/hooks/hook_executor_default_test.go | 12 +- internal/hooks/hook_executor_v2_test.go | 6 +- internal/hooks/hooks_test.go | 6 +- internal/hooks/script_test.go | 20 +- internal/hooks/sdk_config_test.go | 20 +- internal/iostreams/iostreams_test.go | 6 +- internal/iostreams/logfile_test.go | 20 +- internal/iostreams/printer_test.go | 32 +-- internal/iostreams/survey_test.go | 20 +- internal/iostreams/writer_test.go | 56 ++--- internal/pkg/apps/delete_test.go | 26 +-- internal/pkg/apps/install_test.go | 166 +++++++------- internal/pkg/create/create_test.go | 28 +-- internal/pkg/create/sample_test.go | 12 +- internal/pkg/create/template_test.go | 28 +-- internal/pkg/datastore/bulk_delete_test.go | 10 +- internal/pkg/datastore/bulk_get_test.go | 10 +- internal/pkg/datastore/bulk_put_test.go | 10 +- internal/pkg/datastore/delete_test.go | 10 +- internal/pkg/datastore/get_test.go | 10 +- internal/pkg/datastore/put_test.go | 10 +- internal/pkg/datastore/query_test.go | 10 +- internal/pkg/datastore/update_test.go | 10 +- internal/pkg/platform/activity_test.go | 28 +-- internal/pkg/platform/localserver_test.go | 24 +- internal/prompts/app_select_test.go | 202 ++++++++--------- internal/runtime/node/npm_test.go | 38 ++-- internal/runtime/python/python_test.go | 10 +- internal/shared/clients_test.go | 14 +- internal/shared/types/app_manifest_test.go | 54 ++--- internal/shared/types/app_test.go | 44 ++-- internal/shared/types/datastore_test.go | 10 +- internal/slackcontext/slackcontext_test.go | 98 ++++---- internal/slackdeps/fs_test.go | 4 +- internal/slackdeps/os_test.go | 14 +- internal/slackerror/error_test.go | 108 ++++----- internal/slackerror/warn_test.go | 6 +- internal/slackhttp/http_test.go | 14 +- internal/style/format_test.go | 32 +-- internal/style/spinner_test.go | 6 +- internal/style/style_test.go | 12 +- internal/style/template_test.go | 10 +- internal/tracking/tracking_test.go | 28 +-- internal/update/cli_autoupdate_test.go | 10 +- internal/update/cli_metadata_test.go | 10 +- internal/update/semver_test.go | 20 +- internal/update/update_test.go | 14 +- test/testutil/testutil_test.go | 6 +- 106 files changed, 1510 insertions(+), 1510 deletions(-) diff --git a/cmd/app/link_test.go b/cmd/app/link_test.go index 0808d464..9b911e0c 100644 --- a/cmd/app/link_test.go +++ b/cmd/app/link_test.go @@ -722,7 +722,7 @@ func Test_Apps_LinkAppHeaderSection(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Create mocks ctx := slackcontext.MockContext(t.Context()) @@ -733,14 +733,14 @@ func Test_Apps_LinkAppHeaderSection(t *testing.T) { clients := shared.NewClientFactory(clientsMock.MockClientFactory()) // Run the test - LinkAppHeaderSection(ctx, clients, tt.shouldConfirm) + LinkAppHeaderSection(ctx, clients, tc.shouldConfirm) // Assertions output := clientsMock.GetCombinedOutput() - for _, expectedOutput := range tt.expectedOutputs { + for _, expectedOutput := range tc.expectedOutputs { require.Contains(t, output, expectedOutput) } - for _, unexpectedOutput := range tt.unexpectedOutputs { + for _, unexpectedOutput := range tc.unexpectedOutputs { require.NotContains(t, output, unexpectedOutput) } }) diff --git a/cmd/app/list_test.go b/cmd/app/list_test.go index 63e221a9..39dffdaa 100644 --- a/cmd/app/list_test.go +++ b/cmd/app/list_test.go @@ -215,14 +215,14 @@ func TestAppsListFormat(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - listFlags = tt.Flags - formattedList := formatListSuccess(tt.Apps) + listFlags = tc.Flags + formattedList := formatListSuccess(tc.Apps) for ii, value := range formattedList { formattedList[ii] = strings.TrimRight(value, ":") } - for _, value := range tt.Expected { + for _, value := range tc.Expected { assert.Contains(t, strings.Join(formattedList, "\n"), value) } }) diff --git a/cmd/collaborators/collaborators_test.go b/cmd/collaborators/collaborators_test.go index 4b0bf1a5..972a03d2 100644 --- a/cmd/collaborators/collaborators_test.go +++ b/cmd/collaborators/collaborators_test.go @@ -98,28 +98,28 @@ func TestCollaboratorsCommand(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) appSelectMock := prompts.NewAppSelectMock() appSelectPromptFunc = appSelectMock.AppSelectPrompt - appSelectMock.On("AppSelectPrompt", mock.Anything, mock.Anything, prompts.ShowHostedOnly, prompts.ShowInstalledAndUninstalledApps).Return(prompts.SelectedApp{App: tt.app, Auth: types.SlackAuth{}}, nil) + appSelectMock.On("AppSelectPrompt", mock.Anything, mock.Anything, prompts.ShowHostedOnly, prompts.ShowInstalledAndUninstalledApps).Return(prompts.SelectedApp{App: tc.app, Auth: types.SlackAuth{}}, nil) clientsMock := shared.NewClientsMock() clientsMock.AddDefaultMocks() clientsMock.API.On("ListCollaborators", mock.Anything, mock.Anything, mock.Anything). - Return(tt.collaborators, nil) + Return(tc.collaborators, nil) clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(clients *shared.ClientFactory) { clients.SDKConfig = hooks.NewSDKConfigMock() }) err := NewCommand(clients).ExecuteContext(ctx) require.NoError(t, err) - clientsMock.API.AssertCalled(t, "ListCollaborators", mock.Anything, mock.Anything, tt.app.AppID) + clientsMock.API.AssertCalled(t, "ListCollaborators", mock.Anything, mock.Anything, tc.app.AppID) clientsMock.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.CollaboratorListSuccess, mock.Anything) clientsMock.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.CollaboratorListCount, []string{ - fmt.Sprintf("%d", len(tt.collaborators)), + fmt.Sprintf("%d", len(tc.collaborators)), }) - for _, collaborator := range tt.collaborators { + for _, collaborator := range tc.collaborators { clientsMock.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.CollaboratorListCollaborator, []string{ collaborator.ID, collaborator.UserName, @@ -128,7 +128,7 @@ func TestCollaboratorsCommand(t *testing.T) { }) } output := clientsMock.GetCombinedOutput() - for _, expectedOutput := range tt.expectedOutputs { + for _, expectedOutput := range tc.expectedOutputs { require.Contains(t, output, expectedOutput) } }) diff --git a/cmd/collaborators/list_test.go b/cmd/collaborators/list_test.go index 1d4e7a9d..d0d433e1 100644 --- a/cmd/collaborators/list_test.go +++ b/cmd/collaborators/list_test.go @@ -98,28 +98,28 @@ func TestListCommand(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) appSelectMock := prompts.NewAppSelectMock() appSelectPromptFunc = appSelectMock.AppSelectPrompt - appSelectMock.On("AppSelectPrompt", mock.Anything, mock.Anything, prompts.ShowHostedOnly, prompts.ShowInstalledAndUninstalledApps).Return(prompts.SelectedApp{App: tt.app, Auth: types.SlackAuth{}}, nil) + appSelectMock.On("AppSelectPrompt", mock.Anything, mock.Anything, prompts.ShowHostedOnly, prompts.ShowInstalledAndUninstalledApps).Return(prompts.SelectedApp{App: tc.app, Auth: types.SlackAuth{}}, nil) clientsMock := shared.NewClientsMock() clientsMock.AddDefaultMocks() clientsMock.API.On("ListCollaborators", mock.Anything, mock.Anything, mock.Anything). - Return(tt.collaborators, nil) + Return(tc.collaborators, nil) clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(clients *shared.ClientFactory) { clients.SDKConfig = hooks.NewSDKConfigMock() }) err := NewListCommand(clients).ExecuteContext(ctx) require.NoError(t, err) - clientsMock.API.AssertCalled(t, "ListCollaborators", mock.Anything, mock.Anything, tt.app.AppID) + clientsMock.API.AssertCalled(t, "ListCollaborators", mock.Anything, mock.Anything, tc.app.AppID) clientsMock.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.CollaboratorListSuccess, mock.Anything) clientsMock.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.CollaboratorListCount, []string{ - fmt.Sprintf("%d", len(tt.collaborators)), + fmt.Sprintf("%d", len(tc.collaborators)), }) - for _, collaborator := range tt.collaborators { + for _, collaborator := range tc.collaborators { clientsMock.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.CollaboratorListCollaborator, []string{ collaborator.ID, collaborator.UserName, @@ -128,7 +128,7 @@ func TestListCommand(t *testing.T) { }) } output := clientsMock.GetCombinedOutput() - for _, expectedOutput := range tt.expectedOutputs { + for _, expectedOutput := range tc.expectedOutputs { require.Contains(t, output, expectedOutput) } }) diff --git a/cmd/datastore/bulk_delete_test.go b/cmd/datastore/bulk_delete_test.go index ca20ac1d..1b0e1d4c 100644 --- a/cmd/datastore/bulk_delete_test.go +++ b/cmd/datastore/bulk_delete_test.go @@ -102,7 +102,7 @@ func TestBulkDeleteCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -112,8 +112,8 @@ func TestBulkDeleteCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -121,18 +121,18 @@ func TestBulkDeleteCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewBulkDeleteCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } @@ -173,12 +173,12 @@ func TestBulkDeleteCommand(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := setupDatastoreMocks() - if tt.Setup != nil { - tt.Setup(clientsMock) + if tc.Setup != nil { + tc.Setup(clientsMock) } clients := shared.NewClientFactory(clientsMock.MockClientFactory()) @@ -198,12 +198,12 @@ func TestBulkDeleteCommand(t *testing.T) { // Create mocked command err := cmd.ExecuteContext(ctx) if assert.NoError(t, err) { - bulkDeleteMock.AssertCalled(t, "BulkDelete", mock.Anything, mock.Anything, mock.Anything, tt.Query) + bulkDeleteMock.AssertCalled(t, "BulkDelete", mock.Anything, mock.Anything, mock.Anything, tc.Query) } // Cleanup when done - if tt.Teardown != nil { - tt.Teardown() + if tc.Teardown != nil { + tc.Teardown() } }) } diff --git a/cmd/datastore/bulk_get_test.go b/cmd/datastore/bulk_get_test.go index 2735dee3..8b1c5ea6 100644 --- a/cmd/datastore/bulk_get_test.go +++ b/cmd/datastore/bulk_get_test.go @@ -102,7 +102,7 @@ func TestBulkGetCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -112,8 +112,8 @@ func TestBulkGetCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -121,18 +121,18 @@ func TestBulkGetCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewBulkGetCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } @@ -173,12 +173,12 @@ func TestBulkGetCommand(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := setupDatastoreMocks() - if tt.Setup != nil { - tt.Setup(clientsMock) + if tc.Setup != nil { + tc.Setup(clientsMock) } clients := shared.NewClientFactory(clientsMock.MockClientFactory()) @@ -198,12 +198,12 @@ func TestBulkGetCommand(t *testing.T) { // Perform test err := cmd.ExecuteContext(ctx) if assert.NoError(t, err) { - bulkGetMock.AssertCalled(t, "BulkGet", mock.Anything, mock.Anything, mock.Anything, tt.Query) + bulkGetMock.AssertCalled(t, "BulkGet", mock.Anything, mock.Anything, mock.Anything, tc.Query) } // Cleanup when done - if tt.Teardown != nil { - tt.Teardown() + if tc.Teardown != nil { + tc.Teardown() } }) } diff --git a/cmd/datastore/bulk_put_test.go b/cmd/datastore/bulk_put_test.go index fa3f99c9..66603b29 100644 --- a/cmd/datastore/bulk_put_test.go +++ b/cmd/datastore/bulk_put_test.go @@ -107,7 +107,7 @@ func TestBulkPutCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -117,8 +117,8 @@ func TestBulkPutCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -126,18 +126,18 @@ func TestBulkPutCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewBulkPutCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } @@ -190,12 +190,12 @@ func TestBulkPutCommand(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := setupDatastoreMocks() - if tt.Setup != nil { - tt.Setup(clientsMock) + if tc.Setup != nil { + tc.Setup(clientsMock) } clients := shared.NewClientFactory(clientsMock.MockClientFactory()) @@ -215,12 +215,12 @@ func TestBulkPutCommand(t *testing.T) { // Perform test err := cmd.ExecuteContext(ctx) if assert.NoError(t, err) { - bulkPutMock.AssertCalled(t, "BulkPut", mock.Anything, mock.Anything, mock.Anything, tt.Query) + bulkPutMock.AssertCalled(t, "BulkPut", mock.Anything, mock.Anything, mock.Anything, tc.Query) } // Cleanup when done - if tt.Teardown != nil { - tt.Teardown() + if tc.Teardown != nil { + tc.Teardown() } }) } diff --git a/cmd/datastore/count_test.go b/cmd/datastore/count_test.go index 7a52b2c5..7e5ca17e 100644 --- a/cmd/datastore/count_test.go +++ b/cmd/datastore/count_test.go @@ -90,7 +90,7 @@ func TestCountCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -100,8 +100,8 @@ func TestCountCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -109,18 +109,18 @@ func TestCountCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewCountCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } diff --git a/cmd/datastore/datastore_test.go b/cmd/datastore/datastore_test.go index 5d47c5d5..52398b4a 100644 --- a/cmd/datastore/datastore_test.go +++ b/cmd/datastore/datastore_test.go @@ -134,23 +134,23 @@ func TestSetQueryExpression(t *testing.T) { expectedError: slackerror.New(slackerror.ErrInvalidAppFlag), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := setupDatastoreMocks() - clientsMock.Config.AppFlag = tt.appFlag - if tt.datastoreFlag != "" { - err := clientsMock.Config.Flags.Lookup("datastore").Value.Set(tt.datastoreFlag) + clientsMock.Config.AppFlag = tc.appFlag + if tc.datastoreFlag != "" { + err := clientsMock.Config.Flags.Lookup("datastore").Value.Set(tc.datastoreFlag) require.NoError(t, err) clientsMock.Config.Flags.Lookup("datastore").Changed = true } clients := shared.NewClientFactory(clientsMock.MockClientFactory()) - err := setQueryExpression(clients, tt.query, tt.expression, tt.method) - if tt.expectedError != nil { + err := setQueryExpression(clients, tc.query, tc.expression, tc.method) + if tc.expectedError != nil { require.Error(t, err) - assert.Equal(t, tt.expectedError.(*slackerror.Error).Code, err.(*slackerror.Error).Code) + assert.Equal(t, tc.expectedError.(*slackerror.Error).Code, err.(*slackerror.Error).Code) } else { assert.NoError(t, err) - assert.Equal(t, tt.expectedQuery, tt.query) + assert.Equal(t, tc.expectedQuery, tc.query) } }) diff --git a/cmd/datastore/delete_test.go b/cmd/datastore/delete_test.go index d6236844..e9753f8f 100644 --- a/cmd/datastore/delete_test.go +++ b/cmd/datastore/delete_test.go @@ -104,7 +104,7 @@ func TestDeleteCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -114,8 +114,8 @@ func TestDeleteCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -123,18 +123,18 @@ func TestDeleteCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewDeleteCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } @@ -201,12 +201,12 @@ func TestDeleteCommand(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := setupDatastoreMocks() - if tt.Setup != nil { - tt.Setup(clientsMock) + if tc.Setup != nil { + tc.Setup(clientsMock) } clients := shared.NewClientFactory(clientsMock.MockClientFactory()) @@ -219,8 +219,8 @@ func TestDeleteCommand(t *testing.T) { // TODO: could maybe refactor this to the os/fs mocks level to more clearly communicate "fake being in an app directory" cmd.PreRunE = func(cmd *cobra.Command, args []string) error { clientsMock.Config.SetFlags(cmd) - if tt.Prompts != nil { - tt.Prompts(clientsMock) + if tc.Prompts != nil { + tc.Prompts(clientsMock) } return nil } @@ -229,12 +229,12 @@ func TestDeleteCommand(t *testing.T) { // Perform test err := cmd.ExecuteContext(ctx) if assert.NoError(t, err) { - deleteMock.AssertCalled(t, "Delete", mock.Anything, mock.Anything, mock.Anything, tt.Query) + deleteMock.AssertCalled(t, "Delete", mock.Anything, mock.Anything, mock.Anything, tc.Query) } // Cleanup when done - if tt.Teardown != nil { - tt.Teardown() + if tc.Teardown != nil { + tc.Teardown() } }) } diff --git a/cmd/datastore/get_test.go b/cmd/datastore/get_test.go index 1af0fa67..8c68454b 100644 --- a/cmd/datastore/get_test.go +++ b/cmd/datastore/get_test.go @@ -103,7 +103,7 @@ func TestGetCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -113,8 +113,8 @@ func TestGetCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -122,18 +122,18 @@ func TestGetCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewGetCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } @@ -200,12 +200,12 @@ func TestGetCommand(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := setupDatastoreMocks() - if tt.Setup != nil { - tt.Setup(clientsMock) + if tc.Setup != nil { + tc.Setup(clientsMock) } clients := shared.NewClientFactory(clientsMock.MockClientFactory()) @@ -218,8 +218,8 @@ func TestGetCommand(t *testing.T) { // TODO: could maybe refactor this to the os/fs mocks level to more clearly communicate "fake being in an app directory" cmd.PreRunE = func(cmd *cobra.Command, args []string) error { clientsMock.Config.SetFlags(cmd) - if tt.Prompts != nil { - tt.Prompts(clientsMock) + if tc.Prompts != nil { + tc.Prompts(clientsMock) } return nil } @@ -228,12 +228,12 @@ func TestGetCommand(t *testing.T) { // Perform test err := cmd.ExecuteContext(ctx) if assert.NoError(t, err) { - getMock.AssertCalled(t, "Get", mock.Anything, mock.Anything, mock.Anything, tt.Query) + getMock.AssertCalled(t, "Get", mock.Anything, mock.Anything, mock.Anything, tc.Query) } // Cleanup when done - if tt.Teardown != nil { - tt.Teardown() + if tc.Teardown != nil { + tc.Teardown() } }) } diff --git a/cmd/datastore/put_test.go b/cmd/datastore/put_test.go index 3c4d1812..74790246 100644 --- a/cmd/datastore/put_test.go +++ b/cmd/datastore/put_test.go @@ -104,7 +104,7 @@ func TestPutCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -114,8 +114,8 @@ func TestPutCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -123,18 +123,18 @@ func TestPutCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewPutCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } @@ -219,12 +219,12 @@ func TestPutCommand(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := setupDatastoreMocks() - if tt.Setup != nil { - tt.Setup(clientsMock) + if tc.Setup != nil { + tc.Setup(clientsMock) } clients := shared.NewClientFactory(clientsMock.MockClientFactory()) @@ -237,8 +237,8 @@ func TestPutCommand(t *testing.T) { // TODO: could maybe refactor this to the os/fs mocks level to more clearly communicate "fake being in an app directory" cmd.PreRunE = func(cmd *cobra.Command, args []string) error { clientsMock.Config.SetFlags(cmd) - if tt.Prompts != nil { - tt.Prompts(clientsMock) + if tc.Prompts != nil { + tc.Prompts(clientsMock) } return nil } @@ -247,12 +247,12 @@ func TestPutCommand(t *testing.T) { // Perform test err := cmd.ExecuteContext(ctx) if assert.NoError(t, err) { - putMock.AssertCalled(t, "Put", mock.Anything, mock.Anything, mock.Anything, tt.Query) + putMock.AssertCalled(t, "Put", mock.Anything, mock.Anything, mock.Anything, tc.Query) } // Cleanup when done - if tt.Teardown != nil { - tt.Teardown() + if tc.Teardown != nil { + tc.Teardown() } }) } diff --git a/cmd/datastore/query_test.go b/cmd/datastore/query_test.go index ed261f27..79e168c9 100644 --- a/cmd/datastore/query_test.go +++ b/cmd/datastore/query_test.go @@ -109,7 +109,7 @@ func TestQueryCommandPreRun(t *testing.T) { WithMessage("Output type for --to-file cannot be specified"), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -119,8 +119,8 @@ func TestQueryCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -128,25 +128,25 @@ func TestQueryCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewQueryCommand(clients) clients.Config.SetFlags(cmd) - if tt.mockFlagOutput != "" { + if tc.mockFlagOutput != "" { clients.Config.Flags.Lookup("output").Changed = true } - if tt.mockFlagToFile != "" { + if tc.mockFlagToFile != "" { clients.Config.Flags.Lookup("to-file").Changed = true } err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } @@ -316,12 +316,12 @@ func TestQueryCommand(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := setupDatastoreMocks() - if tt.Setup != nil { - tt.Setup(clientsMock) + if tc.Setup != nil { + tc.Setup(clientsMock) } clients := shared.NewClientFactory(clientsMock.MockClientFactory()) @@ -334,8 +334,8 @@ func TestQueryCommand(t *testing.T) { // TODO: could maybe refactor this to the os/fs mocks level to more clearly communicate "fake being in an app directory" cmd.PreRunE = func(cmd *cobra.Command, args []string) error { clientsMock.Config.SetFlags(cmd) - if tt.Prompts != nil { - tt.Prompts(clientsMock) + if tc.Prompts != nil { + tc.Prompts(clientsMock) } return nil } @@ -345,12 +345,12 @@ func TestQueryCommand(t *testing.T) { // Perform test err := cmd.ExecuteContext(ctx) if assert.NoError(t, err) { - queryMock.AssertCalled(t, "Query", mock.Anything, mock.Anything, mock.Anything, tt.Query) + queryMock.AssertCalled(t, "Query", mock.Anything, mock.Anything, mock.Anything, tc.Query) } // Cleanup when done - if tt.Teardown != nil { - tt.Teardown() + if tc.Teardown != nil { + tc.Teardown() } }) } @@ -379,11 +379,11 @@ func TestGetExpressionPatterns(t *testing.T) { ExpectedValues: []string{":ceil", ":low", ":high"}, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actualAttributes, actualValues := getExpressionPatterns(tt.Expression) - assert.Equal(t, tt.ExpectedAttributes, actualAttributes) - assert.Equal(t, tt.ExpectedValues, actualValues) + actualAttributes, actualValues := getExpressionPatterns(tc.Expression) + assert.Equal(t, tc.ExpectedAttributes, actualAttributes) + assert.Equal(t, tc.ExpectedValues, actualValues) }) } } diff --git a/cmd/datastore/update_test.go b/cmd/datastore/update_test.go index 61188e9b..0bab3e84 100644 --- a/cmd/datastore/update_test.go +++ b/cmd/datastore/update_test.go @@ -104,7 +104,7 @@ func TestUpdateCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -114,8 +114,8 @@ func TestUpdateCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -123,18 +123,18 @@ func TestUpdateCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewUpdateCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } @@ -317,12 +317,12 @@ func TestUpdateCommand(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := setupDatastoreMocks() - if tt.Setup != nil { - tt.Setup(clientsMock) + if tc.Setup != nil { + tc.Setup(clientsMock) } clients := shared.NewClientFactory(clientsMock.MockClientFactory()) @@ -335,8 +335,8 @@ func TestUpdateCommand(t *testing.T) { // TODO: could maybe refactor this to the os/fs mocks level to more clearly communicate "fake being in an app directory" cmd.PreRunE = func(cmd *cobra.Command, args []string) error { clientsMock.Config.SetFlags(cmd) - if tt.Prompts != nil { - tt.Prompts(clientsMock) + if tc.Prompts != nil { + tc.Prompts(clientsMock) } return nil } @@ -345,12 +345,12 @@ func TestUpdateCommand(t *testing.T) { // Perform test err := cmd.ExecuteContext(ctx) if assert.NoError(t, err) { - updateMock.AssertCalled(t, "Update", mock.Anything, mock.Anything, mock.Anything, tt.Query) + updateMock.AssertCalled(t, "Update", mock.Anything, mock.Anything, mock.Anything, tc.Query) } // Cleanup when done - if tt.Teardown != nil { - tt.Teardown() + if tc.Teardown != nil { + tc.Teardown() } }) } diff --git a/cmd/doctor/check_test.go b/cmd/doctor/check_test.go index d608c1e2..179d1730 100644 --- a/cmd/doctor/check_test.go +++ b/cmd/doctor/check_test.go @@ -142,7 +142,7 @@ func TestDoctorCheckProjectConfig(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() @@ -151,22 +151,22 @@ func TestDoctorCheckProjectConfig(t *testing.T) { slackmock.CreateProject(t, ctx, clients.Fs, clients.Os, slackdeps.MockWorkingDirectory) - _, err := config.WriteProjectConfigFile(ctx, clients.Fs, clients.Os, tt.projectConfig) + _, err := config.WriteProjectConfigFile(ctx, clients.Fs, clients.Os, tc.projectConfig) require.NoError(t, err) expected := Section{ Label: "Configurations", Value: "your project's CLI settings", Subsections: []Section{}, - Errors: tt.expectedErrors, + Errors: tc.expectedErrors, } - if tt.expectedManifestSourceSection != nil { - expected.Subsections = append(expected.Subsections, *tt.expectedManifestSourceSection) + if tc.expectedManifestSourceSection != nil { + expected.Subsections = append(expected.Subsections, *tc.expectedManifestSourceSection) } - if tt.expectedProjectSection != nil { - expected.Subsections = append(expected.Subsections, *tt.expectedProjectSection) + if tc.expectedProjectSection != nil { + expected.Subsections = append(expected.Subsections, *tc.expectedProjectSection) } section := checkProjectConfig(ctx, clients) @@ -222,17 +222,17 @@ func TestDoctorCheckProjectDeps(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() clientsMock.AddDefaultMocks() - clients := tt.mockHookSetup(clientsMock) + clients := tc.mockHookSetup(clientsMock) expected := Section{ Label: "Dependencies", Value: "requisites for development", - Subsections: tt.expectedSubsections, - Errors: tt.expectedErrorSection, + Subsections: tc.expectedSubsections, + Errors: tc.expectedErrorSection, } section := checkProjectDeps(ctx, clients) @@ -250,14 +250,14 @@ func TestDoctorCheckCLIConfig(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() clientsMock.AddDefaultMocks() scm := &config.SystemConfigMock{} scm.On("UserConfig", mock.Anything).Return(&config.SystemConfig{ - SystemID: tt.systemID, + SystemID: tc.systemID, }, nil) clientsMock.Config.SystemConfig = scm clients := shared.NewClientFactory(clientsMock.MockClientFactory()) @@ -267,7 +267,7 @@ func TestDoctorCheckCLIConfig(t *testing.T) { Subsections: []Section{ { Label: "System ID", - Value: tt.systemID, + Value: tc.systemID, Subsections: []Section{}, Errors: []slackerror.Error{}, }, @@ -423,11 +423,11 @@ func TestDoctorCheckCLICreds(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() - clientsMock.Auth.On("Auths", mock.Anything).Return(tt.mockAuths, nil) + clientsMock.Auth.On("Auths", mock.Anything).Return(tc.mockAuths, nil) clientsMock.Auth.On("ResolveAPIHost", mock.Anything, mock.Anything, mock.Anything).Return("https://slack.com/api/", nil) clientsMock.API.On("ValidateSession", mock.Anything, mock.Anything).Return(api.AuthSession{}, nil) clientsMock.AddDefaultMocks() @@ -435,8 +435,8 @@ func TestDoctorCheckCLICreds(t *testing.T) { expected := Section{ Label: "Credentials", Value: "your Slack authentication", - Subsections: tt.expectedSections, - Errors: tt.expectedErrorSection, + Subsections: tc.expectedSections, + Errors: tc.expectedErrorSection, } section, err := checkCLICreds(ctx, clients) @@ -520,17 +520,17 @@ func TestDoctorCheckProjectTooling(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() clientsMock.AddDefaultMocks() - clients := tt.mockHookSetup(clientsMock) + clients := tc.mockHookSetup(clientsMock) expected := Section{ Label: "Runtime", Value: "foundations for the application", - Subsections: tt.expectedSubsections, - Errors: tt.expectedErrorSection, + Subsections: tc.expectedSubsections, + Errors: tc.expectedErrorSection, } section := checkProjectTooling(ctx, clients) diff --git a/cmd/doctor/doctor_test.go b/cmd/doctor/doctor_test.go index 61d47c9f..d0f7764e 100644 --- a/cmd/doctor/doctor_test.go +++ b/cmd/doctor/doctor_test.go @@ -393,19 +393,19 @@ func TestDoctorHook(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() clientsMock.AddDefaultMocks() - clients := tt.mockHookSetup(clientsMock) + clients := tc.mockHookSetup(clientsMock) response, err := doctorHook(ctx, clients) - if tt.expectedError != nil { + if tc.expectedError != nil { assert.Error(t, err) - assert.Equal(t, tt.expectedError, err) + assert.Equal(t, tc.expectedError, err) } else { assert.NoError(t, err) - assert.Equal(t, tt.expectedHook, response) + assert.Equal(t, tc.expectedHook, response) } }) } diff --git a/cmd/env/add_test.go b/cmd/env/add_test.go index 9e8f8f1d..d16779eb 100644 --- a/cmd/env/add_test.go +++ b/cmd/env/add_test.go @@ -103,7 +103,7 @@ func Test_Env_AddCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -113,8 +113,8 @@ func Test_Env_AddCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -122,18 +122,18 @@ func Test_Env_AddCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewEnvAddCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } diff --git a/cmd/env/list_test.go b/cmd/env/list_test.go index 1b64c78b..304ca1f0 100644 --- a/cmd/env/list_test.go +++ b/cmd/env/list_test.go @@ -90,7 +90,7 @@ func Test_Env_ListCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -100,8 +100,8 @@ func Test_Env_ListCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -109,18 +109,18 @@ func Test_Env_ListCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewEnvListCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } diff --git a/cmd/env/remove_test.go b/cmd/env/remove_test.go index 57d8aac3..07e4f0c7 100644 --- a/cmd/env/remove_test.go +++ b/cmd/env/remove_test.go @@ -91,7 +91,7 @@ func Test_Env_RemoveCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -101,8 +101,8 @@ func Test_Env_RemoveCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -110,18 +110,18 @@ func Test_Env_RemoveCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewEnvRemoveCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } diff --git a/cmd/externalauth/add_secret_test.go b/cmd/externalauth/add_secret_test.go index 4151f742..0a505216 100644 --- a/cmd/externalauth/add_secret_test.go +++ b/cmd/externalauth/add_secret_test.go @@ -91,7 +91,7 @@ func TestExternalAuthAddClientSecretCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -101,8 +101,8 @@ func TestExternalAuthAddClientSecretCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -110,18 +110,18 @@ func TestExternalAuthAddClientSecretCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewAddClientSecretCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } diff --git a/cmd/externalauth/add_test.go b/cmd/externalauth/add_test.go index 85f50ca3..568d68f1 100644 --- a/cmd/externalauth/add_test.go +++ b/cmd/externalauth/add_test.go @@ -91,7 +91,7 @@ func TestExternalAuthAddCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -101,8 +101,8 @@ func TestExternalAuthAddCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -110,18 +110,18 @@ func TestExternalAuthAddCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewAddCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } diff --git a/cmd/externalauth/remove_test.go b/cmd/externalauth/remove_test.go index 5eeae354..2b11d55d 100644 --- a/cmd/externalauth/remove_test.go +++ b/cmd/externalauth/remove_test.go @@ -90,7 +90,7 @@ func TestExternalAuthRemoveCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -100,8 +100,8 @@ func TestExternalAuthRemoveCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -109,18 +109,18 @@ func TestExternalAuthRemoveCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewRemoveCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } diff --git a/cmd/externalauth/select_auth_test.go b/cmd/externalauth/select_auth_test.go index d24ce36f..b3bdb572 100644 --- a/cmd/externalauth/select_auth_test.go +++ b/cmd/externalauth/select_auth_test.go @@ -91,7 +91,7 @@ func TestExternalAuthSelectAuthCommandPreRun(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppNotHosted), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() manifestMock := &app.ManifestMockObject{} @@ -101,8 +101,8 @@ func TestExternalAuthSelectAuthCommandPreRun(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() @@ -110,18 +110,18 @@ func TestExternalAuthSelectAuthCommandPreRun(t *testing.T) { "GetManifestSource", mock.Anything, ).Return( - tt.mockManifestSource, + tc.mockManifestSource, nil, ) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.Config.ForceFlag = tt.mockFlagForce - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.Config.ForceFlag = tc.mockFlagForce + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) cmd := NewSelectAuthCommand(clients) err := cmd.PreRunE(cmd, nil) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(tt.expectedError).Code, slackerror.ToSlackError(err).Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } else { assert.NoError(t, err) } diff --git a/cmd/function/access_test.go b/cmd/function/access_test.go index ce23a01f..300d52b4 100644 --- a/cmd/function/access_test.go +++ b/cmd/function/access_test.go @@ -325,14 +325,14 @@ func TestFunctionDistributionCommand_PermissionsFile(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() clientsMock.IO.AddDefaultMocks() - err := afero.WriteFile(clientsMock.Fs, tt.filename, []byte(tt.data), 0644) + err := afero.WriteFile(clientsMock.Fs, tc.filename, []byte(tc.data), 0644) require.NoError(t, err) - for function, permissions := range tt.functions { + for function, permissions := range tc.functions { clientsMock.API.On("FunctionDistributionList", mock.Anything, function, mock.Anything). Return(permissions.currentType, permissions.currentEntities, nil) } @@ -344,16 +344,16 @@ func TestFunctionDistributionCommand_PermissionsFile(t *testing.T) { clients := shared.NewClientFactory(clientsMock.MockClientFactory()) app := types.App{AppID: "A123"} - err = distributePermissionFile(ctx, clients, app, tt.filename) - if err != nil || tt.expectedError != nil { + err = distributePermissionFile(ctx, clients, app, tc.filename) + if err != nil || tc.expectedError != nil { assert.Equal(t, - slackerror.ToSlackError(tt.expectedError).Code, + slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code) } - if clientsMock.GetCombinedOutput() != "" || tt.expectedWarn != "" { - assert.Contains(t, clientsMock.GetCombinedOutput(), tt.expectedWarn) + if clientsMock.GetCombinedOutput() != "" || tc.expectedWarn != "" { + assert.Contains(t, clientsMock.GetCombinedOutput(), tc.expectedWarn) } - for function, permissions := range tt.functions { + for function, permissions := range tc.functions { entityIDs := []string{} for _, entity := range permissions.expectedEntities { entityIDs = append(entityIDs, entity.ID) @@ -399,7 +399,7 @@ func TestFunctionDistributeCommand_UpdateNamedEntitiesDistribution(t *testing.T) }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() @@ -407,7 +407,7 @@ func TestFunctionDistributeCommand_UpdateNamedEntitiesDistribution(t *testing.T) Return([]types.FunctionDistributionUser{}, nil). Run(func(args mock.Arguments) { clientsMock.API.On("FunctionDistributionList", mock.Anything, mock.Anything, mock.Anything). - Return(types.PermissionNamedEntities, tt.currentEntities, nil). + Return(types.PermissionNamedEntities, tc.currentEntities, nil). Run(func(args mock.Arguments) { clientsMock.API.On("FunctionDistributionRemoveUsers", mock.Anything, mock.Anything, mock.Anything, mock.Anything). Return(nil) @@ -418,12 +418,12 @@ func TestFunctionDistributeCommand_UpdateNamedEntitiesDistribution(t *testing.T) function := "Ft123" clients := shared.NewClientFactory(clientsMock.MockClientFactory()) - err := updateNamedEntitiesDistribution(ctx, clients, app, function, tt.updatedEntities) + err := updateNamedEntitiesDistribution(ctx, clients, app, function, tc.updatedEntities) assert.NoError(t, err) clientsMock.API.AssertCalled(t, "FunctionDistributionList", mock.Anything, function, app.AppID) - entities := strings.Join(tt.updatedEntities, ",") + entities := strings.Join(tc.updatedEntities, ",") clientsMock.API.AssertCalled(t, "FunctionDistributionSet", mock.Anything, function, app.AppID, types.PermissionNamedEntities, entities) - clientsMock.API.AssertCalled(t, "FunctionDistributionRemoveUsers", mock.Anything, function, app.AppID, tt.removedEntities) + clientsMock.API.AssertCalled(t, "FunctionDistributionRemoveUsers", mock.Anything, function, app.AppID, tc.removedEntities) }) } } diff --git a/cmd/function/prompt_test.go b/cmd/function/prompt_test.go index 960957de..dbf5b3ef 100644 --- a/cmd/function/prompt_test.go +++ b/cmd/function/prompt_test.go @@ -59,18 +59,18 @@ func TestFunction_ChooseFunctionPrompt(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() clientsMock.IO.On("SelectPrompt", mock.Anything, "Choose a function", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{ Flag: clientsMock.Config.Flags.Lookup("name"), })).Return(iostreams.SelectPromptResponse{ - Flag: tt.withFlag, - Prompt: tt.withPrompt, - Option: tt.flag, - Index: tt.selectIndex, - }, tt.withError) + Flag: tc.withFlag, + Prompt: tc.withPrompt, + Option: tc.flag, + Index: tc.selectIndex, + }, tc.withError) sdkConfigMock := hooks.NewSDKConfigMock() sdkConfigMock.Hooks.GetManifest.Command = "example" clientsMock.AddDefaultMocks() @@ -85,10 +85,10 @@ func TestFunction_ChooseFunctionPrompt(t *testing.T) { {CallbackID: "goodbye_function"}, } value, err := chooseFunctionPrompt(ctx, clients, functions) - if err != nil || tt.expectedError != nil { - assert.Equal(t, tt.expectedError, err) + if err != nil || tc.expectedError != nil { + assert.Equal(t, tc.expectedError, err) } else { - assert.Equal(t, tt.expectedValue, value) + assert.Equal(t, tc.expectedValue, value) } }) } diff --git a/cmd/help/help_test.go b/cmd/help/help_test.go index c0686e1f..eeab6c75 100644 --- a/cmd/help/help_test.go +++ b/cmd/help/help_test.go @@ -65,7 +65,7 @@ func TestHelpFunc(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Remove any enabled experiments during the test and restore afterward var _EnabledExperiments = experiment.EnabledExperiments @@ -78,12 +78,12 @@ func TestHelpFunc(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() clientsMock.AddDefaultMocks() - clientsMock.Config.ExperimentsFlag = tt.experiments + clientsMock.Config.ExperimentsFlag = tc.experiments rootCmd := &cobra.Command{ Use: "root", Aliases: []string{"su"}, Run: func(cmd *cobra.Command, args []string) {}, - Example: style.ExampleCommandsf(tt.exampleCommands), + Example: style.ExampleCommandsf(tc.exampleCommands), } subCommand := &cobra.Command{ Use: "demo", @@ -99,7 +99,7 @@ func TestHelpFunc(t *testing.T) { helpFunc := HelpFunc(clients, map[string]string{}) helpFunc(rootCmd, []string{}) - for _, expectedString := range tt.expectedOutput { + for _, expectedString := range tc.expectedOutput { assert.Contains(t, clientsMock.GetStdoutOutput(), expectedString) } }) diff --git a/cmd/platform/deploy_test.go b/cmd/platform/deploy_test.go index b03b0eb6..3f07d133 100644 --- a/cmd/platform/deploy_test.go +++ b/cmd/platform/deploy_test.go @@ -160,32 +160,32 @@ func TestDeployCommand_HasValidDeploymentMethod(t *testing.T) { expectedError: slackerror.New(slackerror.ErrSDKHookNotFound), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(clients *shared.ClientFactory) { manifestMock := &app.ManifestMockObject{} - manifestMock.On("GetManifestLocal", mock.Anything, mock.Anything, mock.Anything).Return(tt.manifest, tt.manifestError) - manifestMock.On("GetManifestRemote", mock.Anything, mock.Anything, mock.Anything).Return(tt.manifest, tt.manifestError) + manifestMock.On("GetManifestLocal", mock.Anything, mock.Anything, mock.Anything).Return(tc.manifest, tc.manifestError) + manifestMock.On("GetManifestRemote", mock.Anything, mock.Anything, mock.Anything).Return(tc.manifest, tc.manifestError) clients.AppClient().Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() projectConfigMock.On("GetManifestSource", mock.Anything). - Return(tt.manifestSource, nil) + Return(tc.manifestSource, nil) clients.Config.ProjectConfig = projectConfigMock clients.SDKConfig = hooks.NewSDKConfigMock() - clients.SDKConfig.Hooks.Deploy.Command = tt.deployScript + clients.SDKConfig.Hooks.Deploy.Command = tc.deployScript }) app := types.App{} - if tt.app.AppID != "" { - app = tt.app + if tc.app.AppID != "" { + app = tc.app } err := hasValidDeploymentMethod(ctx, clients, app, types.SlackAuth{}) - if tt.expectedError != nil { + if tc.expectedError != nil { require.Error(t, err) assert.Equal( t, - slackerror.ToSlackError(tt.expectedError).Code, + slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code, ) } else { @@ -250,14 +250,14 @@ func TestDeployCommand_DeployHook(t *testing.T) { } return contains } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() clientsMock.AddDefaultMocks() sdkConfigMock := hooks.NewSDKConfigMock() sdkConfigMock.Config.SupportedProtocols = []hooks.Protocol{hooks.HookProtocolDefault} - sdkConfigMock.Hooks.Deploy = hooks.HookScript{Name: "Deploy", Command: tt.command} + sdkConfigMock.Hooks.Deploy = hooks.HookScript{Name: "Deploy", Command: tc.command} stdoutLogger := log.Logger{} stdoutBuffer := bytes.Buffer{} @@ -282,16 +282,16 @@ func TestDeployCommand_DeployHook(t *testing.T) { testutil.MockCmdIO(clients.IO, cmd) err := cmd.ExecuteContext(ctx) - assert.Contains(t, stdoutBuffer.String(), tt.command) - if tt.expectedError != nil { + assert.Contains(t, stdoutBuffer.String(), tc.command) + if tc.expectedError != nil { require.Error(t, err) - assert.Equal(t, err.(*slackerror.Error).Code, tt.expectedError.(*slackerror.Error).Code) - assert.Contains(t, stdoutBuffer.String(), tt.expectedStdout) - assert.True(t, containsSubstring(stderrBuffer.String(), tt.expectedStderr)) + assert.Equal(t, err.(*slackerror.Error).Code, tc.expectedError.(*slackerror.Error).Code) + assert.Contains(t, stdoutBuffer.String(), tc.expectedStdout) + assert.True(t, containsSubstring(stderrBuffer.String(), tc.expectedStderr)) } else { assert.NoError(t, err) - assert.Contains(t, stdoutBuffer.String(), tt.expectedStdout) - assert.True(t, containsSubstring(stderrBuffer.String(), tt.expectedStderr)) + assert.Contains(t, stdoutBuffer.String(), tc.expectedStdout) + assert.True(t, containsSubstring(stderrBuffer.String(), tc.expectedStderr)) } }) } @@ -339,19 +339,19 @@ func TestDeployCommand_PrintHostingCompletion(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() clientsMock.API.On("Host").Return("https://slacker.com") clientsMock.AddDefaultMocks() clients := shared.NewClientFactory(clientsMock.MockClientFactory()) cmd := NewDeployCommand(clients) - log := &logger.LogEvent{Data: tt.event} + log := &logger.LogEvent{Data: tc.event} err := printDeployHostingCompletion(clients, cmd, log) assert.NoError(t, err) clientsMock.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.PlatformDeploySuccess, mock.Anything) spinnerText, _ := deploySpinner.Status() - for _, line := range tt.expected { + for _, line := range tc.expected { assert.Contains(t, spinnerText, line) } }) diff --git a/cmd/platform/run_test.go b/cmd/platform/run_test.go index 8d478df7..d098d676 100644 --- a/cmd/platform/run_test.go +++ b/cmd/platform/run_test.go @@ -204,7 +204,7 @@ func TestRunCommand_Flags(t *testing.T) { }), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() @@ -212,12 +212,12 @@ func TestRunCommand_Flags(t *testing.T) { clientsMock.IO.AddDefaultMocks() clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(clients *shared.ClientFactory) { clients.SDKConfig = hooks.NewSDKConfigMock() - clients.Config.AppFlag = tt.appFlag - clients.Config.TokenFlag = tt.tokenFlag + clients.Config.AppFlag = tc.appFlag + clients.Config.TokenFlag = tc.tokenFlag }) appSelectMock := prompts.NewAppSelectMock() - appSelectMock.On("AppSelectPrompt", mock.Anything, mock.Anything, prompts.ShowLocalOnly, prompts.ShowAllApps).Return(tt.selectedAppAuth, tt.selectedAppErr) + appSelectMock.On("AppSelectPrompt", mock.Anything, mock.Anything, prompts.ShowLocalOnly, prompts.ShowAllApps).Return(tc.selectedAppAuth, tc.selectedAppErr) runAppSelectPromptFunc = appSelectMock.AppSelectPrompt runPkgMock := new(RunPkgMock) @@ -226,19 +226,19 @@ func TestRunCommand_Flags(t *testing.T) { cmd := NewRunCommand(clients) testutil.MockCmdIO(clients.IO, cmd) - cmd.SetArgs(tt.cmdArgs) + cmd.SetArgs(tc.cmdArgs) // Execute err := cmd.ExecuteContext(ctx) // Check args passed into the run function - if tt.expectedErr == nil { + if tc.expectedErr == nil { assert.NoError(t, err) runPkgMock.AssertCalled(t, "Run", mock.Anything, mock.Anything, mock.Anything, - tt.expectedRunArgs, + tc.expectedRunArgs, ) } else { - assert.Equal(t, tt.expectedErr, slackerror.ToSlackError(err)) + assert.Equal(t, tc.expectedErr, slackerror.ToSlackError(err)) } }) } diff --git a/cmd/project/create_samples_test.go b/cmd/project/create_samples_test.go index a9c7e28c..63e62552 100644 --- a/cmd/project/create_samples_test.go +++ b/cmd/project/create_samples_test.go @@ -101,12 +101,12 @@ func TestSamples_PromptSampleSelection(t *testing.T) { expectedRepository: "slack-samples/deno-blank-template", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) sampler := create.NewMockSampler() w := httptest.NewRecorder() - _, _ = io.WriteString(w, tt.mockSlackHTTPResponse) + _, _ = io.WriteString(w, tc.mockSlackHTTPResponse) res := w.Result() sampler.On("Do", mock.Anything).Return(res, nil) clientsMock := shared.NewClientsMock() @@ -128,15 +128,15 @@ func TestSamples_PromptSampleSelection(t *testing.T) { iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{ Flag: clientsMock.Config.Flags.Lookup("template"), }), - ).Return(tt.mockSelection, nil) + ).Return(tc.mockSelection, nil) clients := shared.NewClientFactory(clientsMock.MockClientFactory()) // Execute test samples, err := create.GetSampleRepos(sampler) require.NoError(t, err) repoName, err := promptSampleSelection(ctx, clients, samples) - assert.Equal(t, tt.expectedError, err) - assert.Equal(t, tt.expectedRepository, repoName) + assert.Equal(t, tc.expectedError, err) + assert.Equal(t, tc.expectedRepository, repoName) }) } } @@ -159,10 +159,10 @@ func TestSamples_FilterRepos(t *testing.T) { expectedRepos: 4, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - filteredRepos := filterRepos(mockGitHubRepos, tt.language) - assert.Equal(t, tt.expectedRepos, len(filteredRepos)) + filteredRepos := filterRepos(mockGitHubRepos, tc.language) + assert.Equal(t, tc.expectedRepos, len(filteredRepos)) }) } } diff --git a/cmd/project/create_test.go b/cmd/project/create_test.go index 726cb961..d5137c53 100644 --- a/cmd/project/create_test.go +++ b/cmd/project/create_test.go @@ -246,23 +246,23 @@ func TestCreateCommand_confirmExternalTemplateSelection(t *testing.T) { } // test! - for ttName, tt := range tests { - t.Run(ttName, func(t *testing.T) { + for name, tc := range tests { + t.Run(name, func(t *testing.T) { // setup cm := shared.NewClientsMock() cm.AddDefaultMocks() scm := &config.SystemConfigMock{} - tt.setup(cm, scm) + tc.setup(cm, scm) cm.Config.SystemConfig = scm clients := shared.NewClientFactory(cm.MockClientFactory()) cmd := NewCreateCommand(clients) testutil.MockCmdIO(clients.IO, cmd) // test - template, err := create.ResolveTemplateURL(tt.templateSource) + template, err := create.ResolveTemplateURL(tc.templateSource) require.NoError(t, err) confirmed, err := confirmExternalTemplateSelection(cmd, clients, template) - tt.expect(confirmed, err, cm, scm) + tc.expect(confirmed, err, cm, scm) }) } } diff --git a/cmd/root_test.go b/cmd/root_test.go index 47a7a372..5760529b 100644 --- a/cmd/root_test.go +++ b/cmd/root_test.go @@ -120,7 +120,7 @@ func TestExecuteContext(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) @@ -129,14 +129,14 @@ func TestExecuteContext(t *testing.T) { clientsMock.AddDefaultMocks() clientsMock.EventTracker.On("FlushToLogstash", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil) clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(clients *shared.ClientFactory) { - clients.SDKConfig.Runtime = tt.mockRuntime + clients.SDKConfig.Runtime = tc.mockRuntime }) // Mock command cmd := &cobra.Command{ Use: "mock [flags]", RunE: func(cmd *cobra.Command, args []string) error { - return tt.mockErr + return tc.mockErr }, } testutil.MockCmdIO(clientsMock.IO, cmd) @@ -146,13 +146,13 @@ func TestExecuteContext(t *testing.T) { output := clientsMock.GetCombinedOutput() // Assertions - require.Equal(t, tt.expectedExitCode, clients.IO.GetExitCode()) - clientsMock.EventTracker.AssertCalled(t, "FlushToLogstash", mock.Anything, mock.Anything, mock.Anything, tt.expectedExitCode) + require.Equal(t, tc.expectedExitCode, clients.IO.GetExitCode()) + clientsMock.EventTracker.AssertCalled(t, "FlushToLogstash", mock.Anything, mock.Anything, mock.Anything, tc.expectedExitCode) - for _, expectedOutput := range tt.expectedOutputs { + for _, expectedOutput := range tc.expectedOutputs { require.Contains(t, output, expectedOutput) } - for _, unexpectedOutputs := range tt.unexpectedOutputs { + for _, unexpectedOutputs := range tc.unexpectedOutputs { require.NotContains(t, output, unexpectedOutputs) } }) @@ -263,11 +263,11 @@ func Test_Aliases(t *testing.T) { expected: "app uninstall", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - output, err := testExecCmd(ctx, strings.Fields(tt.args)) + output, err := testExecCmd(ctx, strings.Fields(tc.args)) require.NoError(t, err) - require.Contains(t, output, tt.expected) + require.Contains(t, output, tc.expected) }) } } diff --git a/cmd/triggers/generate_test.go b/cmd/triggers/generate_test.go index 358c6627..bfd9f134 100644 --- a/cmd/triggers/generate_test.go +++ b/cmd/triggers/generate_test.go @@ -43,7 +43,7 @@ type unitTest struct { func Test_TriggerGenerate_accept_prompt(t *testing.T) { projDir, _ := os.Getwd() - tt := unitTest{ + tc := unitTest{ name: "Accept prompt to create a trigger", triggersListResponse: []types.DeployedTrigger{}, // no existing triggers globResponse: []string{fmt.Sprintf("%v/triggers/trigger.ts", projDir)}, @@ -54,8 +54,8 @@ func Test_TriggerGenerate_accept_prompt(t *testing.T) { }, } - t.Run(tt.name, func(t *testing.T) { - ctx, clientsMock := prepareMocks(t, tt.triggersListResponse, tt.globResponse, tt.triggersCreateResponse, nil /*trigger create error*/) + t.Run(tc.name, func(t *testing.T) { + ctx, clientsMock := prepareMocks(t, tc.triggersListResponse, tc.globResponse, tc.triggersCreateResponse, nil /*trigger create error*/) clientsMock.IO.On("SelectPrompt", mock.Anything, "Choose a trigger definition file:", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{ Flag: clientsMock.Config.Flags.Lookup("trigger-def"), @@ -77,13 +77,13 @@ func Test_TriggerGenerate_accept_prompt(t *testing.T) { // Execute test trigger, err := TriggerGenerate(ctx, clients, types.App{}) - tt.check(t, trigger, err) + tc.check(t, trigger, err) }) } func Test_TriggerGenerate_decline_prompt(t *testing.T) { projDir, _ := os.Getwd() - tt := unitTest{ + tc := unitTest{ name: "Decline prompt to create a trigger", triggersListResponse: []types.DeployedTrigger{}, // no existing triggers triggersCreateResponse: types.DeployedTrigger{}, @@ -94,8 +94,8 @@ func Test_TriggerGenerate_decline_prompt(t *testing.T) { }, } - t.Run(tt.name, func(t *testing.T) { - ctx, clientsMock := prepareMocks(t, tt.triggersListResponse, tt.globResponse, tt.triggersCreateResponse, nil /*trigger create error*/) + t.Run(tc.name, func(t *testing.T) { + ctx, clientsMock := prepareMocks(t, tc.triggersListResponse, tc.globResponse, tc.triggersCreateResponse, nil /*trigger create error*/) clientsMock.IO.On("SelectPrompt", mock.Anything, "Choose a trigger definition file:", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{ Flag: clientsMock.Config.Flags.Lookup("trigger-def"), })).Return(iostreams.SelectPromptResponse{ @@ -113,12 +113,12 @@ func Test_TriggerGenerate_decline_prompt(t *testing.T) { // Execute test trigger, err := TriggerGenerate(ctx, clients, types.App{}) - tt.check(t, trigger, err) + tc.check(t, trigger, err) }) } func Test_TriggerGenerate_skip_prompt(t *testing.T) { - tt := unitTest{ + tc := unitTest{ name: "Skip prompt if app has at least one trigger", triggersListResponse: []types.DeployedTrigger{{Name: "existing trigger", ID: "Ft456", Type: "scheduled"}}, check: func(t *testing.T, trigger *types.DeployedTrigger, err error) { @@ -127,8 +127,8 @@ func Test_TriggerGenerate_skip_prompt(t *testing.T) { }, } - t.Run(tt.name, func(t *testing.T) { - ctx, clientsMock := prepareMocks(t, tt.triggersListResponse, tt.globResponse, tt.triggersCreateResponse, nil /*trigger create error*/) + t.Run(tc.name, func(t *testing.T) { + ctx, clientsMock := prepareMocks(t, tc.triggersListResponse, tc.globResponse, tc.triggersCreateResponse, nil /*trigger create error*/) clientsMock.API.On("ListCollaborators", mock.Anything, mock.Anything, mock.Anything).Return([]types.SlackUser{}, nil) clientsMock.API.On("TriggerPermissionsList", mock.Anything, mock.Anything, mock.Anything). Return(types.PermissionEveryone, []string{}, nil).Once() @@ -141,13 +141,13 @@ func Test_TriggerGenerate_skip_prompt(t *testing.T) { // Execute test trigger, err := TriggerGenerate(ctx, clients, types.App{}) - tt.check(t, trigger, err) + tc.check(t, trigger, err) }) } func Test_TriggerGenerate_handle_error(t *testing.T) { projDir, _ := os.Getwd() - tt := unitTest{ + tc := unitTest{ name: "Handle error on trigger creation", triggersListResponse: []types.DeployedTrigger{}, // no existing triggers globResponse: []string{fmt.Sprintf("%v/triggers/trigger.ts", projDir)}, @@ -158,8 +158,8 @@ func Test_TriggerGenerate_handle_error(t *testing.T) { }, } - t.Run(tt.name, func(t *testing.T) { - ctx, clientsMock := prepareMocks(t, tt.triggersListResponse, tt.globResponse, tt.triggersCreateResponse, fmt.Errorf("something went wrong") /*trigger create error*/) + t.Run(tc.name, func(t *testing.T) { + ctx, clientsMock := prepareMocks(t, tc.triggersListResponse, tc.globResponse, tc.triggersCreateResponse, fmt.Errorf("something went wrong") /*trigger create error*/) clientsMock.IO.On("SelectPrompt", mock.Anything, "Choose a trigger definition file:", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{ Flag: clientsMock.Config.Flags.Lookup("trigger-def"), })).Return(iostreams.SelectPromptResponse{ @@ -179,13 +179,13 @@ func Test_TriggerGenerate_handle_error(t *testing.T) { // Execute test trigger, err := TriggerGenerate(ctx, clients, types.App{}) - tt.check(t, trigger, err) + tc.check(t, trigger, err) }) } func Test_TriggerGenerate_handle_invalid_paths(t *testing.T) { projDir, _ := os.Getwd() - tt := unitTest{ + tc := unitTest{ name: "Omit invalid paths in triggers project directory", triggersListResponse: []types.DeployedTrigger{}, // no existing triggers globResponse: []string{fmt.Sprintf("%v/triggers/trigger.ts~", projDir)}, // invalid trigger @@ -197,8 +197,8 @@ func Test_TriggerGenerate_handle_invalid_paths(t *testing.T) { }, } - t.Run(tt.name, func(t *testing.T) { - ctx, clientsMock := prepareMocks(t, tt.triggersListResponse, tt.globResponse, tt.triggersCreateResponse, nil) + t.Run(tc.name, func(t *testing.T) { + ctx, clientsMock := prepareMocks(t, tc.triggersListResponse, tc.globResponse, tc.triggersCreateResponse, nil) clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(clients *shared.ClientFactory) { clients.SDKConfig = hooks.NewSDKConfigMock() @@ -209,13 +209,13 @@ func Test_TriggerGenerate_handle_invalid_paths(t *testing.T) { // Execute test trigger, err := TriggerGenerate(ctx, clients, types.App{}) - tt.check(t, trigger, err) + tc.check(t, trigger, err) }) } func Test_TriggerGenerate_Config_TriggerPaths_Default(t *testing.T) { projDir, _ := os.Getwd() - tt := unitTest{ + tc := unitTest{ name: "Should use default when 'trigger-path' is missing", triggersListResponse: []types.DeployedTrigger{}, // no existing triggers globResponse: []string{fmt.Sprintf("%v/triggers/trigger.ts", projDir)}, @@ -226,8 +226,8 @@ func Test_TriggerGenerate_Config_TriggerPaths_Default(t *testing.T) { }, } - t.Run(tt.name, func(t *testing.T) { - ctx, clientsMock := prepareMocks(t, tt.triggersListResponse, tt.globResponse, tt.triggersCreateResponse, nil /*trigger create error*/) + t.Run(tc.name, func(t *testing.T) { + ctx, clientsMock := prepareMocks(t, tc.triggersListResponse, tc.globResponse, tc.triggersCreateResponse, nil /*trigger create error*/) clientsMock.IO.On("SelectPrompt", mock.Anything, "Choose a trigger definition file:", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{ Flag: clientsMock.Config.Flags.Lookup("trigger-def"), })).Return(iostreams.SelectPromptResponse{ @@ -248,14 +248,14 @@ func Test_TriggerGenerate_Config_TriggerPaths_Default(t *testing.T) { // Execute test clients.SDKConfig.Config.TriggerPaths = []string{} // No 'trigger-path' is set trigger, err := TriggerGenerate(ctx, clients, types.App{}) - tt.check(t, trigger, err) + tc.check(t, trigger, err) clientsMock.Os.AssertNumberOfCalls(t, "Glob", 1) // Assert default 'trigger-path' is used as Glob pattern }) } func Test_TriggerGenerate_Config_TriggerPaths_Custom(t *testing.T) { projDir, _ := os.Getwd() - tt := unitTest{ + tc := unitTest{ name: "Should use custom 'trigger-path' in hooks.json", triggersListResponse: []types.DeployedTrigger{}, // no existing triggers globResponse: []string{fmt.Sprintf("%v/triggers/trigger.ts", projDir)}, @@ -266,8 +266,8 @@ func Test_TriggerGenerate_Config_TriggerPaths_Custom(t *testing.T) { }, } - t.Run(tt.name, func(t *testing.T) { - ctx, clientsMock := prepareMocks(t, tt.triggersListResponse, tt.globResponse, tt.triggersCreateResponse, nil /*trigger create error*/) + t.Run(tc.name, func(t *testing.T) { + ctx, clientsMock := prepareMocks(t, tc.triggersListResponse, tc.globResponse, tc.triggersCreateResponse, nil /*trigger create error*/) clientsMock.IO.On("SelectPrompt", mock.Anything, "Choose a trigger definition file:", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{ Flag: clientsMock.Config.Flags.Lookup("trigger-def"), })).Return(iostreams.SelectPromptResponse{ @@ -288,7 +288,7 @@ func Test_TriggerGenerate_Config_TriggerPaths_Custom(t *testing.T) { // Execute test clients.SDKConfig.Config.TriggerPaths = []string{"my-triggers/*.ts", "my-triggers/*.js", "my-triggers/*.json"} // Custom 'trigger-path' trigger, err := TriggerGenerate(ctx, clients, types.App{}) - tt.check(t, trigger, err) + tc.check(t, trigger, err) clientsMock.Os.AssertNumberOfCalls(t, "Glob", 3) // Assert custom 'trigger-path' is used as Glob pattern }) } @@ -370,7 +370,7 @@ func Test_TriggerGenerate_MismatchedFlags(t *testing.T) { return arguments } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() @@ -378,20 +378,20 @@ func Test_TriggerGenerate_MismatchedFlags(t *testing.T) { clientsMock.AddDefaultMocks() clients := shared.NewClientFactory(clientsMock.MockClientFactory()) cmd := NewCreateCommand(clients) - err := cmd.Flags().Parse(createArgs(tt.flags)) + err := cmd.Flags().Parse(createArgs(tc.flags)) require.NoError(t, err, "Failed to parse mocked flags") clients.Config.SetFlags(cmd) err = afero.WriteFile(clients.Fs, definitionFile, []byte(""), 0600) require.NoError(t, err, "Cant write apps.json") - err = validateCreateCmdFlags(ctx, clients, &tt.flags) - if tt.err != nil { + err = validateCreateCmdFlags(ctx, clients, &tc.flags) + if tc.err != nil { assert.NotNil(t, err) - assert.Equal(t, slackerror.ToSlackError(tt.err).Code, slackerror.ToSlackError(err).Code) + assert.Equal(t, slackerror.ToSlackError(tc.err).Code, slackerror.ToSlackError(err).Code) } else { assert.Nil(t, err) } - for _, msg := range tt.message { + for _, msg := range tc.message { assert.Contains(t, err.Error(), msg) } }) @@ -436,19 +436,19 @@ func Test_ShowTriggers(t *testing.T) { expectedShown: false, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() - clientsMock.IO.On("IsTTY").Return(tt.isTTY) + clientsMock.IO.On("IsTTY").Return(tc.isTTY) clientsMock.AddDefaultMocks() clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(clients *shared.ClientFactory) { clients.SDKConfig = hooks.NewSDKConfigMock() }) - if !tt.hasGetTriggerHook { + if !tc.hasGetTriggerHook { clients.SDKConfig.Hooks.GetTrigger.Command = "" } - triggersShown := ShowTriggers(clients, tt.hideTriggersFlag) - assert.Equal(t, tt.expectedShown, triggersShown) + triggersShown := ShowTriggers(clients, tc.hideTriggersFlag) + assert.Equal(t, tc.expectedShown, triggersShown) }) } } diff --git a/internal/api/app_test.go b/internal/api/app_test.go index ae14caf7..e7b65eba 100644 --- a/internal/api/app_test.go +++ b/internal/api/app_test.go @@ -228,23 +228,23 @@ func TestClient_ValidateAppManifest(t *testing.T) { wantErrVal: slackerror.NewAPIError(errInvalidManifestCode, "", errorDetails2, appManifestValidateMethod), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appManifestValidateMethod, - Response: tt.httpResponseJSON, + Response: tc.httpResponseJSON, }) defer teardown() - got, err := c.ValidateAppManifest(ctx, tt.args.token, tt.args.manifest, tt.args.appID) - if tt.wantErr { + got, err := c.ValidateAppManifest(ctx, tc.args.token, tc.args.manifest, tc.args.appID) + if tc.wantErr { require.Error(t, err) - require.Contains(t, err.Error(), tt.wantErrVal.Error()) + require.Contains(t, err.Error(), tc.wantErrVal.Error()) return } - require.Equal(t, tt.want, got) + require.Equal(t, tc.want, got) }) } } @@ -282,18 +282,18 @@ func TestClient_CertifiedAppInstall(t *testing.T) { httpResponseJSON: `{"ok":true}`, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appCertifiedInstallMethod, - ExpectedRequest: fmt.Sprintf(`{"app_id":"%s"}`, tt.mockAppID), - Response: tt.httpResponseJSON, + ExpectedRequest: fmt.Sprintf(`{"app_id":"%s"}`, tc.mockAppID), + Response: tc.httpResponseJSON, }) defer teardown() // execute - _, err := c.CertifiedAppInstall(ctx, "token", tt.mockAppID) + _, err := c.CertifiedAppInstall(ctx, "token", tc.mockAppID) // check require.NoError(t, err) @@ -330,18 +330,18 @@ func TestClient_InstallApp(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx, ioMock := setup(t) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appDeveloperInstallMethod, - ExpectedRequest: fmt.Sprintf(`{"app_id":"%s"}`, tt.mockAppID), - Response: tt.httpResponseJSON, + ExpectedRequest: fmt.Sprintf(`{"app_id":"%s"}`, tc.mockAppID), + Response: tc.httpResponseJSON, }) defer teardown() mockApp := types.App{ - AppID: tt.mockAppID, + AppID: tc.mockAppID, TeamID: "T123", TeamDomain: "mock", } @@ -349,8 +349,8 @@ func TestClient_InstallApp(t *testing.T) { _, _, err := c.DeveloperAppInstall(ctx, ioMock, "token", mockApp, []string{}, []string{}, "", false) // check - if tt.expectedErr != nil { - assert.Equal(t, slackerror.ToSlackError(err).Code, tt.expectedErr.Code) + if tc.expectedErr != nil { + assert.Equal(t, slackerror.ToSlackError(err).Code, tc.expectedErr.Code) } else { assert.NoError(t, err) } @@ -373,13 +373,13 @@ func TestClient_UninstallApp(t *testing.T) { errMessage: "invalid_app_id", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appDeveloperUninstallMethod, ExpectedRequest: `{"app_id":"A123","team_id":"T123"}`, - Response: tt.httpResponseJSON, + Response: tc.httpResponseJSON, }) defer teardown() @@ -387,15 +387,15 @@ func TestClient_UninstallApp(t *testing.T) { err := c.UninstallApp(ctx, "token", "A123", "T123") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } @@ -418,14 +418,14 @@ func TestClient_DeleteApp(t *testing.T) { errMessage: "invalid_app_id", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appDeleteMethod, ExpectedRequest: `{"app_id":"A123"}`, - Response: tt.httpResponseJSON, + Response: tc.httpResponseJSON, }) defer teardown() @@ -433,15 +433,15 @@ func TestClient_DeleteApp(t *testing.T) { err := c.DeleteApp(ctx, "token", "A123") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } diff --git a/internal/api/datastore_test.go b/internal/api/datastore_test.go index 9a52bf3b..1e8ddb52 100644 --- a/internal/api/datastore_test.go +++ b/internal/api/datastore_test.go @@ -96,29 +96,29 @@ func TestClient_AppsDatastorePut(t *testing.T) { errMessage: "datastore_error", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appDatastorePutMethod, - Response: tt.httpResponseJSON, - StatusCode: tt.statusCode, + Response: tc.httpResponseJSON, + StatusCode: tc.statusCode, }) defer teardown() - got, err := c.AppsDatastorePut(ctx, "shhh", tt.args.request) - if (err != nil) != tt.wantErr { - t.Errorf("Client.AppsDatastorePut() error = %v, wantErr %v", err, tt.wantErr) + got, err := c.AppsDatastorePut(ctx, "shhh", tc.args.request) + if (err != nil) != tc.wantErr { + t.Errorf("Client.AppsDatastorePut() error = %v, wantErr %v", err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "Client.AppsDatastorePut() error contains invalid message", ) } - require.Equal(t, tt.want, got, "Client.AppsDatastorePut() result was unexpected") + require.Equal(t, tc.want, got, "Client.AppsDatastorePut() result was unexpected") }) } } @@ -196,29 +196,29 @@ func TestClient_AppsDatastoreUpdate(t *testing.T) { errMessage: "datastore_error", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appDatastoreUpdateMethod, - Response: tt.httpResponseJSON, - StatusCode: tt.statusCode, + Response: tc.httpResponseJSON, + StatusCode: tc.statusCode, }) defer teardown() - got, err := c.AppsDatastoreUpdate(ctx, "shhh", tt.args.request) - if (err != nil) != tt.wantErr { - t.Errorf("Client.AppsDatastoreUpdate() error = %v, wantErr %v", err, tt.wantErr) + got, err := c.AppsDatastoreUpdate(ctx, "shhh", tc.args.request) + if (err != nil) != tc.wantErr { + t.Errorf("Client.AppsDatastoreUpdate() error = %v, wantErr %v", err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "Client.AppsDatastoreUpdate() error contains invalid message", ) } - require.Equal(t, tt.want, got, "Client.AppsDatastoreUpdate() result was unexpected") + require.Equal(t, tc.want, got, "Client.AppsDatastoreUpdate() result was unexpected") }) } } @@ -284,29 +284,29 @@ func TestClient_AppsDatastoreQuery(t *testing.T) { wantErr: true, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appDatastoreQueryMethod, - Response: tt.httpResponseJSON, - StatusCode: tt.statusCode, + Response: tc.httpResponseJSON, + StatusCode: tc.statusCode, }) defer teardown() - got, err := c.AppsDatastoreQuery(ctx, "shhh", tt.args.query) - if (err != nil) != tt.wantErr { - t.Errorf("Client.AppsDatastoreQuery() error = %v, wantErr %v", err, tt.wantErr) + got, err := c.AppsDatastoreQuery(ctx, "shhh", tc.args.query) + if (err != nil) != tc.wantErr { + t.Errorf("Client.AppsDatastoreQuery() error = %v, wantErr %v", err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "Client.AppsDatastoreQuery() error contains invalid message", ) } - require.Equal(t, tt.want, got, "Client.AppsDatastoreQuery() result was unexpected") + require.Equal(t, tc.want, got, "Client.AppsDatastoreQuery() result was unexpected") }) } } @@ -373,29 +373,29 @@ func TestClient_AppsDatastoreDelete(t *testing.T) { wantErr: true, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appDatastoreDeleteMethod, - Response: tt.httpResponseJSON, - StatusCode: tt.statusCode, + Response: tc.httpResponseJSON, + StatusCode: tc.statusCode, }) defer teardown() - got, err := c.AppsDatastoreDelete(ctx, "shhh", tt.args.request) - if (err != nil) != tt.wantErr { - t.Errorf("Client.AppsDatastoreDelete() error = %v, wantErr %v", err, tt.wantErr) + got, err := c.AppsDatastoreDelete(ctx, "shhh", tc.args.request) + if (err != nil) != tc.wantErr { + t.Errorf("Client.AppsDatastoreDelete() error = %v, wantErr %v", err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "Client.AppsDatastorePut() error contains invalid message", ) } - require.Equal(t, tt.want, got, "Client.AppsDatastoreDelete() result was unexpected") + require.Equal(t, tc.want, got, "Client.AppsDatastoreDelete() result was unexpected") }) } } @@ -464,29 +464,29 @@ func TestClient_AppsDatastoreGet(t *testing.T) { wantErr: true, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appDatastoreGetMethod, - Response: tt.httpResponseJSON, - StatusCode: tt.statusCode, + Response: tc.httpResponseJSON, + StatusCode: tc.statusCode, }) defer teardown() - got, err := c.AppsDatastoreGet(ctx, "shhh", tt.args.request) - if (err != nil) != tt.wantErr { - t.Errorf("Client.AppsDatastoreGet() error = %v, wantErr %v", err, tt.wantErr) + got, err := c.AppsDatastoreGet(ctx, "shhh", tc.args.request) + if (err != nil) != tc.wantErr { + t.Errorf("Client.AppsDatastoreGet() error = %v, wantErr %v", err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "Client.AppsDatastorePut() error contains invalid message", ) } - require.Equal(t, tt.want, got, "Client.AppsDatastoreGet() result was unexpected") + require.Equal(t, tc.want, got, "Client.AppsDatastoreGet() result was unexpected") }) } } diff --git a/internal/api/externalauth_test.go b/internal/api/externalauth_test.go index 5cfb864d..6e56a2bf 100644 --- a/internal/api/externalauth_test.go +++ b/internal/api/externalauth_test.go @@ -57,25 +57,25 @@ func Test_API_AppsAuthExternalStart(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appsAuthExternalStartMethod, - Response: tt.httpResponseJSON, + Response: tc.httpResponseJSON, }) defer teardown() // Execute test - authorizationURL, err := c.AppsAuthExternalStart(ctx, tt.argsToken, tt.argsAppID, tt.argsProviderKey) + authorizationURL, err := c.AppsAuthExternalStart(ctx, tc.argsToken, tc.argsAppID, tc.argsProviderKey) // Assertions - require.Equal(t, tt.expectedAuthorizationURL, authorizationURL) - if tt.expectedErrorContains == "" { + require.Equal(t, tc.expectedAuthorizationURL, authorizationURL) + if tc.expectedErrorContains == "" { require.NoError(t, err) } else { - require.Contains(t, err.Error(), tt.expectedErrorContains, "Expect error contains the message") + require.Contains(t, err.Error(), tc.expectedErrorContains, "Expect error contains the message") } }) } @@ -112,24 +112,24 @@ func Test_API_AppsAuthExternalRemove(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appsAuthExternalDeleteMethod, - Response: tt.httpResponseJSON, + Response: tc.httpResponseJSON, }) defer teardown() // Execute test - err := c.AppsAuthExternalDelete(ctx, tt.argsToken, tt.argsAppID, tt.argsProviderKey, "") + err := c.AppsAuthExternalDelete(ctx, tc.argsToken, tc.argsAppID, tc.argsProviderKey, "") // Assertions - if tt.expectedErrorContains == "" { + if tc.expectedErrorContains == "" { require.NoError(t, err) } else { - require.Contains(t, err.Error(), tt.expectedErrorContains, "Expect error contains the message") + require.Contains(t, err.Error(), tc.expectedErrorContains, "Expect error contains the message") } }) } @@ -169,24 +169,24 @@ func Test_API_AppsAuthExternalClientSecretAdd(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appsAuthExternalClientSecretAddMethod, - Response: tt.httpResponseJSON, + Response: tc.httpResponseJSON, }) defer teardown() // Execute test - err := c.AppsAuthExternalClientSecretAdd(ctx, tt.argsToken, tt.argsAppID, tt.argsProviderKey, tt.argsClientSecret) + err := c.AppsAuthExternalClientSecretAdd(ctx, tc.argsToken, tc.argsAppID, tc.argsProviderKey, tc.argsClientSecret) // Assertions - if tt.expectedErrorContains == "" { + if tc.expectedErrorContains == "" { require.NoError(t, err) } else { - require.Contains(t, err.Error(), tt.expectedErrorContains, "Expect error contains the message") + require.Contains(t, err.Error(), tc.expectedErrorContains, "Expect error contains the message") } }) } @@ -338,25 +338,25 @@ func Test_API_AppsAuthExternalList(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appsAuthExternalListMethod, - Response: tt.httpResponseJSON, + Response: tc.httpResponseJSON, }) defer teardown() // Execute test - actual, err := c.AppsAuthExternalList(ctx, tt.argsToken, tt.argsAppID, false /*include_workflows flag to return workflow auth info*/) + actual, err := c.AppsAuthExternalList(ctx, tc.argsToken, tc.argsAppID, false /*include_workflows flag to return workflow auth info*/) // Assertions - if tt.expectedErrorContains == "" { + if tc.expectedErrorContains == "" { require.NoError(t, err) - require.Equal(t, tt.expectedAuthorizationInfoLists, actual) + require.Equal(t, tc.expectedAuthorizationInfoLists, actual) } else { - require.Contains(t, err.Error(), tt.expectedErrorContains, "Expect error contains the message") + require.Contains(t, err.Error(), tc.expectedErrorContains, "Expect error contains the message") } }) } @@ -403,24 +403,24 @@ func Test_API_AppsAuthExternalSelectAuth(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: appsAuthExternalSelectAuthMethod, - Response: tt.httpResponseJSON, + Response: tc.httpResponseJSON, }) defer teardown() // Execute test - err := c.AppsAuthExternalSelectAuth(ctx, tt.argsToken, tt.argsAppID, tt.argsProviderKey, tt.argsWorkflowID, tt.argsExternalTokenID) + err := c.AppsAuthExternalSelectAuth(ctx, tc.argsToken, tc.argsAppID, tc.argsProviderKey, tc.argsWorkflowID, tc.argsExternalTokenID) // Assertions - if tt.expectedErrorContains == "" { + if tc.expectedErrorContains == "" { require.NoError(t, err) } else { - require.Contains(t, err.Error(), tt.expectedErrorContains, "Expect error contains the message") + require.Contains(t, err.Error(), tc.expectedErrorContains, "Expect error contains the message") } }) } diff --git a/internal/api/functiondistribution_test.go b/internal/api/functiondistribution_test.go index d0b06c91..27521f56 100644 --- a/internal/api/functiondistribution_test.go +++ b/internal/api/functiondistribution_test.go @@ -39,26 +39,26 @@ func TestClient_FunctionDistributionAddUsers(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: functionDistributionsPermissionsAddMethod, - Response: tt.httpResponseJSON, + Response: tc.httpResponseJSON, }) defer teardown() err := c.FunctionDistributionAddUsers(ctx, "valid_function", "app", "user1,user2") - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } @@ -82,26 +82,26 @@ func TestClient_FunctionDistributionRemoveUsers(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: functionDistributionsPermissionsRemoveMethod, - Response: tt.httpResponseJSON, + Response: tc.httpResponseJSON, }) defer teardown() err := c.FunctionDistributionRemoveUsers(ctx, "valid_function", "app", "user1,user2") - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } @@ -125,26 +125,26 @@ func TestClient_FunctionDistributionSet(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: functionDistributionsPermissionsSetMethod, - Response: tt.httpResponseJSON, + Response: tc.httpResponseJSON, }) defer teardown() _, err := c.FunctionDistributionSet(ctx, "valid_function", "app", types.PermissionEveryone, "") - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } diff --git a/internal/api/teams_test.go b/internal/api/teams_test.go index 0df48b60..9d6892bd 100644 --- a/internal/api/teams_test.go +++ b/internal/api/teams_test.go @@ -54,25 +54,25 @@ func Test_API_TeamInfoResponse(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: teamsInfoMethod, - Response: tt.httpResponseJSON, + Response: tc.httpResponseJSON, }) defer teardown() // Execute test - actual, err := c.TeamsInfo(ctx, tt.argsToken, tt.argsTeamID) + actual, err := c.TeamsInfo(ctx, tc.argsToken, tc.argsTeamID) // Assertions - if tt.expectedErrorContains == "" { + if tc.expectedErrorContains == "" { require.NoError(t, err) - require.Equal(t, tt.expectedTeamsInfo, actual) + require.Equal(t, tc.expectedTeamsInfo, actual) } else { - require.Contains(t, err.Error(), tt.expectedErrorContains, "Expect error contains the message") + require.Contains(t, err.Error(), tc.expectedErrorContains, "Expect error contains the message") } }) } diff --git a/internal/api/triggerpermissions_test.go b/internal/api/triggerpermissions_test.go index 2b87231e..5dd403a7 100644 --- a/internal/api/triggerpermissions_test.go +++ b/internal/api/triggerpermissions_test.go @@ -80,80 +80,80 @@ func TestClient_TriggerPermissionsSet(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) // prepare c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: workflowsTriggersPermissionsSetMethod, - ExpectedRequest: tt.expectedRequest, - Response: tt.httpResponseJSON, + ExpectedRequest: tc.expectedRequest, + Response: tc.httpResponseJSON, }) defer teardown() // execute - if tt.users != "" { - _, err := c.TriggerPermissionsSet(ctx, fakeToken, fakeTriggerID, tt.users, tt.permissionType, "users") + if tc.users != "" { + _, err := c.TriggerPermissionsSet(ctx, fakeToken, fakeTriggerID, tc.users, tc.permissionType, "users") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } - } else if tt.channels != "" { - _, err := c.TriggerPermissionsSet(ctx, fakeToken, fakeTriggerID, tt.channels, tt.permissionType, "channels") + } else if tc.channels != "" { + _, err := c.TriggerPermissionsSet(ctx, fakeToken, fakeTriggerID, tc.channels, tc.permissionType, "channels") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } - } else if tt.workspaces != "" { - _, err := c.TriggerPermissionsSet(ctx, fakeToken, fakeTriggerID, tt.workspaces, tt.permissionType, "workspaces") + } else if tc.workspaces != "" { + _, err := c.TriggerPermissionsSet(ctx, fakeToken, fakeTriggerID, tc.workspaces, tc.permissionType, "workspaces") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } - } else if tt.organizations != "" { - _, err := c.TriggerPermissionsSet(ctx, fakeToken, fakeTriggerID, tt.organizations, tt.permissionType, "organizations") + } else if tc.organizations != "" { + _, err := c.TriggerPermissionsSet(ctx, fakeToken, fakeTriggerID, tc.organizations, tc.permissionType, "organizations") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } @@ -209,76 +209,76 @@ func TestClient_TriggerPermissionsAddEntities(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) // prepare c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: workflowsTriggersPermissionsAddMethod, - ExpectedRequest: tt.expectedRequest, - Response: tt.httpResponseJSON, + ExpectedRequest: tc.expectedRequest, + Response: tc.httpResponseJSON, }) defer teardown() // execute - if tt.users != "" { - err := c.TriggerPermissionsAddEntities(ctx, fakeToken, fakeTriggerID, tt.users, "users") + if tc.users != "" { + err := c.TriggerPermissionsAddEntities(ctx, fakeToken, fakeTriggerID, tc.users, "users") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } - } else if tt.channels != "" { - err := c.TriggerPermissionsAddEntities(ctx, fakeToken, fakeTriggerID, tt.channels, "channels") + } else if tc.channels != "" { + err := c.TriggerPermissionsAddEntities(ctx, fakeToken, fakeTriggerID, tc.channels, "channels") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } - } else if tt.workspaces != "" { - err := c.TriggerPermissionsAddEntities(ctx, fakeToken, fakeTriggerID, tt.workspaces, "workspaces") + } else if tc.workspaces != "" { + err := c.TriggerPermissionsAddEntities(ctx, fakeToken, fakeTriggerID, tc.workspaces, "workspaces") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } - } else if tt.organizations != "" { - err := c.TriggerPermissionsAddEntities(ctx, fakeToken, fakeTriggerID, tt.organizations, "organizations") + } else if tc.organizations != "" { + err := c.TriggerPermissionsAddEntities(ctx, fakeToken, fakeTriggerID, tc.organizations, "organizations") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } @@ -334,80 +334,80 @@ func TestClient_TriggerPermissionsRemoveEntities(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) // prepare c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: workflowsTriggersPermissionsRemoveMethod, - ExpectedRequest: tt.expectedRequest, - Response: tt.httpResponseJSON, + ExpectedRequest: tc.expectedRequest, + Response: tc.httpResponseJSON, }) defer teardown() // execute - if tt.users != "" { - err := c.TriggerPermissionsRemoveEntities(ctx, fakeToken, fakeTriggerID, tt.users, "users") + if tc.users != "" { + err := c.TriggerPermissionsRemoveEntities(ctx, fakeToken, fakeTriggerID, tc.users, "users") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } - } else if tt.channels != "" { - err := c.TriggerPermissionsRemoveEntities(ctx, fakeToken, fakeTriggerID, tt.channels, "channels") + } else if tc.channels != "" { + err := c.TriggerPermissionsRemoveEntities(ctx, fakeToken, fakeTriggerID, tc.channels, "channels") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } - } else if tt.workspaces != "" { - err := c.TriggerPermissionsRemoveEntities(ctx, fakeToken, fakeTriggerID, tt.workspaces, "workspaces") + } else if tc.workspaces != "" { + err := c.TriggerPermissionsRemoveEntities(ctx, fakeToken, fakeTriggerID, tc.workspaces, "workspaces") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } - } else if tt.organizations != "" { - err := c.TriggerPermissionsRemoveEntities(ctx, fakeToken, fakeTriggerID, tt.organizations, "organizations") + } else if tc.organizations != "" { + err := c.TriggerPermissionsRemoveEntities(ctx, fakeToken, fakeTriggerID, tc.organizations, "organizations") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } @@ -480,88 +480,88 @@ func TestClient_TriggerPermissionsList(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) // prepare c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: workflowsTriggersPermissionsListMethod, - ExpectedRequest: tt.expectedRequest, - Response: tt.httpResponseJSON, + ExpectedRequest: tc.expectedRequest, + Response: tc.httpResponseJSON, }) defer teardown() // execute - if len(tt.expectedUsers) != 0 { + if len(tc.expectedUsers) != 0 { actualType, actualUsers, err := c.TriggerPermissionsList(ctx, fakeToken, fakeTriggerID) - require.Equal(t, tt.expectedPermissionType, actualType) - require.Equal(t, tt.expectedUsers, actualUsers) + require.Equal(t, tc.expectedPermissionType, actualType) + require.Equal(t, tc.expectedUsers, actualUsers) // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } - } else if len(tt.expectedChannels) != 0 { + } else if len(tc.expectedChannels) != 0 { actualType, actualChannels, err := c.TriggerPermissionsList(ctx, fakeToken, fakeTriggerID) - require.Equal(t, tt.expectedPermissionType, actualType) - require.Equal(t, tt.expectedChannels, actualChannels) + require.Equal(t, tc.expectedPermissionType, actualType) + require.Equal(t, tc.expectedChannels, actualChannels) // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } - } else if len(tt.expectedWorkspaces) != 0 { + } else if len(tc.expectedWorkspaces) != 0 { actualType, actualWorkspaces, err := c.TriggerPermissionsList(ctx, fakeToken, fakeTriggerID) - require.Equal(t, tt.expectedPermissionType, actualType) - require.Equal(t, tt.expectedWorkspaces, actualWorkspaces) + require.Equal(t, tc.expectedPermissionType, actualType) + require.Equal(t, tc.expectedWorkspaces, actualWorkspaces) // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } - } else if len(tt.expectedOrganizations) != 0 { + } else if len(tc.expectedOrganizations) != 0 { actualType, actualOrganizations, err := c.TriggerPermissionsList(ctx, fakeToken, fakeTriggerID) - require.Equal(t, tt.expectedPermissionType, actualType) - require.Equal(t, tt.expectedOrganizations, actualOrganizations) + require.Equal(t, tc.expectedPermissionType, actualType) + require.Equal(t, tc.expectedOrganizations, actualOrganizations) // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } diff --git a/internal/api/workflows_test.go b/internal/api/workflows_test.go index 0a988559..fc43e1a7 100644 --- a/internal/api/workflows_test.go +++ b/internal/api/workflows_test.go @@ -101,31 +101,31 @@ func TestClient_WorkflowsTriggerCreate(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) // prepare c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: workflowsTriggersCreateMethod, - ExpectedRequest: tt.expectedJSON, - Response: tt.httpResponseJSON, + ExpectedRequest: tc.expectedJSON, + Response: tc.httpResponseJSON, }) defer teardown() // execute - _, err := c.WorkflowsTriggersCreate(ctx, "token", tt.inputTrigger) + _, err := c.WorkflowsTriggersCreate(ctx, "token", tc.inputTrigger) // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } @@ -227,31 +227,31 @@ func TestClient_WorkflowsTriggerUpdate(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) // prepare c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: workflowsTriggersUpdateMethod, - ExpectedRequest: tt.expectedJSON, - Response: tt.httpResponseJSON, + ExpectedRequest: tc.expectedJSON, + Response: tc.httpResponseJSON, }) defer teardown() // execute - _, err := c.WorkflowsTriggersUpdate(ctx, "token", tt.input) + _, err := c.WorkflowsTriggersUpdate(ctx, "token", tc.input) // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } @@ -274,7 +274,7 @@ func TestClient_WorkflowsTriggerDelete(t *testing.T) { errMessage: "invalid_scopes", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) @@ -282,7 +282,7 @@ func TestClient_WorkflowsTriggerDelete(t *testing.T) { c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: workflowsTriggersDeleteMethod, ExpectedRequest: `{"trigger_id":"FtABC"}`, - Response: tt.response, + Response: tc.response, }) defer teardown() @@ -290,15 +290,15 @@ func TestClient_WorkflowsTriggerDelete(t *testing.T) { err := c.WorkflowsTriggersDelete(ctx, "token", "FtABC") // check - if (err != nil) != tt.wantErr { - t.Errorf("%s test error = %v, wantErr %v", name, err, tt.wantErr) + if (err != nil) != tc.wantErr { + t.Errorf("%s test error = %v, wantErr %v", name, err, tc.wantErr) return } - if tt.wantErr { + if tc.wantErr { require.Contains( t, err.Error(), - tt.errMessage, + tc.errMessage, "test error contains invalid message", ) } @@ -374,30 +374,30 @@ func Test_API_WorkflowTriggersList(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) c, teardown := NewFakeClient(t, FakeClientParams{ ExpectedMethod: workflowsTriggersListMethod, - Response: tt.httpResponseJSON, + Response: tc.httpResponseJSON, }) defer teardown() // Execute test args := TriggerListRequest{ - AppID: tt.argsAppID, - Limit: tt.argsLimit, - Cursor: tt.argsCursor, + AppID: tc.argsAppID, + Limit: tc.argsLimit, + Cursor: tc.argsCursor, } - actual, _, err := c.WorkflowsTriggersList(ctx, tt.argsToken, args) + actual, _, err := c.WorkflowsTriggersList(ctx, tc.argsToken, args) // Assertions - if tt.expectedErrorContains == "" { + if tc.expectedErrorContains == "" { require.NoError(t, err) - require.Equal(t, tt.expected, actual) + require.Equal(t, tc.expected, actual) } else { - require.Contains(t, err.Error(), tt.expectedErrorContains, "Expect error contains the message") + require.Contains(t, err.Error(), tc.expectedErrorContains, "Expect error contains the message") } }) } diff --git a/internal/app/app_test.go b/internal/app/app_test.go index 4976f34c..bc2b6bd3 100644 --- a/internal/app/app_test.go +++ b/internal/app/app_test.go @@ -92,14 +92,14 @@ func Test_App_UpdateDefaultProjectFiles(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Setup parameters for test fs := slackdeps.NewFsMock() projectDirPath := "/path/to/project-name" // Create files - for filePath, fileData := range tt.existingFiles { + for filePath, fileData := range tc.existingFiles { filePathAbs := filepath.Join(projectDirPath, filePath) // Create the directory if err := fs.MkdirAll(filepath.Dir(filePathAbs), 0755); err != nil { @@ -112,12 +112,12 @@ func Test_App_UpdateDefaultProjectFiles(t *testing.T) { } // Run the tests - err := UpdateDefaultProjectFiles(fs, projectDirPath, tt.appDirName) + err := UpdateDefaultProjectFiles(fs, projectDirPath, tc.appDirName) // Assertions - require.IsType(t, err, tt.expectedErrorType) + require.IsType(t, err, tc.expectedErrorType) - for filePath, fileData := range tt.expectedFiles { + for filePath, fileData := range tc.expectedFiles { filePathAbs := filepath.Join(projectDirPath, filePath) d, err := afero.ReadFile(fs, filePathAbs) require.NoError(t, err) diff --git a/internal/app/manifest_test.go b/internal/app/manifest_test.go index afa85566..87ec0173 100644 --- a/internal/app/manifest_test.go +++ b/internal/app/manifest_test.go @@ -56,11 +56,11 @@ func Test_AppManifest_SetManifestEnvTeamVars(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - teamManifest := SetManifestEnvTeamVars(tt.manifest, tt.teamDomain, tt.isDev) - require.Equal(t, len(tt.expected), len(teamManifest)) - for key, val := range tt.expected { + teamManifest := SetManifestEnvTeamVars(tc.manifest, tc.teamDomain, tc.isDev) + require.Equal(t, len(tc.expected), len(teamManifest)) + for key, val := range tc.expected { require.Equal(t, val, teamManifest[key]) } }) @@ -107,19 +107,19 @@ func Test_AppManifest_GetManifestLocal(t *testing.T) { expectedErr: slackerror.New(slackerror.ErrInvalidManifest), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) mockManifestEnv := map[string]string{"EXAMPLE": "12"} mockSDKConfig := hooks.NewSDKConfigMock() mockHookExecutor := &hooks.MockHookExecutor{} - if tt.mockManifestInfo != "" { + if tc.mockManifestInfo != "" { mockSDKConfig.Hooks.GetManifest = hooks.HookScript{ Name: "GetManifest", Command: "cat manifest.json", } mockHookExecutor.On("Execute", mock.Anything, mock.Anything). - Return(tt.mockManifestInfo, tt.mockManifestErr) + Return(tc.mockManifestInfo, tc.mockManifestErr) } else { mockSDKConfig.Hooks.GetManifest = hooks.HookScript{Name: "GetManifest"} } @@ -132,13 +132,13 @@ func Test_AppManifest_GetManifestLocal(t *testing.T) { manifestClient := NewManifestClient(&api.APIMock{}, configMock) actualManifest, err := manifestClient.GetManifestLocal(ctx, mockSDKConfig, mockHookExecutor) - if tt.expectedErr != nil { + if tc.expectedErr != nil { require.Error(t, err) assert.Equal(t, - tt.expectedErr.(*slackerror.Error).Code, err.(*slackerror.Error).Code) + tc.expectedErr.(*slackerror.Error).Code, err.(*slackerror.Error).Code) } else { require.NoError(t, err) - assert.Equal(t, tt.expectedManifest, actualManifest) + assert.Equal(t, tc.expectedManifest, actualManifest) } }) } @@ -176,7 +176,7 @@ func Test_AppManifest_GetManifestRemote(t *testing.T) { expectedError: slackerror.New(slackerror.ErrAppManifestAccess), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) fsMock := slackdeps.NewFsMock() @@ -185,16 +185,16 @@ func Test_AppManifest_GetManifestRemote(t *testing.T) { configMock := config.NewConfig(fsMock, osMock) apic := &api.APIMock{} apic.On("ExportAppManifest", mock.Anything, mock.Anything, mock.Anything). - Return(api.ExportAppResult{Manifest: tt.mockManifestResponse}, tt.mockManifestError) + Return(api.ExportAppResult{Manifest: tc.mockManifestResponse}, tc.mockManifestError) manifestClient := NewManifestClient(apic, configMock) - manifest, err := manifestClient.GetManifestRemote(ctx, tt.mockToken, tt.mockAppID) - if tt.expectedError != nil { - assert.Equal(t, tt.expectedError, err) + manifest, err := manifestClient.GetManifestRemote(ctx, tc.mockToken, tc.mockAppID) + if tc.expectedError != nil { + assert.Equal(t, tc.expectedError, err) } else { assert.NoError(t, err) - assert.Equal(t, tt.expectedManifest, manifest) - apic.AssertCalled(t, "ExportAppManifest", mock.Anything, tt.mockToken, tt.mockAppID) + assert.Equal(t, tc.expectedManifest, manifest) + apic.AssertCalled(t, "ExportAppManifest", mock.Anything, tc.mockToken, tc.mockAppID) } }) } diff --git a/internal/auth/auth_test.go b/internal/auth/auth_test.go index 736648a9..ac6fa7d5 100644 --- a/internal/auth/auth_test.go +++ b/internal/auth/auth_test.go @@ -79,13 +79,13 @@ func Test_AuthWithToken(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) apic, teardown := api.NewFakeClient(t, api.FakeClientParams{ ExpectedMethod: "auth.test", - ExpectedRequest: fmt.Sprintf("token=%s", tt.token), - Response: tt.response, + ExpectedRequest: fmt.Sprintf("token=%s", tc.token), + Response: tc.response, }) defer teardown() appc := app.NewClient(apic, config, fs, os) @@ -96,15 +96,15 @@ func Test_AuthWithToken(t *testing.T) { ioMock.AddDefaultMocks() c := NewClient(apic, appc, config, ioMock, fs) - auth, err := c.AuthWithToken(ctx, tt.token) + auth, err := c.AuthWithToken(ctx, tc.token) auth.LastUpdated = time.Time{} // ignore time for this test - if tt.err.Code != "" { + if tc.err.Code != "" { assert.Error(t, err, slackerror.New(slackerror.ErrNotAuthed)) - assert.Equal(t, tt.expected, auth) + assert.Equal(t, tc.expected, auth) } else { assert.NoError(t, err) - assert.Equal(t, tt.expected, auth) + assert.Equal(t, tc.expected, auth) } }) } @@ -554,13 +554,13 @@ func Test_SetSelectedAuth(t *testing.T) { expectedAPIURL: fmt.Sprintf("https://%s/api/", mockAPIHost), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx, authClient, osMock := setup(t) - authClient.SetSelectedAuth(ctx, tt.auth, authClient.config, osMock) - assert.Equal(t, authClient.config.TeamFlag, tt.auth.TeamID) - assert.Equal(t, authClient.config.APIHostResolved, tt.expectedAPIHost) - osMock.AssertCalled(t, "Setenv", "SLACK_API_URL", tt.expectedAPIURL) + authClient.SetSelectedAuth(ctx, tc.auth, authClient.config, osMock) + assert.Equal(t, authClient.config.TeamFlag, tc.auth.TeamID) + assert.Equal(t, authClient.config.APIHostResolved, tc.expectedAPIHost) + osMock.AssertCalled(t, "Setenv", "SLACK_API_URL", tc.expectedAPIURL) }) } } @@ -599,7 +599,7 @@ func Test_IsAPIHostSlackDev(t *testing.T) { expected: true, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { fsMock := slackdeps.NewFsMock() osMock := slackdeps.NewOsMock() @@ -608,8 +608,8 @@ func Test_IsAPIHostSlackDev(t *testing.T) { ioMock := iostreams.NewIOStreamsMock(config, fsMock, osMock) ioMock.AddDefaultMocks() authClient := NewClient(nil, nil, config, ioMock, fsMock) - actual := authClient.IsAPIHostSlackDev(tt.hostname) - assert.Equal(t, tt.expected, actual) + actual := authClient.IsAPIHostSlackDev(tc.hostname) + assert.Equal(t, tc.expected, actual) }) } } @@ -651,7 +651,7 @@ func Test_FilterKnownAuthErrors(t *testing.T) { unfiltered: slackerror.New(slackerror.ErrNotFound), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) os := slackdeps.NewOsMock() @@ -661,9 +661,9 @@ func Test_FilterKnownAuthErrors(t *testing.T) { io := iostreams.NewIOStreamsMock(config, fs, os) io.AddDefaultMocks() auth := NewClient(nil, nil, config, io, fs) - filtered, unfiltered := auth.FilterKnownAuthErrors(ctx, tt.err) - assert.Equal(t, tt.filtered, filtered) - assert.Equal(t, tt.unfiltered, unfiltered) + filtered, unfiltered := auth.FilterKnownAuthErrors(ctx, tc.err) + assert.Equal(t, tc.filtered, filtered) + assert.Equal(t, tc.unfiltered, unfiltered) }) } } diff --git a/internal/auth/revoke_test.go b/internal/auth/revoke_test.go index 74e288de..7c0ff285 100644 --- a/internal/auth/revoke_test.go +++ b/internal/auth/revoke_test.go @@ -66,7 +66,7 @@ func Test_AuthRevokeToken(t *testing.T) { expected: slackerror.New(slackerror.ErrNotFound).AddAPIMethod("auth.revoke"), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) os := slackdeps.NewOsMock() @@ -77,16 +77,16 @@ func Test_AuthRevokeToken(t *testing.T) { io.AddDefaultMocks() apic, teardown := api.NewFakeClient(t, api.FakeClientParams{ ExpectedMethod: "auth.revoke", - ExpectedRequest: fmt.Sprintf("token=%s", tt.token), - Response: tt.response, + ExpectedRequest: fmt.Sprintf("token=%s", tc.token), + Response: tc.response, }) defer teardown() appc := app.NewClient(apic, config, fs, os) auth := NewClient(apic, appc, config, io, fs) - err := auth.RevokeToken(ctx, tt.token) - assert.Equal(t, tt.expected, err) - if tt.warning != "" { - io.AssertCalled(t, "PrintDebug", mock.Anything, "%s.", []any{tt.warning}) + err := auth.RevokeToken(ctx, tc.token) + assert.Equal(t, tc.expected, err) + if tc.warning != "" { + io.AssertCalled(t, "PrintDebug", mock.Anything, "%s.", []any{tc.warning}) } else { io.AssertNotCalled(t, "PrintDebug") } diff --git a/internal/cache/cache_test.go b/internal/cache/cache_test.go index 8730d236..39c0ac89 100644 --- a/internal/cache/cache_test.go +++ b/internal/cache/cache_test.go @@ -43,13 +43,13 @@ func TestCache_createCacheDir(t *testing.T) { expectedError: nil, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { fsMock := slackdeps.NewFsMock() projectDirPath := "/path/to/project-name" err := fsMock.MkdirAll(filepath.Dir(projectDirPath), 0o755) require.NoError(t, err) - for filePath, fileData := range tt.existingFiles { + for filePath, fileData := range tc.existingFiles { filePathAbs := filepath.Join(projectDirPath, filePath) err := fsMock.MkdirAll(filepath.Dir(filePathAbs), 0o755) require.NoError(t, err) @@ -59,7 +59,7 @@ func TestCache_createCacheDir(t *testing.T) { osMock := slackdeps.NewOsMock() cache := NewCache(fsMock, osMock, projectDirPath) cacheErr := cache.createCacheDir() - assert.Equal(t, tt.expectedError, cacheErr) + assert.Equal(t, tc.expectedError, cacheErr) dir, err := fsMock.Stat(filepath.Join(projectDirPath, ".slack", "cache")) require.NoError(t, err) assert.True(t, dir.IsDir()) diff --git a/internal/cache/hash_test.go b/internal/cache/hash_test.go index 1845e553..f0d97bc9 100644 --- a/internal/cache/hash_test.go +++ b/internal/cache/hash_test.go @@ -42,10 +42,10 @@ func TestCache_Hash_NewHash(t *testing.T) { expected: Hash("c8fe2e89bbafe8ca60e751ec27cd5ebf57562d452ebb9470fa6ccddd3c9de904"), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - hash := NewHash([]byte(tt.input)) - assert.Equal(t, tt.expected, hash) + hash := NewHash([]byte(tc.input)) + assert.Equal(t, tc.expected, hash) }) } } @@ -70,12 +70,12 @@ func TestCache_Hash_Equals(t *testing.T) { equals: false, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - left := tt.a.Equals(tt.b) - right := tt.b.Equals(tt.a) - assert.Equal(t, tt.equals, left) - assert.Equal(t, tt.equals, right) + left := tc.a.Equals(tc.b) + right := tc.b.Equals(tc.a) + assert.Equal(t, tc.equals, left) + assert.Equal(t, tc.equals, right) }) } } diff --git a/internal/cache/manifest_test.go b/internal/cache/manifest_test.go index 6c9b394e..85c656cf 100644 --- a/internal/cache/manifest_test.go +++ b/internal/cache/manifest_test.go @@ -41,7 +41,7 @@ func TestCache_Manifest(t *testing.T) { expectedHash: Hash("xoxo"), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) fsMock := slackdeps.NewFsMock() @@ -50,14 +50,14 @@ func TestCache_Manifest(t *testing.T) { err := fsMock.MkdirAll(filepath.Dir(projectDirPath), 0o755) require.NoError(t, err) cache := NewCache(fsMock, osMock, projectDirPath) - err = cache.SetManifestHash(ctx, tt.mockAppID, tt.mockCache.Hash) + err = cache.SetManifestHash(ctx, tc.mockAppID, tc.mockCache.Hash) require.NoError(t, err) cache.Apps = map[string]ManifestCacheApp{ - tt.mockAppID: tt.mockCache, + tc.mockAppID: tc.mockCache, } - hash, err := cache.GetManifestHash(ctx, tt.mockAppID) + hash, err := cache.GetManifestHash(ctx, tc.mockAppID) assert.NoError(t, err) - assert.Equal(t, tt.expectedHash, hash) + assert.Equal(t, tc.expectedHash, hash) }) } } @@ -102,7 +102,7 @@ func TestCache_Manifest_NewManifestHash(t *testing.T) { expectedHash: "49691953b3bb36cad1333949846ad9f9c1fde9f12a395674dd2bbdafabccdd0c", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) fsMock := slackdeps.NewFsMock() @@ -111,9 +111,9 @@ func TestCache_Manifest_NewManifestHash(t *testing.T) { err := fsMock.MkdirAll(filepath.Dir(projectDirPath), 0o755) require.NoError(t, err) cache := NewCache(fsMock, osMock, projectDirPath) - hash, err := cache.NewManifestHash(ctx, tt.mockManifest) + hash, err := cache.NewManifestHash(ctx, tc.mockManifest) assert.NoError(t, err) - assert.Equal(t, tt.expectedHash, hash) + assert.Equal(t, tc.expectedHash, hash) }) } } diff --git a/internal/cmdutil/project_test.go b/internal/cmdutil/project_test.go index da847be1..ff60b147 100644 --- a/internal/cmdutil/project_test.go +++ b/internal/cmdutil/project_test.go @@ -77,7 +77,7 @@ func TestIsSlackHostedProject(t *testing.T) { }), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() @@ -88,16 +88,16 @@ func TestIsSlackHostedProject(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestResponse, - tt.mockManifestError, + tc.mockManifestResponse, + tc.mockManifestError, ) clientsMock.AppClient.Manifest = manifestMock projectConfigMock := config.NewProjectConfigMock() - projectConfigMock.On("GetManifestSource", mock.Anything).Return(tt.mockManifestSource, nil) + projectConfigMock.On("GetManifestSource", mock.Anything).Return(tc.mockManifestSource, nil) clientsMock.Config.ProjectConfig = projectConfigMock clients := shared.NewClientFactory(clientsMock.MockClientFactory()) err := IsSlackHostedProject(ctx, clients) - assert.Equal(t, tt.expectedError, err) + assert.Equal(t, tc.expectedError, err) }) } } @@ -116,14 +116,14 @@ func TestIsValidProjectDirectory(t *testing.T) { expectedError: slackerror.New(slackerror.ErrInvalidAppDirectory), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientsMock := shared.NewClientsMock() clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { - cf.SDKConfig.WorkingDirectory = tt.mockWorkingDirectory + cf.SDKConfig.WorkingDirectory = tc.mockWorkingDirectory }) err := IsValidProjectDirectory(clients) - assert.Equal(t, tt.expectedError, err) + assert.Equal(t, tc.expectedError, err) }) } } diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 7cea4538..00102adb 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -99,17 +99,17 @@ func Test_Config_SkipLocalFs(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { fs := slackdeps.NewFsMock() os := slackdeps.NewOsMock() os.AddDefaultMocks() config := NewConfig(fs, os) - config.TokenFlag = tt.tokenFlag - config.AppFlag = tt.appFlag + config.TokenFlag = tc.tokenFlag + config.AppFlag = tc.appFlag isHeadless := config.SkipLocalFs() - assert.Equal(t, tt.isHeadless, isHeadless) + assert.Equal(t, tc.isHeadless, isHeadless) }) } } diff --git a/internal/config/dotenv_test.go b/internal/config/dotenv_test.go index 9a1aae50..d6615bfc 100644 --- a/internal/config/dotenv_test.go +++ b/internal/config/dotenv_test.go @@ -43,18 +43,18 @@ func Test_DotEnv_GetDotEnvFileVariables(t *testing.T) { expectedValues: map[string]string{}, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { fs := slackdeps.NewFsMock() os := slackdeps.NewOsMock() os.AddDefaultMocks() - os.Setenv(tt.globalVariableName, tt.globalVariableValue) - err := afero.WriteFile(fs, ".env", []byte(tt.localEnvFile), 0600) + os.Setenv(tc.globalVariableName, tc.globalVariableValue) + err := afero.WriteFile(fs, ".env", []byte(tc.localEnvFile), 0600) assert.NoError(t, err) config := NewConfig(fs, os) variables, err := config.GetDotEnvFileVariables() assert.NoError(t, err) - assert.Equal(t, tt.expectedValues, variables) + assert.Equal(t, tc.expectedValues, variables) }) } } @@ -207,14 +207,14 @@ func Test_DotEnv_LoadEnvironmentVariables(t *testing.T) { }, } - for name, tt := range tableTests { + for name, tc := range tableTests { t.Run(name, func(t *testing.T) { // Setup fs := slackdeps.NewFsMock() os := slackdeps.NewOsMock() // Mocks - os.On("Getenv", tt.envName).Return(tt.envValue) + os.On("Getenv", tc.envName).Return(tc.envValue) os.AddDefaultMocks() // Load environment variables @@ -223,7 +223,7 @@ func Test_DotEnv_LoadEnvironmentVariables(t *testing.T) { // Assert assert.NoError(t, err) - tt.assertOnConfig(t, config) + tc.assertOnConfig(t, config) }) } } diff --git a/internal/config/experiments_test.go b/internal/config/experiments_test.go index 36794554..176194dc 100644 --- a/internal/config/experiments_test.go +++ b/internal/config/experiments_test.go @@ -112,7 +112,7 @@ func Test_Config_WithExperimentOn(t *testing.T) { } // set via config.json - for name, tt := range tableTests { + for name, tc := range tableTests { t.Run(name, func(t *testing.T) { // Setup ctx, fs, _, config, pathToConfigJSON, teardown := setup(t) @@ -120,24 +120,24 @@ func Test_Config_WithExperimentOn(t *testing.T) { mockOutput, mockPrintDebug := setupMockPrintDebug() // Write contents via config.json - jsonContents := []byte(fmt.Sprintf("{\"last_update_checked_at\":\"2023-05-11T15:41:07.799619-07:00\",\"experiments\":[\"%s\"]}", tt.experiment)) + jsonContents := []byte(fmt.Sprintf("{\"last_update_checked_at\":\"2023-05-11T15:41:07.799619-07:00\",\"experiments\":[\"%s\"]}", tc.experiment)) _ = afero.WriteFile(fs, pathToConfigJSON, jsonContents, 0600) config.LoadExperiments(ctx, mockPrintDebug) - if !tt.expectedRes { + if !tc.expectedRes { assert.Contains(t, mockOutput.String(), - fmt.Sprintf("invalid experiment found: %s", tt.experiment)) + fmt.Sprintf("invalid experiment found: %s", tc.experiment)) } else { - isActive := config.WithExperimentOn(experiment.Experiment(tt.experiment)) - assert.Equal(t, tt.expectedRes, isActive) + isActive := config.WithExperimentOn(experiment.Experiment(tc.experiment)) + assert.Equal(t, tc.expectedRes, isActive) assert.Contains(t, mockOutput.String(), - fmt.Sprintf("active system experiments: [%s]", tt.experiment)) + fmt.Sprintf("active system experiments: [%s]", tc.experiment)) } }) } // set via flag - for name, tt := range tableTests { + for name, tc := range tableTests { t.Run(name, func(t *testing.T) { // Setup ctx, _, _, config, _, teardown := setup(t) @@ -145,18 +145,18 @@ func Test_Config_WithExperimentOn(t *testing.T) { mockOutput, mockPrintDebug := setupMockPrintDebug() // Add environment variables via experiment flag - config.ExperimentsFlag = []string{tt.experiment} + config.ExperimentsFlag = []string{tc.experiment} // look for a match which is invalid format config.LoadExperiments(ctx, mockPrintDebug) - if !tt.expectedRes { + if !tc.expectedRes { assert.Contains(t, mockOutput.String(), - fmt.Sprintf("invalid experiment found: %s", tt.experiment)) + fmt.Sprintf("invalid experiment found: %s", tc.experiment)) } else { - isActive := config.WithExperimentOn(experiment.Experiment(tt.experiment)) - assert.Equal(t, tt.expectedRes, isActive) + isActive := config.WithExperimentOn(experiment.Experiment(tc.experiment)) + assert.Equal(t, tc.expectedRes, isActive) assert.Contains(t, mockOutput.String(), - fmt.Sprintf("active flag experiments: [%s]", tt.experiment)) + fmt.Sprintf("active flag experiments: [%s]", tc.experiment)) } }) } diff --git a/internal/config/flags_test.go b/internal/config/flags_test.go index bcbdf0af..9f719261 100644 --- a/internal/config/flags_test.go +++ b/internal/config/flags_test.go @@ -104,7 +104,7 @@ func TestDeprecatedFlagSubstitutions(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { fs := slackdeps.NewFsMock() os := slackdeps.NewOsMock() @@ -114,18 +114,18 @@ func TestDeprecatedFlagSubstitutions(t *testing.T) { stderr := bytes.Buffer{} cmd.SetOut(&stdout) cmd.SetErr(&stderr) - tt.prepareFlags(config) + tc.prepareFlags(config) err := config.DeprecatedFlagSubstitutions(cmd) - if tt.expectedError == nil { + if tc.expectedError == nil { assert.NoError(t, err) } else { - assert.Equal(t, tt.expectedError.Code, slackerror.ToSlackError(err).Code) + assert.Equal(t, tc.expectedError.Code, slackerror.ToSlackError(err).Code) } assert.Equal(t, stdout.String(), "") - for _, line := range tt.expectedWarnings { + for _, line := range tc.expectedWarnings { assert.Contains(t, stderr.String(), line) } - tt.assertSubstitutions(config) + tc.assertSubstitutions(config) }) } } diff --git a/internal/config/manifest_test.go b/internal/config/manifest_test.go index 2e2651b3..715b3d66 100644 --- a/internal/config/manifest_test.go +++ b/internal/config/manifest_test.go @@ -41,10 +41,10 @@ func Test_Config_ManifestSource_Equals(t *testing.T) { expected: false, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actual := tt.a.Equals(tt.b) - assert.Equal(t, tt.expected, actual) + actual := tc.a.Equals(tc.b) + assert.Equal(t, tc.expected, actual) }) } } @@ -71,10 +71,10 @@ func Test_Config_ManifestSource_Exists(t *testing.T) { expected: false, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actual := tt.a.Exists() - assert.Equal(t, tt.expected, actual) + actual := tc.a.Exists() + assert.Equal(t, tc.expected, actual) }) } } @@ -93,10 +93,10 @@ func Test_Config_ManifestSource_String(t *testing.T) { expected: "remote", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actual := tt.a.String() - assert.Equal(t, tt.expected, actual) + actual := tc.a.String() + assert.Equal(t, tc.expected, actual) }) } } @@ -119,10 +119,10 @@ func Test_Config_ManifestSource_Human(t *testing.T) { expected: "unknown", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actual := tt.a.Human() - assert.Equal(t, tt.expected, actual) + actual := tc.a.Human() + assert.Equal(t, tc.expected, actual) }) } } diff --git a/internal/config/project_test.go b/internal/config/project_test.go index 04770e9f..4861273b 100644 --- a/internal/config/project_test.go +++ b/internal/config/project_test.go @@ -252,7 +252,7 @@ func Test_ProjectConfig_ManifestSource(t *testing.T) { expectedManifestSource: ManifestSourceLocal, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) fs := slackdeps.NewFsMock() @@ -262,12 +262,12 @@ func Test_ProjectConfig_ManifestSource(t *testing.T) { config := NewProjectConfig(fs, os) initial, err := config.GetManifestSource(ctx) require.NoError(t, err) - assert.Equal(t, tt.expectedManifestSourceDefault, initial) - err = SetManifestSource(ctx, fs, os, tt.mockManifestSource) + assert.Equal(t, tc.expectedManifestSourceDefault, initial) + err = SetManifestSource(ctx, fs, os, tc.mockManifestSource) require.NoError(t, err) actual, err := config.GetManifestSource(ctx) - assert.Equal(t, tt.expectedError, err) - assert.Equal(t, tt.expectedManifestSource, actual) + assert.Equal(t, tc.expectedError, err) + assert.Equal(t, tc.expectedManifestSource, actual) }) } } @@ -490,7 +490,7 @@ func Test_ProjectConfig_Cache(t *testing.T) { expectedHash: "xoxo", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) fs := slackdeps.NewFsMock() @@ -499,13 +499,13 @@ func Test_ProjectConfig_Cache(t *testing.T) { addProjectMocks(t, fs) projectConfig := NewProjectConfig(fs, os) cache := projectConfig.Cache() - if !tt.mockHash.Equals("") { - err := cache.SetManifestHash(ctx, tt.mockAppID, tt.mockHash) + if !tc.mockHash.Equals("") { + err := cache.SetManifestHash(ctx, tc.mockAppID, tc.mockHash) require.NoError(t, err) } - hash, err := cache.GetManifestHash(ctx, tt.mockAppID) + hash, err := cache.GetManifestHash(ctx, tc.mockAppID) assert.NoError(t, err) - assert.Equal(t, tt.expectedHash, hash) + assert.Equal(t, tc.expectedHash, hash) }) } } @@ -524,10 +524,10 @@ func Test_Config_GetProjectConfigDirPath(t *testing.T) { expectedConfigDirPath: ".slack", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - configDirPath := GetProjectConfigDirPath(tt.projectDirPath) - require.Equal(t, configDirPath, tt.expectedConfigDirPath) + configDirPath := GetProjectConfigDirPath(tc.projectDirPath) + require.Equal(t, configDirPath, tc.expectedConfigDirPath) }) } } @@ -551,17 +551,17 @@ func Test_Config_CreateProjectConfigDir(t *testing.T) { expectedError: os.ErrExist, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) fs := afero.NewMemMapFs() - if tt.existingDir { - err := fs.MkdirAll(tt.projectDirPath+"/.slack", 0755) + if tc.existingDir { + err := fs.MkdirAll(tc.projectDirPath+"/.slack", 0755) require.NoError(t, err) } - projectConfigDirPath, err := CreateProjectConfigDir(ctx, fs, tt.projectDirPath) - require.Equal(t, err, tt.expectedError) - require.Equal(t, projectConfigDirPath, tt.expectedConfigDirPath) + projectConfigDirPath, err := CreateProjectConfigDir(ctx, fs, tc.projectDirPath) + require.Equal(t, err, tc.expectedError) + require.Equal(t, projectConfigDirPath, tc.expectedConfigDirPath) }) } } @@ -576,10 +576,10 @@ func Test_Config_GetProjectConfigJSONFilePath(t *testing.T) { expectedConfigJSONFilePath: "/path/to/project-name/.slack/config.json", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - configJSONFilePath := GetProjectConfigJSONFilePath(tt.projectDirPath) - require.Equal(t, configJSONFilePath, tt.expectedConfigJSONFilePath) + configJSONFilePath := GetProjectConfigJSONFilePath(tc.projectDirPath) + require.Equal(t, configJSONFilePath, tc.expectedConfigJSONFilePath) }) } } @@ -607,33 +607,33 @@ func Test_Config_CreateProjectConfigJSONFile(t *testing.T) { expectedConfigJSONFileData: `{ "project_id": "abc123" }`, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) fs := afero.NewMemMapFs() // Create the project directory and .slack directory - if _, err := CreateProjectConfigDir(ctx, fs, tt.projectDirPath); err != nil { + if _, err := CreateProjectConfigDir(ctx, fs, tc.projectDirPath); err != nil { require.Fail(t, "Failed to create the project's .slack/ directory: %s", err) } // Create existing .slack/config.json (optional) - if tt.existingConfigJSONData != "" { - configJSONFilePath := GetProjectConfigJSONFilePath(tt.projectDirPath) - if err := afero.WriteFile(fs, configJSONFilePath, []byte(tt.existingConfigJSONData), 0o0644); err != nil { + if tc.existingConfigJSONData != "" { + configJSONFilePath := GetProjectConfigJSONFilePath(tc.projectDirPath) + if err := afero.WriteFile(fs, configJSONFilePath, []byte(tc.existingConfigJSONData), 0o0644); err != nil { require.Fail(t, "Failed to setup the test by creating an existing .slack/config.json: %s", err) } } // Run the test - configJSONFilePath, err := CreateProjectConfigJSONFile(fs, tt.projectDirPath) - require.Equal(t, tt.expectedError, err) - require.Equal(t, configJSONFilePath, tt.expectedConfigJSONFilePath) + configJSONFilePath, err := CreateProjectConfigJSONFile(fs, tc.projectDirPath) + require.Equal(t, tc.expectedError, err) + require.Equal(t, configJSONFilePath, tc.expectedConfigJSONFilePath) // Assert .slack/config.json data is correct configJSONData, err := afero.ReadFile(fs, configJSONFilePath) require.Equal(t, err, nil) - require.Equal(t, string(configJSONData), tt.expectedConfigJSONFileData) + require.Equal(t, string(configJSONData), tc.expectedConfigJSONFileData) }) } } @@ -648,10 +648,10 @@ func Test_Config_GetProjectHooksJSONFilePath(t *testing.T) { expectedHooksJSONFilePath: "/path/to/project-name/.slack/hooks.json", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - hooksJSONFilePath := GetProjectHooksJSONFilePath(tt.projectDirPath) - require.Equal(t, hooksJSONFilePath, tt.expectedHooksJSONFilePath) + hooksJSONFilePath := GetProjectHooksJSONFilePath(tc.projectDirPath) + require.Equal(t, hooksJSONFilePath, tc.expectedHooksJSONFilePath) }) } } @@ -682,27 +682,27 @@ func Test_Config_CreateProjectHooksJSONFile(t *testing.T) { expectedHooksJSONFileData: `{ "existing": "file" }`, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { fs := afero.NewMemMapFs() // Create existing .slack/hooks.json (optional) - if tt.existingHooksJSONData != "" { - hooksJSONFilePath := GetProjectHooksJSONFilePath(tt.projectDirPath) - if err := afero.WriteFile(fs, hooksJSONFilePath, []byte(tt.existingHooksJSONData), 0644); err != nil { + if tc.existingHooksJSONData != "" { + hooksJSONFilePath := GetProjectHooksJSONFilePath(tc.projectDirPath) + if err := afero.WriteFile(fs, hooksJSONFilePath, []byte(tc.existingHooksJSONData), 0644); err != nil { require.Fail(t, "Failed to setup the test by creating an existing .slack/hooks.json: "+err.Error()) } } // Run the test - hooksJSONFilePath, err := CreateProjectHooksJSONFile(fs, tt.projectDirPath, []byte(tt.hooksJSONData)) - require.Equal(t, tt.expectedError, err) - require.Equal(t, hooksJSONFilePath, tt.expectedHooksJSONFilePath) + hooksJSONFilePath, err := CreateProjectHooksJSONFile(fs, tc.projectDirPath, []byte(tc.hooksJSONData)) + require.Equal(t, tc.expectedError, err) + require.Equal(t, hooksJSONFilePath, tc.expectedHooksJSONFilePath) // Assert .slack/hooks.json data is correct hooksJSONData, err := afero.ReadFile(fs, hooksJSONFilePath) require.Equal(t, err, nil) - require.Equal(t, string(hooksJSONData), tt.expectedHooksJSONFileData) + require.Equal(t, string(hooksJSONData), tc.expectedHooksJSONFileData) }) } } @@ -717,10 +717,10 @@ func Test_Config_GetProjectConfigDirDotGitIgnoreFilePath(t *testing.T) { expectedDotGitignoreFilePath: "/path/to/project-name/.slack/.gitignore", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - dotGitignoreFilePath := GetProjectConfigDirDotGitIgnoreFilePath(tt.projectDirPath) - require.Equal(t, dotGitignoreFilePath, tt.expectedDotGitignoreFilePath) + dotGitignoreFilePath := GetProjectConfigDirDotGitIgnoreFilePath(tc.projectDirPath) + require.Equal(t, dotGitignoreFilePath, tc.expectedDotGitignoreFilePath) }) } } @@ -748,27 +748,27 @@ func Test_Config_CreateProjectConfigDirDotGitIgnoreFile(t *testing.T) { expectedDotGitIgnoreFileData: `# existing .gitignore file data`, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { fs := afero.NewMemMapFs() // Create existing .slack/.gitignore (optional) - if tt.existingDotGitIgnoreFileData != "" { - dotGitIgnoreFilePath := GetProjectConfigDirDotGitIgnoreFilePath(tt.projectDirPath) - if err := afero.WriteFile(fs, dotGitIgnoreFilePath, []byte(tt.existingDotGitIgnoreFileData), 0644); err != nil { + if tc.existingDotGitIgnoreFileData != "" { + dotGitIgnoreFilePath := GetProjectConfigDirDotGitIgnoreFilePath(tc.projectDirPath) + if err := afero.WriteFile(fs, dotGitIgnoreFilePath, []byte(tc.existingDotGitIgnoreFileData), 0644); err != nil { require.Fail(t, "Failed to setup the test by creating an existing .slack/.gitignore: "+err.Error()) } } // Run the test - dotGitIgnoreFilePath, err := CreateProjectConfigDirDotGitIgnoreFile(fs, tt.projectDirPath) - require.Equal(t, tt.expectedError, err) - require.Equal(t, dotGitIgnoreFilePath, tt.expectedDotGitIgnoreFilePath) + dotGitIgnoreFilePath, err := CreateProjectConfigDirDotGitIgnoreFile(fs, tc.projectDirPath) + require.Equal(t, tc.expectedError, err) + require.Equal(t, dotGitIgnoreFilePath, tc.expectedDotGitIgnoreFilePath) // Assert .slack/.gitignore data is correct fileData, err := afero.ReadFile(fs, dotGitIgnoreFilePath) require.Equal(t, err, nil) - require.Equal(t, string(fileData), tt.expectedDotGitIgnoreFileData) + require.Equal(t, string(fileData), tc.expectedDotGitIgnoreFileData) }) } } diff --git a/internal/config/survey_test.go b/internal/config/survey_test.go index 97bb4b4b..061a984c 100644 --- a/internal/config/survey_test.go +++ b/internal/config/survey_test.go @@ -32,14 +32,14 @@ func Test_Config_GetSurveyConfig(t *testing.T) { expectedError: slackerror.New(slackerror.ErrSurveyConfigNotFound), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx, _, _, c, _, _ := setup(t) - surveyConfig, err := c.GetSurveyConfig(ctx, tt.surveyName) - if tt.expectedError != nil { - assert.Equal(t, tt.expectedError.Code, slackerror.ToSlackError(err).Code) + surveyConfig, err := c.GetSurveyConfig(ctx, tc.surveyName) + if tc.expectedError != nil { + assert.Equal(t, tc.expectedError.Code, slackerror.ToSlackError(err).Code) } else { - assert.Equal(t, tt.expectedSurvey, surveyConfig) + assert.Equal(t, tc.expectedSurvey, surveyConfig) } }) } diff --git a/internal/deputil/url_test.go b/internal/deputil/url_test.go index b7a89f46..75d4f03a 100644 --- a/internal/deputil/url_test.go +++ b/internal/deputil/url_test.go @@ -54,17 +54,17 @@ func Test_URLChecker(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Create mocks httpClientMock := &slackhttp.HTTPClientMock{} - tt.setupHTTPClientMock(httpClientMock) + tc.setupHTTPClientMock(httpClientMock) // Execute - url := URLChecker(httpClientMock, tt.url) + url := URLChecker(httpClientMock, tc.url) // Assertions - assert.Equal(t, tt.expectedURL, url) + assert.Equal(t, tc.expectedURL, url) }) } } diff --git a/internal/experiment/experiment_test.go b/internal/experiment/experiment_test.go index 699f6e90..11165582 100644 --- a/internal/experiment/experiment_test.go +++ b/internal/experiment/experiment_test.go @@ -89,9 +89,9 @@ func Test_IsValid(t *testing.T) { expectedRes: false, }, } - for name, tt := range tableTests { + for name, tc := range tableTests { t.Run(name, func(t *testing.T) { - require.Equal(t, tt.expectedRes, isValid(tt.experiment)) + require.Equal(t, tc.expectedRes, isValid(tc.experiment)) }) } } diff --git a/internal/goutils/json_test.go b/internal/goutils/json_test.go index b3bb2a0a..9ef86a2b 100644 --- a/internal/goutils/json_test.go +++ b/internal/goutils/json_test.go @@ -30,7 +30,7 @@ func Test_mergeJSON(t *testing.T) { Three string `json:"three,omitempty"` } - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { defaultJSON string customJSON string expectedError error @@ -81,14 +81,14 @@ func Test_mergeJSON(t *testing.T) { } { t.Run(name, func(t *testing.T) { var actualConfig testConfig - actualError := MergeJSON(tt.defaultJSON, tt.customJSON, &actualConfig) - require.Equal(t, tt.expectedError, actualError) + actualError := MergeJSON(tc.defaultJSON, tc.customJSON, &actualConfig) + require.Equal(t, tc.expectedError, actualError) b, err := json.Marshal(actualConfig) require.Nil(t, err) var actualConfigJSON = string(b) - require.Equal(t, tt.expectedJSON, actualConfigJSON) + require.Equal(t, tc.expectedJSON, actualConfigJSON) }) } } @@ -103,7 +103,7 @@ func Test_JSONMarshalUnescaped(t *testing.T) { Expected string } - for name, tt := range map[string]TestStruct{ + for name, tc := range map[string]TestStruct{ "encode a struct with a slice and escapable data string": { Input: TestInput{ Data: ":num < 3", @@ -113,9 +113,9 @@ func Test_JSONMarshalUnescaped(t *testing.T) { }, } { t.Run(name, func(t *testing.T) { - buff, err := JSONMarshalUnescaped(tt.Input) + buff, err := JSONMarshalUnescaped(tc.Input) if assert.NoError(t, err) { - assert.Equal(t, tt.Expected, buff) + assert.Equal(t, tc.Expected, buff) } }) } @@ -131,7 +131,7 @@ func Test_JSONMarshalUnescapedIndent(t *testing.T) { Expected string } - for name, tt := range map[string]TestStruct{ + for name, tc := range map[string]TestStruct{ "format a struct with a slice and escapable data string": { Input: TestInput{ Data: ":num < 3", @@ -151,9 +151,9 @@ func Test_JSONMarshalUnescapedIndent(t *testing.T) { }, } { t.Run(name, func(t *testing.T) { - buff, err := JSONMarshalUnescapedIndent(tt.Input) + buff, err := JSONMarshalUnescapedIndent(tc.Input) if assert.NoError(t, err) { - assert.Equal(t, tt.Expected, buff) + assert.Equal(t, tc.Expected, buff) } }) } @@ -164,7 +164,7 @@ func Test_UnmarshalJSON(t *testing.T) { One string `json:"one,omitempty"` } - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { data string expectedError error expectAll []string @@ -180,12 +180,12 @@ func Test_UnmarshalJSON(t *testing.T) { } { t.Run(name, func(t *testing.T) { var v testConfig - err := JSONUnmarshal([]byte(tt.data), &v) - if tt.expectedError == nil && len(tt.expectAll) == 0 { + err := JSONUnmarshal([]byte(tc.data), &v) + if tc.expectedError == nil && len(tc.expectAll) == 0 { require.Nil(t, err) } else { require.Contains(t, err.Error(), slackerror.ErrUnableToParseJSON) - for _, s := range tt.expectAll { + for _, s := range tc.expectAll { require.Contains(t, err.Error(), s) } } diff --git a/internal/goutils/map_test.go b/internal/goutils/map_test.go index fc80dc69..30b0ffbe 100644 --- a/internal/goutils/map_test.go +++ b/internal/goutils/map_test.go @@ -50,10 +50,10 @@ func Test_MapToStringSlice(t *testing.T) { expectedSlice: []string{`--quotes="some \"values\" are important"`}, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actualSlice := MapToStringSlice(tt.inputMap, tt.prefix) - assert.ElementsMatch(t, tt.expectedSlice, actualSlice) + actualSlice := MapToStringSlice(tc.inputMap, tc.prefix) + assert.ElementsMatch(t, tc.expectedSlice, actualSlice) }) } } diff --git a/internal/hooks/hook_executor_default_test.go b/internal/hooks/hook_executor_default_test.go index b3d3186d..377941d0 100644 --- a/internal/hooks/hook_executor_default_test.go +++ b/internal/hooks/hook_executor_default_test.go @@ -144,7 +144,7 @@ func Test_Hook_Execute_Default_Protocol(t *testing.T) { expectedResponse: "start output line 2", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) fs := slackdeps.NewFsMock() @@ -155,12 +155,12 @@ func Test_Hook_Execute_Default_Protocol(t *testing.T) { hookExecutor := &HookExecutorDefaultProtocol{ IO: ios, } - if tt.handler != nil { - tt.handler(t, ctx, hookExecutor, tt.opts) + if tc.handler != nil { + tc.handler(t, ctx, hookExecutor, tc.opts) } else { - str, err := hookExecutor.Execute(ctx, tt.opts) - assert.Contains(t, str, tt.expectedResponse) - assert.Equal(t, tt.expectedError, err) + str, err := hookExecutor.Execute(ctx, tc.opts) + assert.Contains(t, str, tc.expectedResponse) + assert.Equal(t, tc.expectedError, err) } }) } diff --git a/internal/hooks/hook_executor_v2_test.go b/internal/hooks/hook_executor_v2_test.go index 5ffea258..0a9b821e 100644 --- a/internal/hooks/hook_executor_v2_test.go +++ b/internal/hooks/hook_executor_v2_test.go @@ -165,7 +165,7 @@ func Test_Hook_Execute_V2_Protocol(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) generateBoundary = mockBoundaryStringGenerator @@ -177,8 +177,8 @@ func Test_Hook_Execute_V2_Protocol(t *testing.T) { hookExecutor := &HookExecutorMessageBoundaryProtocol{ IO: ios, } - response, err := hookExecutor.Execute(ctx, tt.opts) - tt.check(t, response, err, tt.opts.Exec) + response, err := hookExecutor.Execute(ctx, tc.opts) + tc.check(t, response, err, tc.opts.Exec) }) } } diff --git a/internal/hooks/hooks_test.go b/internal/hooks/hooks_test.go index e117a833..fec6a15c 100644 --- a/internal/hooks/hooks_test.go +++ b/internal/hooks/hooks_test.go @@ -45,7 +45,7 @@ func Test_Hooks_GetHookExecutor(t *testing.T) { expectedType: &HookExecutorDefaultProtocol{}, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { os := slackdeps.NewOsMock() os.AddDefaultMocks() @@ -53,9 +53,9 @@ func Test_Hooks_GetHookExecutor(t *testing.T) { config := config.NewConfig(fs, os) io := iostreams.NewIOStreamsMock(config, fs, os) sdkConfig := NewSDKConfigMock() - sdkConfig.Config.SupportedProtocols = tt.protocolVersions + sdkConfig.Config.SupportedProtocols = tc.protocolVersions hookExecutor := GetHookExecutor(io, sdkConfig) - require.IsType(t, tt.expectedType, hookExecutor) + require.IsType(t, tc.expectedType, hookExecutor) }) } } diff --git a/internal/hooks/script_test.go b/internal/hooks/script_test.go index ad2c61a0..5f45859c 100644 --- a/internal/hooks/script_test.go +++ b/internal/hooks/script_test.go @@ -44,9 +44,9 @@ func Test_HookScript_IsAvailable(t *testing.T) { expectedIsAvailable: false, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - require.Equal(t, tt.hookScript.IsAvailable(), tt.expectedIsAvailable) + require.Equal(t, tc.hookScript.IsAvailable(), tc.expectedIsAvailable) }) } } @@ -68,12 +68,12 @@ func Test_HookScript_UnmarshalJSON(t *testing.T) { expectedHookScripts: []HookScript{{Command: ""}}, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { var hookScripts []HookScript - err := json.Unmarshal([]byte(tt.blob), &hookScripts) - require.IsType(t, err, tt.expectedErrorType) - require.Equal(t, tt.expectedHookScripts, hookScripts) + err := json.Unmarshal([]byte(tc.blob), &hookScripts) + require.IsType(t, err, tc.expectedErrorType) + require.Equal(t, tc.expectedHookScripts, hookScripts) }) } } @@ -95,11 +95,11 @@ func Test_HookScript_Get(t *testing.T) { expectedCommand: "", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - cmd, err := tt.hookScript.Get() - require.Equal(t, err, tt.expectedError) - require.Equal(t, cmd, tt.expectedCommand) + cmd, err := tc.hookScript.Get() + require.Equal(t, err, tc.expectedError) + require.Equal(t, cmd, tc.expectedCommand) }) } } diff --git a/internal/hooks/sdk_config_test.go b/internal/hooks/sdk_config_test.go index 70aedf00..d2decd82 100644 --- a/internal/hooks/sdk_config_test.go +++ b/internal/hooks/sdk_config_test.go @@ -38,11 +38,11 @@ func Test_SDKCLIConfig_Exists(t *testing.T) { exists: false, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - exists, err := tt.sdkCLIConfig.Exists() - require.Equal(t, tt.expectedError, err) - require.Equal(t, tt.exists, exists) + exists, err := tc.sdkCLIConfig.Exists() + require.Equal(t, tc.expectedError, err) + require.Equal(t, tc.exists, exists) }) } } @@ -92,10 +92,10 @@ func Test_ProtocolResolution(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - protocol := tt.config.Config.SupportedProtocols.Preferred() - tt.check(t, protocol) + protocol := tc.config.Config.SupportedProtocols.Preferred() + tc.check(t, protocol) }) } } @@ -114,10 +114,10 @@ func Test_WatchOpts_IsAvailable(t *testing.T) { expectedIsAvailable: false, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - returnedIsAvailable := tt.watchOpts.IsAvailable() - require.Equal(t, tt.expectedIsAvailable, returnedIsAvailable) + returnedIsAvailable := tc.watchOpts.IsAvailable() + require.Equal(t, tc.expectedIsAvailable, returnedIsAvailable) }) } } diff --git a/internal/iostreams/iostreams_test.go b/internal/iostreams/iostreams_test.go index 5f8eb00b..458c9ab6 100644 --- a/internal/iostreams/iostreams_test.go +++ b/internal/iostreams/iostreams_test.go @@ -52,16 +52,16 @@ func Test_IOStreams_IsTTY(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { fsMock := slackdeps.NewFsMock() osMock := slackdeps.NewOsMock() config := config.NewConfig(fsMock, osMock) - osMock.On("Stdout").Return(&slackdeps.FileMock{FileInfo: tt.fileInfo}) + osMock.On("Stdout").Return(&slackdeps.FileMock{FileInfo: tc.fileInfo}) io := NewIOStreams(config, fsMock, osMock) isTTY := io.IsTTY() - assert.Equal(t, isTTY, tt.expected) + assert.Equal(t, isTTY, tc.expected) }) } } diff --git a/internal/iostreams/logfile_test.go b/internal/iostreams/logfile_test.go index 8ffd02ae..76d25188 100644 --- a/internal/iostreams/logfile_test.go +++ b/internal/iostreams/logfile_test.go @@ -100,10 +100,10 @@ func Test_RedactPII(t *testing.T) { expected: `Operating System (OS): darwin`, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - redacted := goutils.RedactPII(tt.text) - require.Equal(t, redacted, tt.expected) + redacted := goutils.RedactPII(tc.text) + require.Equal(t, redacted, tc.expected) }) } } @@ -122,10 +122,10 @@ func Test_isOlderThanOneWeek(t *testing.T) { expected: true, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - output := isOlderThanOneWeek(tt.date) - require.Equal(t, output, tt.expected) + output := isOlderThanOneWeek(tc.date) + require.Equal(t, output, tc.expected) }) } } @@ -156,7 +156,7 @@ func Test_FlushToLogFile(t *testing.T) { suggestsFile: true, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { var io *IOStreams stderrBuff := bytes.Buffer{} @@ -174,17 +174,17 @@ func Test_FlushToLogFile(t *testing.T) { io = NewIOStreams(config, fsMock, osMock) io.Stderr = &stderrLogger - err := io.FlushToLogFile(ctx, tt.prefix, tt.errStr) + err := io.FlushToLogFile(ctx, tc.prefix, tc.errStr) require.NoError(t, err) errorLogFilePath := filepath.Join(mockLogsDir, filename) errorLogFile, err := afero.ReadFile(io.fs, errorLogFilePath) require.NoError(t, err) - for _, expected := range tt.expectedFile { + for _, expected := range tc.expectedFile { assert.Contains(t, string(errorLogFile), expected) } var expectedStderr string - if tt.suggestsFile { + if tc.suggestsFile { expectedStderr = fmt.Sprintf("Check %s for error logs\n", errorLogFilePath) } assert.Equal(t, expectedStderr, stderrBuff.String()) diff --git a/internal/iostreams/printer_test.go b/internal/iostreams/printer_test.go index 064ca3e2..1eff9fe7 100644 --- a/internal/iostreams/printer_test.go +++ b/internal/iostreams/printer_test.go @@ -57,7 +57,7 @@ func Test_PrintDebug(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) fsMock := slackdeps.NewFsMock() @@ -70,7 +70,7 @@ func Test_PrintDebug(t *testing.T) { stdoutLogger := log.Logger{} stdoutLogger.SetOutput(&stdoutBuffer) io.Stdout = &stdoutLogger - io.PrintDebug(ctx, tt.format, tt.arguments...) + io.PrintDebug(ctx, tc.format, tc.arguments...) // Assert output lines match the pattern: [YYYY-MM-DD HH:MM:SS] line // With a trailing blank newline at the end. @@ -78,12 +78,12 @@ func Test_PrintDebug(t *testing.T) { require.Len( t, actual, - len(tt.expected)+1, + len(tc.expected)+1, "an unexpected amount of lines were output!\nactual:\n%s\nexpected:\n%s\n", strings.Join(actual, "\n"), - strings.Join(tt.expected, "\n"), + strings.Join(tc.expected, "\n"), ) - for ii, line := range tt.expected { + for ii, line := range tc.expected { pattern := regexp.MustCompile( fmt.Sprintf(`^\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] %s`, line), ) @@ -92,7 +92,7 @@ func Test_PrintDebug(t *testing.T) { pattern.MatchString(actual[ii]), "outputs do not match!\nactual:\n%s\nexpected:\n%s\n", actual[ii], - tt.expected[ii], + tc.expected[ii], ) } }) @@ -125,7 +125,7 @@ func Test_PrintWarning(t *testing.T) { }, "\n"), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) fsMock := slackdeps.NewFsMock() @@ -137,8 +137,8 @@ func Test_PrintWarning(t *testing.T) { stderrLogger := log.Logger{} stderrLogger.SetOutput(&stderrBuffer) io.Stderr = &stderrLogger - io.PrintWarning(ctx, tt.format, tt.arguments...) - assert.Equal(t, tt.expected, stderrBuffer.String()) + io.PrintWarning(ctx, tc.format, tc.arguments...) + assert.Equal(t, tc.expected, stderrBuffer.String()) }) } } @@ -182,7 +182,7 @@ func Test_IOStreams_PrintTrace(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Setup ctx := slackcontext.MockContext(t.Context()) @@ -190,7 +190,7 @@ func Test_IOStreams_PrintTrace(t *testing.T) { var osMock = slackdeps.NewOsMock() var config = config.NewConfig(fsMock, osMock) - config.SlackTestTraceFlag = tt.traceEnabled + config.SlackTestTraceFlag = tc.traceEnabled var io = NewIOStreams(config, fsMock, osMock) var stdoutBuffer = bytes.Buffer{} @@ -199,7 +199,7 @@ func Test_IOStreams_PrintTrace(t *testing.T) { io.Stdout = &stdoutLogger // Execute - io.PrintTrace(ctx, tt.traceID, tt.traceValues...) + io.PrintTrace(ctx, tc.traceID, tc.traceValues...) // Read output var actualOutput string @@ -208,7 +208,7 @@ func Test_IOStreams_PrintTrace(t *testing.T) { } // Assert - assert.Equal(t, tt.expectedOutput, actualOutput) + assert.Equal(t, tc.expectedOutput, actualOutput) }) } } @@ -238,10 +238,10 @@ func Test_IOStreams_SprintF(t *testing.T) { expected: "number: %!d(MISSING)", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actual := sprintF(tt.format, tt.args...) - assert.Equal(t, tt.expected, actual) + actual := sprintF(tc.format, tc.args...) + assert.Equal(t, tc.expected, actual) }) } } diff --git a/internal/iostreams/survey_test.go b/internal/iostreams/survey_test.go index 9fcda057..85727d1b 100644 --- a/internal/iostreams/survey_test.go +++ b/internal/iostreams/survey_test.go @@ -72,12 +72,12 @@ func TestPasswordPrompt(t *testing.T) { FileInfo: &slackdeps.FileInfoNamedPipe{}, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) fsMock := slackdeps.NewFsMock() osMock := slackdeps.NewOsMock() - if tt.IsInteractive { + if tc.IsInteractive { osMock.On("Stdout").Return(interactiveStdout) } else { osMock.On("Stdout").Return(nonInteractiveStdout) @@ -85,9 +85,9 @@ func TestPasswordPrompt(t *testing.T) { config := config.NewConfig(fsMock, osMock) ioStreams := NewIOStreams(config, fsMock, osMock) - if tt.FlagChanged { + if tc.FlagChanged { mockFlag.Changed = true - _ = mockFlag.Value.Set(tt.FlagValue) + _ = mockFlag.Value.Set(tc.FlagValue) } else { mockFlag.Changed = false _ = mockFlag.Value.Set("") @@ -95,18 +95,18 @@ func TestPasswordPrompt(t *testing.T) { selection, err := ioStreams.PasswordPrompt(ctx, "Enter a password", PasswordPromptConfig{ Flag: mockFlag, - Required: tt.Required, + Required: tc.Required, }) - if tt.ExpectedError != nil { - assert.Equal(t, tt.ExpectedError.Code, slackerror.ToSlackError(err).Code) - if tt.ExpectedError.Code == slackerror.ErrPrompt { + if tc.ExpectedError != nil { + assert.Equal(t, tc.ExpectedError.Code, slackerror.ToSlackError(err).Code) + if tc.ExpectedError.Code == slackerror.ErrPrompt { assert.Contains(t, err.Error(), fmt.Sprintf("--%s", mockFlag.Name)) } } else { assert.NoError(t, err) - assert.Equal(t, selection.Value, tt.ExpectedValue) - if tt.FlagChanged { + assert.Equal(t, selection.Value, tc.ExpectedValue) + if tc.FlagChanged { assert.Equal(t, selection.Flag, true) } else { assert.Equal(t, selection.Prompt, true) diff --git a/internal/iostreams/writer_test.go b/internal/iostreams/writer_test.go index a7f04d06..5638b661 100644 --- a/internal/iostreams/writer_test.go +++ b/internal/iostreams/writer_test.go @@ -91,18 +91,18 @@ func Test_BoundariedWriter(t *testing.T) { expectedBuff: "bold", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - for _, line := range tt.writes { - n, err := tt.bw.Write([]byte(line)) + for _, line := range tc.writes { + n, err := tc.bw.Write([]byte(line)) require.NoError(t, err) require.Equal(t, len(line), n) } - if tt.bw.Buff != nil { - assert.Equal(t, tt.expectedBuff, tt.bw.Buff.(*bytes.Buffer).String()) + if tc.bw.Buff != nil { + assert.Equal(t, tc.expectedBuff, tc.bw.Buff.(*bytes.Buffer).String()) } - if tt.bw.Stream != nil { - assert.Equal(t, strings.Join(tt.writes, ""), tt.bw.Stream.(*bytes.Buffer).String()) + if tc.bw.Stream != nil { + assert.Equal(t, strings.Join(tc.writes, ""), tc.bw.Stream.(*bytes.Buffer).String()) } }) } @@ -142,18 +142,18 @@ func Test_BufferedWriter(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - for _, line := range tt.writes { - n, err := tt.bw.Write([]byte(line)) + for _, line := range tc.writes { + n, err := tc.bw.Write([]byte(line)) require.NoError(t, err) require.Equal(t, len(line), n) } - if tt.bw.Buff != nil { - assert.Equal(t, strings.Join(tt.writes, ""), tt.bw.Buff.(*bytes.Buffer).String()) + if tc.bw.Buff != nil { + assert.Equal(t, strings.Join(tc.writes, ""), tc.bw.Buff.(*bytes.Buffer).String()) } - if tt.bw.Stream != nil { - assert.Equal(t, strings.Join(tt.writes, ""), tt.bw.Stream.(*bytes.Buffer).String()) + if tc.bw.Stream != nil { + assert.Equal(t, strings.Join(tc.writes, ""), tc.bw.Stream.(*bytes.Buffer).String()) } }) } @@ -185,15 +185,15 @@ func Test_FilteredWriter(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - for _, line := range tt.writes { - n, err := tt.fw.Write([]byte(line)) + for _, line := range tc.writes { + n, err := tc.fw.Write([]byte(line)) require.NoError(t, err) require.Equal(t, len(line), n) } - if tt.fw.Stream != nil { - assert.Equal(t, tt.expectedStream, tt.fw.Stream.(*bytes.Buffer).String()) + if tc.fw.Stream != nil { + assert.Equal(t, tc.expectedStream, tc.fw.Stream.(*bytes.Buffer).String()) } }) } @@ -217,7 +217,7 @@ func Test_WriteIndent(t *testing.T) { expected: " nice\n", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { fsMock := slackdeps.NewFsMock() osMock := slackdeps.NewOsMock() @@ -225,10 +225,10 @@ func Test_WriteIndent(t *testing.T) { io := NewIOStreams(config, fsMock, osMock) buff := &bytes.Buffer{} w := io.WriteIndent(buff) - n, err := w.Write([]byte(tt.input)) + n, err := w.Write([]byte(tc.input)) require.NoError(t, err) - require.Equal(t, len(tt.input), n) - assert.Equal(t, tt.expected, buff.String()) + require.Equal(t, len(tc.input), n) + assert.Equal(t, tc.expected, buff.String()) }) } } @@ -254,22 +254,22 @@ func Test_WriteSecondary(t *testing.T) { formatted: false, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { fsMock := slackdeps.NewFsMock() osMock := slackdeps.NewOsMock() config := config.NewConfig(fsMock, osMock) io := NewIOStreams(config, fsMock, osMock) buff := &bytes.Buffer{} - style.ToggleStyles(tt.formatted) + style.ToggleStyles(tc.formatted) defer func() { style.ToggleStyles(false) }() w := io.WriteSecondary(buff) - n, err := w.Write([]byte(tt.input)) + n, err := w.Write([]byte(tc.input)) require.NoError(t, err) - require.Equal(t, len(tt.input), n) - assert.Equal(t, tt.expected, buff.String()) + require.Equal(t, len(tc.input), n) + assert.Equal(t, tc.expected, buff.String()) }) } } diff --git a/internal/pkg/apps/delete_test.go b/internal/pkg/apps/delete_test.go index 50b47255..26274c93 100644 --- a/internal/pkg/apps/delete_test.go +++ b/internal/pkg/apps/delete_test.go @@ -77,29 +77,29 @@ func TestAppsDelete(t *testing.T) { unsaved: true, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() clientsMock.Auth.On("ResolveAPIHost", mock.Anything, mock.Anything, mock.Anything).Return("api host") clientsMock.Auth.On("ResolveLogstashHost", mock.Anything, mock.Anything, mock.Anything).Return("logstash host") clientsMock.API.On("ValidateSession", mock.Anything, mock.Anything).Return(api.AuthSession{ - TeamName: &tt.auth.TeamDomain, - TeamID: &tt.auth.TeamID, + TeamName: &tc.auth.TeamDomain, + TeamID: &tc.auth.TeamID, }, nil) - clientsMock.API.On("DeleteApp", mock.Anything, mock.Anything, tt.app.AppID).Return(nil) + clientsMock.API.On("DeleteApp", mock.Anything, mock.Anything, tc.app.AppID).Return(nil) clientsMock.AddDefaultMocks() clients := shared.NewClientFactory(clientsMock.MockClientFactory()) - if !tt.unsaved { - if !tt.app.IsDev { - err := clients.AppClient().SaveDeployed(ctx, tt.app) + if !tc.unsaved { + if !tc.app.IsDev { + err := clients.AppClient().SaveDeployed(ctx, tc.app) require.NoError(t, err) apps, _, err := clients.AppClient().GetDeployedAll(ctx) require.NoError(t, err) assert.Equal(t, 1, len(apps)) } else { - err := clients.AppClient().SaveLocal(ctx, tt.app) + err := clients.AppClient().SaveLocal(ctx, tc.app) require.NoError(t, err) apps, err := clients.AppClient().GetLocalAll(ctx) require.NoError(t, err) @@ -107,17 +107,17 @@ func TestAppsDelete(t *testing.T) { } } - app, err := Delete(ctx, clients, logger.New(nil), tt.app.TeamDomain, tt.app, tt.auth) + app, err := Delete(ctx, clients, logger.New(nil), tc.app.TeamDomain, tc.app, tc.auth) require.NoError(t, err) - assert.Equal(t, tt.app, app) + assert.Equal(t, tc.app, app) clientsMock.API.AssertCalled( t, "DeleteApp", mock.Anything, - tt.auth.Token, - tt.app.AppID, + tc.auth.Token, + tc.app.AppID, ) - if !tt.app.IsDev { + if !tc.app.IsDev { apps, _, err := clients.AppClient().GetDeployedAll(ctx) require.NoError(t, err) assert.Equal(t, 0, len(apps)) diff --git a/internal/pkg/apps/install_test.go b/internal/pkg/apps/install_test.go index 6763a943..3a3f206a 100644 --- a/internal/pkg/apps/install_test.go +++ b/internal/pkg/apps/install_test.go @@ -508,11 +508,11 @@ func TestInstall(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() - clientsMock.IO.On("IsTTY").Return(tt.mockIsTTY) + clientsMock.IO.On("IsTTY").Return(tc.mockIsTTY) clientsMock.AddDefaultMocks() clientsMock.API.On( "CreateApp", @@ -521,8 +521,8 @@ func TestInstall(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockAPICreate, - tt.mockAPICreateError, + tc.mockAPICreate, + tc.mockAPICreateError, ) clientsMock.API.On( "DeveloperAppInstall", @@ -535,9 +535,9 @@ func TestInstall(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockAPIInstall, - tt.mockAPIInstallState, - tt.mockAPIInstallError, + tc.mockAPIInstall, + tc.mockAPIInstallState, + tc.mockAPIInstallError, ) clientsMock.API.On( "ExportAppManifest", @@ -553,7 +553,7 @@ func TestInstall(t *testing.T) { mock.Anything, mock.Anything, mock.Anything, - tt.mockApp.AppID, + tc.mockApp.AppID, ).Return( api.ValidateAppManifestResult{}, nil, @@ -567,37 +567,37 @@ func TestInstall(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockAPIUpdate, - tt.mockAPIUpdateError, + tc.mockAPIUpdate, + tc.mockAPIUpdateError, ) clientsMock.API.On( "ValidateSession", mock.Anything, mock.Anything, ).Return( - tt.mockAuthSession, + tc.mockAuthSession, nil, ) - if tt.mockIsTTY { + if tc.mockIsTTY { clientsMock.IO.On( "ConfirmPrompt", mock.Anything, "Update app settings with changes to the local manifest?", false, ).Return( - tt.mockConfirmPrompt, + tc.mockConfirmPrompt, nil, ) } manifestMock := &app.ManifestMockObject{} - manifestMock.On("GetManifestLocal", mock.Anything, mock.Anything, mock.Anything).Return(tt.mockManifestAppLocal, nil) - manifestMock.On("GetManifestRemote", mock.Anything, mock.Anything, mock.Anything).Return(tt.mockManifestAppRemote, nil) + manifestMock.On("GetManifestLocal", mock.Anything, mock.Anything, mock.Anything).Return(tc.mockManifestAppLocal, nil) + manifestMock.On("GetManifestRemote", mock.Anything, mock.Anything, mock.Anything).Return(tc.mockManifestAppRemote, nil) clientsMock.AppClient.Manifest = manifestMock mockProjectConfig := config.NewProjectConfigMock() - if tt.mockBoltExperiment { + if tc.mockBoltExperiment { clientsMock.Config.ExperimentsFlag = append(clientsMock.Config.ExperimentsFlag, string(experiment.BoltFrameworks)) clientsMock.Config.LoadExperiments(ctx, clientsMock.IO.PrintDebug) - mockProjectConfig.On("GetManifestSource", mock.Anything).Return(tt.mockManifestSource, nil) + mockProjectConfig.On("GetManifestSource", mock.Anything).Return(tc.mockManifestSource, nil) } mockProjectCache := cache.NewCacheMock() mockProjectCache.On( @@ -605,7 +605,7 @@ func TestInstall(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestHashInitial, + tc.mockManifestHashInitial, nil, ) mockProjectCache.On( @@ -613,7 +613,7 @@ func TestInstall(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestHashUpdated, + tc.mockManifestHashUpdated, nil, ) mockProjectCache.On( @@ -631,24 +631,24 @@ func TestInstall(t *testing.T) { ctx, clients, log, - tt.mockAuth, + tc.mockAuth, false, - tt.mockApp, - tt.mockOrgGrantWorkspaceID, + tc.mockApp, + tc.mockOrgGrantWorkspaceID, ) - if tt.expectedError != nil { + if tc.expectedError != nil { assert.Equal( t, - slackerror.ToSlackError(tt.expectedError).Code, + slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code, ) } else { require.NoError(t, err) } - assert.Equal(t, tt.expectedInstallState, state) - assert.Equal(t, tt.expectedApp, app) - if tt.expectedUpdate { + assert.Equal(t, tc.expectedInstallState, state) + assert.Equal(t, tc.expectedApp, app) + if tc.expectedUpdate { clientsMock.API.AssertCalled( t, "UpdateApp", @@ -660,7 +660,7 @@ func TestInstall(t *testing.T) { mock.Anything, ) clientsMock.API.AssertNotCalled(t, "CreateApp") - } else if tt.expectedCreate { + } else if tc.expectedCreate { clientsMock.API.AssertCalled( t, "CreateApp", @@ -675,12 +675,12 @@ func TestInstall(t *testing.T) { args := call.Arguments switch call.Method { case "CreateApp": - assert.Equal(t, tt.mockAuth.Token, args.Get(1)) - assert.Equal(t, tt.expectedManifest, args.Get(2)) + assert.Equal(t, tc.mockAuth.Token, args.Get(1)) + assert.Equal(t, tc.expectedManifest, args.Get(2)) case "UpdateApp": - assert.Equal(t, tt.mockAuth.Token, args.Get(1)) - assert.Equal(t, tt.mockApp.AppID, args.Get(2)) - assert.Equal(t, tt.expectedManifest, args.Get(3)) + assert.Equal(t, tc.mockAuth.Token, args.Get(1)) + assert.Equal(t, tc.mockApp.AppID, args.Get(2)) + assert.Equal(t, tc.expectedManifest, args.Get(3)) } } }) @@ -1332,11 +1332,11 @@ func TestInstallLocalApp(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() - clientsMock.IO.On("IsTTY").Return(tt.mockIsTTY) + clientsMock.IO.On("IsTTY").Return(tc.mockIsTTY) clientsMock.AddDefaultMocks() clientsMock.API.On( "CreateApp", @@ -1345,8 +1345,8 @@ func TestInstallLocalApp(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockAPICreate, - tt.mockAPICreateError, + tc.mockAPICreate, + tc.mockAPICreateError, ) clientsMock.API.On( "DeveloperAppInstall", @@ -1359,9 +1359,9 @@ func TestInstallLocalApp(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockAPIInstall, - tt.mockAPIInstallState, - tt.mockAPIInstallError, + tc.mockAPIInstall, + tc.mockAPIInstallState, + tc.mockAPIInstallError, ) clientsMock.API.On( "ExportAppManifest", @@ -1369,7 +1369,7 @@ func TestInstallLocalApp(t *testing.T) { mock.Anything, mock.Anything, ).Return( - api.ExportAppResult{Manifest: tt.mockManifest}, + api.ExportAppResult{Manifest: tc.mockManifest}, nil, ) clientsMock.API.On( @@ -1377,7 +1377,7 @@ func TestInstallLocalApp(t *testing.T) { mock.Anything, mock.Anything, mock.Anything, - tt.mockApp.AppID, + tc.mockApp.AppID, ).Return( api.ValidateAppManifestResult{}, nil, @@ -1391,39 +1391,39 @@ func TestInstallLocalApp(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockAPIUpdate, - tt.mockAPIUpdateError, + tc.mockAPIUpdate, + tc.mockAPIUpdateError, ) clientsMock.API.On( "ValidateSession", mock.Anything, mock.Anything, ).Return( - tt.mockAuthSession, + tc.mockAuthSession, nil, ) - if tt.mockIsTTY { + if tc.mockIsTTY { clientsMock.IO.On( "ConfirmPrompt", mock.Anything, "Update app settings with changes to the local manifest?", false, ).Return( - tt.mockConfirmPrompt, + tc.mockConfirmPrompt, nil, ) } manifestMock := &app.ManifestMockObject{} - manifestMock.On("GetManifestLocal", mock.Anything, mock.Anything, mock.Anything).Return(tt.mockManifest, nil) - manifestMock.On("GetManifestRemote", mock.Anything, mock.Anything, mock.Anything).Return(tt.mockManifest, nil) + manifestMock.On("GetManifestLocal", mock.Anything, mock.Anything, mock.Anything).Return(tc.mockManifest, nil) + manifestMock.On("GetManifestRemote", mock.Anything, mock.Anything, mock.Anything).Return(tc.mockManifest, nil) clientsMock.AppClient.Manifest = manifestMock mockProjectConfig := config.NewProjectConfigMock() - if tt.mockBoltExperiment { + if tc.mockBoltExperiment { clientsMock.Config.ExperimentsFlag = append(clientsMock.Config.ExperimentsFlag, string(experiment.BoltFrameworks)) clientsMock.Config.LoadExperiments(ctx, clientsMock.IO.PrintDebug) - mockProjectConfig.On("GetManifestSource", mock.Anything).Return(tt.mockManifestSource, nil) + mockProjectConfig.On("GetManifestSource", mock.Anything).Return(tc.mockManifestSource, nil) } - if tt.mockBoltInstallExperiment { + if tc.mockBoltInstallExperiment { clientsMock.Config.ExperimentsFlag = append(clientsMock.Config.ExperimentsFlag, string(experiment.BoltInstall)) clientsMock.Config.LoadExperiments(ctx, clientsMock.IO.PrintDebug) } @@ -1433,7 +1433,7 @@ func TestInstallLocalApp(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestHashInitial, + tc.mockManifestHashInitial, nil, ) mockProjectCache.On( @@ -1441,7 +1441,7 @@ func TestInstallLocalApp(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.mockManifestHashUpdated, + tc.mockManifestHashUpdated, nil, ) mockProjectCache.On( @@ -1458,16 +1458,16 @@ func TestInstallLocalApp(t *testing.T) { app, _, state, err := InstallLocalApp( ctx, clients, - tt.mockOrgGrantWorkspaceID, + tc.mockOrgGrantWorkspaceID, log, - tt.mockAuth, - tt.mockApp, + tc.mockAuth, + tc.mockApp, ) require.NoError(t, err) - assert.Equal(t, tt.expectedInstallState, state) - assert.Equal(t, tt.expectedApp, app) - if tt.expectedUpdate { + assert.Equal(t, tc.expectedInstallState, state) + assert.Equal(t, tc.expectedApp, app) + if tc.expectedUpdate { clientsMock.API.AssertCalled( t, "UpdateApp", @@ -1479,7 +1479,7 @@ func TestInstallLocalApp(t *testing.T) { mock.Anything, ) clientsMock.API.AssertNotCalled(t, "CreateApp") - } else if tt.expectedCreate { + } else if tc.expectedCreate { clientsMock.API.AssertCalled( t, "CreateApp", @@ -1494,12 +1494,12 @@ func TestInstallLocalApp(t *testing.T) { args := call.Arguments switch call.Method { case "CreateApp": - assert.Equal(t, tt.mockAuth.Token, args.Get(1)) - assert.Equal(t, tt.expectedManifest, args.Get(2)) + assert.Equal(t, tc.mockAuth.Token, args.Get(1)) + assert.Equal(t, tc.expectedManifest, args.Get(2)) case "UpdateApp": - assert.Equal(t, tt.mockAuth.Token, args.Get(1)) - assert.Equal(t, tt.mockApp.AppID, args.Get(2)) - assert.Equal(t, tt.expectedManifest, args.Get(3)) + assert.Equal(t, tc.mockAuth.Token, args.Get(1)) + assert.Equal(t, tc.mockApp.AppID, args.Get(2)) + assert.Equal(t, tc.expectedManifest, args.Get(3)) } } }) @@ -1583,19 +1583,19 @@ func TestValidateManifestForInstall(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() - tt.setup(clientsMock) - clientsMock.API.On("ValidateAppManifest", mock.Anything, mock.Anything, mock.Anything, tt.app.AppID). - Return(tt.result, tt.err) + tc.setup(clientsMock) + clientsMock.API.On("ValidateAppManifest", mock.Anything, mock.Anything, mock.Anything, tc.app.AppID). + Return(tc.result, tc.err) clients := shared.NewClientFactory(clientsMock.MockClientFactory()) - err := validateManifestForInstall(ctx, clients, "xoxe.xoxp-1-token", tt.app, tt.manifest) + err := validateManifestForInstall(ctx, clients, "xoxe.xoxp-1-token", tc.app, tc.manifest) assert.NoError(t, err) - tt.check(clientsMock) + tc.check(clientsMock) }) } } @@ -1656,33 +1656,33 @@ func TestSetAppEnvironmentTokens(t *testing.T) { expectedOutput: "The bot token differs from the set SLACK_BOT_TOKEN environment variable", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() clientsMock.IO.AddDefaultMocks() - if tt.envAppToken != "" { - clientsMock.Os.On("Getenv", "SLACK_APP_TOKEN").Return(tt.envAppToken) + if tc.envAppToken != "" { + clientsMock.Os.On("Getenv", "SLACK_APP_TOKEN").Return(tc.envAppToken) } - if tt.envBotToken != "" { + if tc.envBotToken != "" { clientsMock.Os.On("Getenv", "SLACK_BOT_TOKEN").Unset() - clientsMock.Os.On("Getenv", "SLACK_BOT_TOKEN").Return(tt.envBotToken) + clientsMock.Os.On("Getenv", "SLACK_BOT_TOKEN").Return(tc.envBotToken) } clientsMock.Os.On("LookupEnv", "SLACK_APP_TOKEN"). - Return(tt.envAppToken, tt.envAppToken != "") + Return(tc.envAppToken, tc.envAppToken != "") clientsMock.Os.On("LookupEnv", "SLACK_BOT_TOKEN"). - Return(tt.envBotToken, tt.envBotToken != "") + Return(tc.envBotToken, tc.envBotToken != "") clientsMock.Os.On("Setenv", "SLACK_APP_TOKEN", mock.Anything).Return(nil) clientsMock.Os.On("Setenv", "SLACK_BOT_TOKEN", mock.Anything).Return(nil) output := &bytes.Buffer{} clientsMock.IO.Stdout.SetOutput(output) clients := shared.NewClientFactory(clientsMock.MockClientFactory()) - err := setAppEnvironmentTokens(ctx, clients, tt.result) + err := setAppEnvironmentTokens(ctx, clients, tc.result) assert.NoError(t, err) - assert.Equal(t, tt.expectedAppToken, clients.Os.Getenv("SLACK_APP_TOKEN")) - assert.Equal(t, tt.expectedBotToken, clients.Os.Getenv("SLACK_BOT_TOKEN")) - assert.Contains(t, output.String(), tt.expectedOutput) + assert.Equal(t, tc.expectedAppToken, clients.Os.Getenv("SLACK_APP_TOKEN")) + assert.Equal(t, tc.expectedBotToken, clients.Os.Getenv("SLACK_BOT_TOKEN")) + assert.Contains(t, output.String(), tc.expectedOutput) }) } } diff --git a/internal/pkg/create/create_test.go b/internal/pkg/create/create_test.go index 397db160..4ea7c58c 100644 --- a/internal/pkg/create/create_test.go +++ b/internal/pkg/create/create_test.go @@ -147,17 +147,17 @@ func Test_generateGitZipFileURL(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Create mocks httpClientMock := &slackhttp.HTTPClientMock{} - tt.setupHTTPClientMock(httpClientMock) + tc.setupHTTPClientMock(httpClientMock) // Execute - url := generateGitZipFileURL(httpClientMock, tt.templateURL, tt.gitBranch) + url := generateGitZipFileURL(httpClientMock, tc.templateURL, tc.gitBranch) // Assertions - assert.Equal(t, tt.expectedURL, url) + assert.Equal(t, tc.expectedURL, url) }) } } @@ -259,7 +259,7 @@ func Test_Create_installProjectDependencies(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Remove any enabled experiments during the test and restore afterward var _EnabledExperiments = experiment.EnabledExperiments @@ -280,7 +280,7 @@ func Test_Create_installProjectDependencies(t *testing.T) { clientsMock.AddDefaultMocks() // Set experiment flag - clientsMock.Config.ExperimentsFlag = append(clientsMock.Config.ExperimentsFlag, tt.experiments...) + clientsMock.Config.ExperimentsFlag = append(clientsMock.Config.ExperimentsFlag, tc.experiments...) clientsMock.Config.LoadExperiments(ctx, clientsMock.IO.PrintDebug) // Create clients that is mocked for testing @@ -288,8 +288,8 @@ func Test_Create_installProjectDependencies(t *testing.T) { // Set runtime to be Deno (or node or whatever) clients.SDKConfig.Runtime = "deno" - if tt.runtime != "" { - clients.SDKConfig.Runtime = tt.runtime + if tc.runtime != "" { + clients.SDKConfig.Runtime = tc.runtime } // Create project directory @@ -298,7 +298,7 @@ func Test_Create_installProjectDependencies(t *testing.T) { } // Create files - for filePath, fileData := range tt.existingFiles { + for filePath, fileData := range tc.existingFiles { filePathAbs := filepath.Join(projectDirPath, filePath) // Create the directory if err := clients.Fs.MkdirAll(filepath.Dir(filePathAbs), 0755); err != nil { @@ -311,21 +311,21 @@ func Test_Create_installProjectDependencies(t *testing.T) { } // Run the test - outputs := InstallProjectDependencies(ctx, clients, projectDirPath, tt.manifestSource) + outputs := InstallProjectDependencies(ctx, clients, projectDirPath, tc.manifestSource) // Assertions - for _, expectedOutput := range tt.expectedOutputs { + for _, expectedOutput := range tc.expectedOutputs { require.Contains(t, outputs, expectedOutput) } - for _, unexpectedOutput := range tt.unexpectedOutputs { + for _, unexpectedOutput := range tc.unexpectedOutputs { require.NotContains(t, outputs, unexpectedOutput) } - for _, expectedVerboseOutput := range tt.expectedVerboseOutputs { + for _, expectedVerboseOutput := range tc.expectedVerboseOutputs { clientsMock.IO.AssertCalled(t, "PrintDebug", mock.Anything, expectedVerboseOutput, mock.MatchedBy(func(args ...any) bool { return true })) } assert.NotEmpty(t, clients.Config.ProjectID, "config.project_id") // output := clientsMock.GetCombinedOutput() - // assert.Contains(t, output, tt.expectedOutputs) + // assert.Contains(t, output, tc.expectedOutputs) }) } } diff --git a/internal/pkg/create/sample_test.go b/internal/pkg/create/sample_test.go index 7e28309c..c9e19bb1 100644 --- a/internal/pkg/create/sample_test.go +++ b/internal/pkg/create/sample_test.go @@ -82,18 +82,18 @@ func TestSamples_GetSampleRepos(t *testing.T) { expectedError: slackerror.New(slackerror.ErrSampleCreate), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { clientMock := NewMockSampler() w := httptest.NewRecorder() - _, _ = io.WriteString(w, fmt.Sprint(tt.slackAPIResponse)) + _, _ = io.WriteString(w, fmt.Sprint(tc.slackAPIResponse)) res := w.Result() req, err := http.NewRequest("GET", "https://www.slack.com/slack-samples/repositories", nil) require.NoError(t, err) req.Header.Set("Accept", "application/json") clientMock.On("Do", req).Return(res, nil) w = httptest.NewRecorder() - _, _ = io.WriteString(w, fmt.Sprint(tt.githubResponse)) + _, _ = io.WriteString(w, fmt.Sprint(tc.githubResponse)) res = w.Result() req, err = http.NewRequest("GET", "https://api.github.com/orgs/slack-samples/repos?type=public", nil) require.NoError(t, err) @@ -102,11 +102,11 @@ func TestSamples_GetSampleRepos(t *testing.T) { clientMock.On("Do", req).Return(res, nil) result, err := GetSampleRepos(clientMock) - if tt.expectedError != nil { - assert.Equal(t, slackerror.ToSlackError(err).Code, tt.expectedError.Code) + if tc.expectedError != nil { + assert.Equal(t, slackerror.ToSlackError(err).Code, tc.expectedError.Code) } else { require.NoError(t, err) - assert.Equal(t, tt.expectedResults, result) + assert.Equal(t, tc.expectedResults, result) } }) } diff --git a/internal/pkg/create/template_test.go b/internal/pkg/create/template_test.go index 5926d52c..de3ae8b2 100644 --- a/internal/pkg/create/template_test.go +++ b/internal/pkg/create/template_test.go @@ -173,18 +173,18 @@ func TestTemplate_ResolveTemplateURL(t *testing.T) { expectedError: slackerror.New(slackerror.ErrTemplatePathNotFound), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - template, err := ResolveTemplateURL(tt.url) - if tt.expectedError != nil { + template, err := ResolveTemplateURL(tc.url) + if tc.expectedError != nil { require.Error(t, err) assert.Equal( t, - slackerror.ToSlackError(tt.expectedError).Code, + slackerror.ToSlackError(tc.expectedError).Code, slackerror.ToSlackError(err).Code, ) } - assert.Equal(t, tt.expectedTemplate, template) + assert.Equal(t, tc.expectedTemplate, template) }) } } @@ -230,10 +230,10 @@ func TestTemplate_GetTemplatePath(t *testing.T) { expectedPath: "ssh://user@example:path/to/sample", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - path := tt.template.GetTemplatePath() - assert.Equal(t, tt.expectedPath, path) + path := tc.template.GetTemplatePath() + assert.Equal(t, tc.expectedPath, path) }) } } @@ -293,10 +293,10 @@ func TestTemplate_IsSample(t *testing.T) { expectedSample: false, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - isSample := tt.template.IsSample() - assert.Equal(t, tt.expectedSample, isSample) + isSample := tc.template.IsSample() + assert.Equal(t, tc.expectedSample, isSample) }) } } @@ -370,10 +370,10 @@ func TestTemplate_IsTrusted(t *testing.T) { expectedTrusted: false, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - isTrusted := tt.template.IsTrusted() - assert.Equal(t, tt.expectedTrusted, isTrusted) + isTrusted := tc.template.IsTrusted() + assert.Equal(t, tc.expectedTrusted, isTrusted) }) } } diff --git a/internal/pkg/datastore/bulk_delete_test.go b/internal/pkg/datastore/bulk_delete_test.go index a859ed53..e5f11c0e 100644 --- a/internal/pkg/datastore/bulk_delete_test.go +++ b/internal/pkg/datastore/bulk_delete_test.go @@ -28,7 +28,7 @@ import ( func TestDatastoreBulkDeleteArguments(t *testing.T) { mockAppID := "A0123456" - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { Expression string Query types.AppDatastoreBulkDelete Results types.AppDatastoreBulkDeleteResult @@ -62,13 +62,13 @@ func TestDatastoreBulkDeleteArguments(t *testing.T) { log := logger.Logger{ Data: map[string]interface{}{}, } - clientsMock.API.On("AppsDatastoreBulkDelete", mock.Anything, mock.Anything, tt.Query). - Return(tt.Results, nil) + clientsMock.API.On("AppsDatastoreBulkDelete", mock.Anything, mock.Anything, tc.Query). + Return(tc.Results, nil) client := shared.NewClientFactory(clientsMock.MockClientFactory()) - event, err := BulkDelete(ctx, client, &log, tt.Query) + event, err := BulkDelete(ctx, client, &log, tc.Query) if assert.NoError(t, err) { - assert.Equal(t, tt.Results, event.Data["bulkDeleteResult"]) + assert.Equal(t, tc.Results, event.Data["bulkDeleteResult"]) } }) } diff --git a/internal/pkg/datastore/bulk_get_test.go b/internal/pkg/datastore/bulk_get_test.go index 8ad21f5a..9c0e289b 100644 --- a/internal/pkg/datastore/bulk_get_test.go +++ b/internal/pkg/datastore/bulk_get_test.go @@ -28,7 +28,7 @@ import ( func TestDatastoreBulkGetArguments(t *testing.T) { mockAppID := "A0123456" - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { Expression string Query types.AppDatastoreBulkGet Results types.AppDatastoreBulkGetResult @@ -63,13 +63,13 @@ func TestDatastoreBulkGetArguments(t *testing.T) { log := logger.Logger{ Data: map[string]interface{}{}, } - clientsMock.API.On("AppsDatastoreBulkGet", mock.Anything, mock.Anything, tt.Query). - Return(tt.Results, nil) + clientsMock.API.On("AppsDatastoreBulkGet", mock.Anything, mock.Anything, tc.Query). + Return(tc.Results, nil) client := shared.NewClientFactory(clientsMock.MockClientFactory()) - event, err := BulkGet(ctx, client, &log, tt.Query) + event, err := BulkGet(ctx, client, &log, tc.Query) if assert.NoError(t, err) { - assert.Equal(t, tt.Results, event.Data["bulkGetResult"]) + assert.Equal(t, tc.Results, event.Data["bulkGetResult"]) } }) } diff --git a/internal/pkg/datastore/bulk_put_test.go b/internal/pkg/datastore/bulk_put_test.go index 8b59733a..47620104 100644 --- a/internal/pkg/datastore/bulk_put_test.go +++ b/internal/pkg/datastore/bulk_put_test.go @@ -28,7 +28,7 @@ import ( func TestDatastoreBulkPutArguments(t *testing.T) { mockAppID := "A0123456" - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { Expression string Query types.AppDatastoreBulkPut Results types.AppDatastoreBulkPutResult @@ -70,13 +70,13 @@ func TestDatastoreBulkPutArguments(t *testing.T) { log := logger.Logger{ Data: map[string]interface{}{}, } - clientsMock.API.On("AppsDatastoreBulkPut", mock.Anything, mock.Anything, tt.Query). - Return(tt.Results, nil) + clientsMock.API.On("AppsDatastoreBulkPut", mock.Anything, mock.Anything, tc.Query). + Return(tc.Results, nil) client := shared.NewClientFactory(clientsMock.MockClientFactory()) - event, err := BulkPut(ctx, client, &log, tt.Query) + event, err := BulkPut(ctx, client, &log, tc.Query) if assert.NoError(t, err) { - assert.Equal(t, tt.Results, event.Data["bulkPutResult"]) + assert.Equal(t, tc.Results, event.Data["bulkPutResult"]) } }) } diff --git a/internal/pkg/datastore/delete_test.go b/internal/pkg/datastore/delete_test.go index 5e96900a..0e126e27 100644 --- a/internal/pkg/datastore/delete_test.go +++ b/internal/pkg/datastore/delete_test.go @@ -28,7 +28,7 @@ import ( func TestDatastoreDeleteArguments(t *testing.T) { mockAppID := "A0123456" - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { Expression string Query types.AppDatastoreDelete Results types.AppDatastoreDeleteResult @@ -51,13 +51,13 @@ func TestDatastoreDeleteArguments(t *testing.T) { log := logger.Logger{ Data: map[string]interface{}{}, } - clientsMock.API.On("AppsDatastoreDelete", mock.Anything, mock.Anything, tt.Query). - Return(tt.Results, nil) + clientsMock.API.On("AppsDatastoreDelete", mock.Anything, mock.Anything, tc.Query). + Return(tc.Results, nil) client := shared.NewClientFactory(clientsMock.MockClientFactory()) - event, err := Delete(ctx, client, &log, tt.Query) + event, err := Delete(ctx, client, &log, tc.Query) if assert.NoError(t, err) { - assert.Equal(t, tt.Results, event.Data["deleteResult"]) + assert.Equal(t, tc.Results, event.Data["deleteResult"]) } }) } diff --git a/internal/pkg/datastore/get_test.go b/internal/pkg/datastore/get_test.go index ee1ae0e6..b27916e1 100644 --- a/internal/pkg/datastore/get_test.go +++ b/internal/pkg/datastore/get_test.go @@ -28,7 +28,7 @@ import ( func TestDatastoreGetArguments(t *testing.T) { mockAppID := "A0123456" - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { Expression string Query types.AppDatastoreGet Results types.AppDatastoreGetResult @@ -51,13 +51,13 @@ func TestDatastoreGetArguments(t *testing.T) { log := logger.Logger{ Data: map[string]interface{}{}, } - clientsMock.API.On("AppsDatastoreGet", mock.Anything, mock.Anything, tt.Query). - Return(tt.Results, nil) + clientsMock.API.On("AppsDatastoreGet", mock.Anything, mock.Anything, tc.Query). + Return(tc.Results, nil) client := shared.NewClientFactory(clientsMock.MockClientFactory()) - event, err := Get(ctx, client, &log, tt.Query) + event, err := Get(ctx, client, &log, tc.Query) if assert.NoError(t, err) { - assert.Equal(t, tt.Results, event.Data["getResult"]) + assert.Equal(t, tc.Results, event.Data["getResult"]) } }) } diff --git a/internal/pkg/datastore/put_test.go b/internal/pkg/datastore/put_test.go index 0b36a810..ba9b299b 100644 --- a/internal/pkg/datastore/put_test.go +++ b/internal/pkg/datastore/put_test.go @@ -28,7 +28,7 @@ import ( func TestDatastorePutArguments(t *testing.T) { mockAppID := "A0123456" - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { Expression string Query types.AppDatastorePut Results types.AppDatastorePutResult @@ -51,13 +51,13 @@ func TestDatastorePutArguments(t *testing.T) { log := logger.Logger{ Data: map[string]interface{}{}, } - clientsMock.API.On("AppsDatastorePut", mock.Anything, mock.Anything, tt.Query). - Return(tt.Results, nil) + clientsMock.API.On("AppsDatastorePut", mock.Anything, mock.Anything, tc.Query). + Return(tc.Results, nil) client := shared.NewClientFactory(clientsMock.MockClientFactory()) - event, err := Put(ctx, client, &log, tt.Query) + event, err := Put(ctx, client, &log, tc.Query) if assert.NoError(t, err) { - assert.Equal(t, tt.Results, event.Data["putResult"]) + assert.Equal(t, tc.Results, event.Data["putResult"]) } }) } diff --git a/internal/pkg/datastore/query_test.go b/internal/pkg/datastore/query_test.go index 8d8c628f..4cff6608 100644 --- a/internal/pkg/datastore/query_test.go +++ b/internal/pkg/datastore/query_test.go @@ -28,7 +28,7 @@ import ( func TestDatastoreQueryArguments(t *testing.T) { mockAppID := "A0123456" - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { Expression string Query types.AppDatastoreQuery Results types.AppDatastoreQueryResult @@ -109,13 +109,13 @@ func TestDatastoreQueryArguments(t *testing.T) { log := logger.Logger{ Data: map[string]interface{}{}, } - clientsMock.API.On("AppsDatastoreQuery", mock.Anything, mock.Anything, tt.Query). - Return(tt.Results, nil) + clientsMock.API.On("AppsDatastoreQuery", mock.Anything, mock.Anything, tc.Query). + Return(tc.Results, nil) client := shared.NewClientFactory(clientsMock.MockClientFactory()) - event, err := Query(ctx, client, &log, tt.Query) + event, err := Query(ctx, client, &log, tc.Query) if assert.NoError(t, err) { - assert.Equal(t, tt.Results, event.Data["queryResult"]) + assert.Equal(t, tc.Results, event.Data["queryResult"]) } }) } diff --git a/internal/pkg/datastore/update_test.go b/internal/pkg/datastore/update_test.go index b538b7a5..a1c793c0 100644 --- a/internal/pkg/datastore/update_test.go +++ b/internal/pkg/datastore/update_test.go @@ -28,7 +28,7 @@ import ( func TestDatastoreUpdateArguments(t *testing.T) { mockAppID := "A0123456" - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { Expression string Query types.AppDatastoreUpdate Results types.AppDatastoreUpdateResult @@ -51,13 +51,13 @@ func TestDatastoreUpdateArguments(t *testing.T) { log := logger.Logger{ Data: map[string]interface{}{}, } - clientsMock.API.On("AppsDatastoreUpdate", mock.Anything, mock.Anything, tt.Query). - Return(tt.Results, nil) + clientsMock.API.On("AppsDatastoreUpdate", mock.Anything, mock.Anything, tc.Query). + Return(tc.Results, nil) client := shared.NewClientFactory(clientsMock.MockClientFactory()) - event, err := Update(ctx, client, &log, tt.Query) + event, err := Update(ctx, client, &log, tc.Query) if assert.NoError(t, err) { - assert.Equal(t, tt.Results, event.Data["updateResult"]) + assert.Equal(t, tc.Results, event.Data["updateResult"]) } }) } diff --git a/internal/pkg/platform/activity_test.go b/internal/pkg/platform/activity_test.go index 7d109951..8c360907 100644 --- a/internal/pkg/platform/activity_test.go +++ b/internal/pkg/platform/activity_test.go @@ -95,7 +95,7 @@ func Test_prettifyActivity(t *testing.T) { } func TestPlatformActivity_StreamingLogs(t *testing.T) { - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { Setup func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) context.Context Args types.ActivityArgs ExpectedAsserts func(*testing.T, context.Context, *shared.ClientsMock) // Optional @@ -236,31 +236,31 @@ func TestPlatformActivity_StreamingLogs(t *testing.T) { // Create clients that is mocked for testing clients := shared.NewClientFactory(clientsMock.MockClientFactory()) // Setup custom per-test mocks (higher priority than default mocks) - if tt.Setup != nil { - ctxMock = tt.Setup(t, ctxMock, clientsMock) + if tc.Setup != nil { + ctxMock = tc.Setup(t, ctxMock, clientsMock) } // Setup generic test suite mocks clientsMock.API.On("ValidateSession", mock.Anything, mock.Anything).Return(api.AuthSession{}, nil) // Setup default mock actions clientsMock.AddDefaultMocks() - err := Activity(ctxMock, clients, &logger.Logger{}, tt.Args) - if tt.ExpectedError != nil { + err := Activity(ctxMock, clients, &logger.Logger{}, tc.Args) + if tc.ExpectedError != nil { require.Error(t, err) - assert.Contains(t, err.Error(), tt.ExpectedError.Error(), err) + assert.Contains(t, err.Error(), tc.ExpectedError.Error(), err) } else { require.NoError(t, err) } // Assert mocks or other custom assertions - if tt.ExpectedAsserts != nil { - tt.ExpectedAsserts(t, ctxMock, clientsMock) + if tc.ExpectedAsserts != nil { + tc.ExpectedAsserts(t, ctxMock, clientsMock) } }) } } func TestPlatformActivity_TriggerExecutedToString(t *testing.T) { - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { Activity api.Activity ExpectedResults []string }{ @@ -333,8 +333,8 @@ func TestPlatformActivity_TriggerExecutedToString(t *testing.T) { }, } { t.Run(name, func(t *testing.T) { - actualResult := triggerExecutedToString(tt.Activity) - for _, expectedResult := range tt.ExpectedResults { + actualResult := triggerExecutedToString(tc.Activity) + for _, expectedResult := range tc.ExpectedResults { require.Contains(t, actualResult, expectedResult) } // Confirm no nil pointers leak to output @@ -345,7 +345,7 @@ func TestPlatformActivity_TriggerExecutedToString(t *testing.T) { } func Test_datastoreRequestResultToString(t *testing.T) { - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { activity api.Activity expectedResults []string }{ @@ -388,8 +388,8 @@ func Test_datastoreRequestResultToString(t *testing.T) { }, } { t.Run(name, func(t *testing.T) { - actualResult := datastoreRequestResultToString(tt.activity) - for _, expectedResult := range tt.expectedResults { + actualResult := datastoreRequestResultToString(tc.activity) + for _, expectedResult := range tc.expectedResults { require.Contains(t, actualResult, expectedResult) } // Confirm no nil pointers leak to output diff --git a/internal/pkg/platform/localserver_test.go b/internal/pkg/platform/localserver_test.go index a4848114..584a28a3 100644 --- a/internal/pkg/platform/localserver_test.go +++ b/internal/pkg/platform/localserver_test.go @@ -38,7 +38,7 @@ import ( var WebsocketDialerDial = &websocketDialerDial func Test_LocalServer_Start(t *testing.T) { - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { Setup func(t *testing.T, cm *shared.ClientsMock, clients *shared.ClientFactory, conn *WebSocketConnMock) Test func(t *testing.T, ctx context.Context, cm *shared.ClientsMock, server LocalServer, conn *WebSocketConnMock) wsHandler func(w http.ResponseWriter, r *http.Request) @@ -114,8 +114,8 @@ func Test_LocalServer_Start(t *testing.T) { } { t.Run(name, func(t *testing.T) { wsFakeURL := "http://slack.com/websocketzzzz" - if tt.wsHandler != nil { - ts := httptest.NewServer(http.HandlerFunc(tt.wsHandler)) + if tc.wsHandler != nil { + ts := httptest.NewServer(http.HandlerFunc(tc.wsHandler)) defer ts.Close() wsFakeURL = "ws" + strings.TrimPrefix(ts.URL, "http") } @@ -127,8 +127,8 @@ func Test_LocalServer_Start(t *testing.T) { clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { cf.SDKConfig = hooks.NewSDKConfigMock() }) - if tt.Setup != nil { - tt.Setup(t, clientsMock, clients, conn) + if tc.Setup != nil { + tc.Setup(t, clientsMock, clients, conn) } clientsMock.API.On("ConnectionsOpen", mock.Anything, mock.Anything).Return(api.AppsConnectionsOpenResult{URL: wsFakeURL}, nil) // Setup default mock actions @@ -150,21 +150,21 @@ func Test_LocalServer_Start(t *testing.T) { clients.SDKConfig, conn, } - if tt.fakeDialer != nil { + if tc.fakeDialer != nil { orig := *WebsocketDialerDial - websocketDialerDial = tt.fakeDialer(conn) + websocketDialerDial = tc.fakeDialer(conn) defer func() { websocketDialerDial = orig }() } - tt.Test(t, ctx, clientsMock, server, conn) + tc.Test(t, ctx, clientsMock, server, conn) }) } } func Test_LocalServer_Listen(t *testing.T) { - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { Setup func(t *testing.T, cm *shared.ClientsMock, clients *shared.ClientFactory, conn *WebSocketConnMock) Test func(t *testing.T, ctx context.Context, cm *shared.ClientsMock, server LocalServer, conn *WebSocketConnMock) }{ @@ -339,8 +339,8 @@ func Test_LocalServer_Listen(t *testing.T) { clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(cf *shared.ClientFactory) { cf.SDKConfig = hooks.NewSDKConfigMock() }) - if tt.Setup != nil { - tt.Setup(t, clientsMock, clients, conn) + if tc.Setup != nil { + tc.Setup(t, clientsMock, clients, conn) } // Setup default mock actions conn.AddDefaultMocks() @@ -361,7 +361,7 @@ func Test_LocalServer_Listen(t *testing.T) { clients.SDKConfig, conn, } - tt.Test(t, ctx, clientsMock, server, conn) + tc.Test(t, ctx, clientsMock, server, conn) }) } } diff --git a/internal/prompts/app_select_test.go b/internal/prompts/app_select_test.go index c171e420..aac13515 100644 --- a/internal/prompts/app_select_test.go +++ b/internal/prompts/app_select_test.go @@ -242,32 +242,32 @@ func TestGetTokenApp(t *testing.T) { }, } - for name, test := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() - clientsMock.Auth.On(AuthWithToken, mock.Anything, test.tokenFlag). - Return(test.tokenAuth, test.tokenErr) + clientsMock.Auth.On(AuthWithToken, mock.Anything, tc.tokenFlag). + Return(tc.tokenAuth, tc.tokenErr) clientsMock.API.On(GetAppStatus, mock.Anything, mock.Anything, mock.Anything, mock.Anything). - Return(test.appStatus, test.statusErr) + Return(tc.appStatus, tc.statusErr) clientsMock.AddDefaultMocks() clients := shared.NewClientFactory(clientsMock.MockClientFactory()) - for _, app := range test.saveLocal { + for _, app := range tc.saveLocal { err := clients.AppClient().SaveLocal(ctx, app) require.NoError(t, err) } - selection, err := getTokenApp(ctx, clients, test.tokenFlag, test.appFlag) + selection, err := getTokenApp(ctx, clients, tc.tokenFlag, tc.appFlag) - if test.tokenErr != nil && assert.Error(t, err) { - require.Equal(t, test.tokenErr, err) - } else if test.statusErr != nil && assert.Error(t, err) { - require.Equal(t, test.statusErr, err) + if tc.tokenErr != nil && assert.Error(t, err) { + require.Equal(t, tc.tokenErr, err) + } else if tc.statusErr != nil && assert.Error(t, err) { + require.Equal(t, tc.statusErr, err) } else { require.NoError(t, err) - assert.Equal(t, test.tokenAuth, selection.Auth) - expectedApp := test.appInfo - expectedApp.UserID = test.tokenAuth.UserID + assert.Equal(t, tc.tokenAuth, selection.Auth) + expectedApp := tc.appInfo + expectedApp.UserID = tc.tokenAuth.UserID assert.Equal(t, expectedApp, selection.App) } }) @@ -357,35 +357,35 @@ func TestPrompt_AppSelectPrompt_TokenAppFlag(t *testing.T) { }, } - for name, test := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() - clientsMock.Auth.On(AuthWithToken, mock.Anything, test.tokenFlag). - Return(test.tokenAuth, nil) + clientsMock.Auth.On(AuthWithToken, mock.Anything, tc.tokenFlag). + Return(tc.tokenAuth, nil) clientsMock.API.On(GetAppStatus, mock.Anything, mock.Anything, mock.Anything, mock.Anything). - Return(test.appStatus, test.appStatusErr) + Return(tc.appStatus, tc.appStatusErr) clientsMock.API.On("ValidateSession", mock.Anything, mock.Anything).Return(api.AuthSession{ - TeamName: &test.tokenAuth.TeamDomain, - TeamID: &test.tokenAuth.TeamID, + TeamName: &tc.tokenAuth.TeamDomain, + TeamID: &tc.tokenAuth.TeamID, }, nil) clientsMock.AddDefaultMocks() clients := shared.NewClientFactory(clientsMock.MockClientFactory()) - clients.Config.TokenFlag = test.tokenFlag - clients.Config.AppFlag = test.appFlag + clients.Config.TokenFlag = tc.tokenFlag + clients.Config.AppFlag = tc.appFlag - selection, err := AppSelectPrompt(ctx, clients, ShowAllEnvironments, test.selectStatus) + selection, err := AppSelectPrompt(ctx, clients, ShowAllEnvironments, tc.selectStatus) - if test.appStatusErr != nil && assert.Error(t, err) { - require.Equal(t, test.appStatusErr, err) - } else if test.expectedErr != nil && assert.Error(t, err) { - require.Equal(t, test.expectedErr, err) + if tc.appStatusErr != nil && assert.Error(t, err) { + require.Equal(t, tc.appStatusErr, err) + } else if tc.expectedErr != nil && assert.Error(t, err) { + require.Equal(t, tc.expectedErr, err) } else { require.NoError(t, err) - assert.Equal(t, test.expectedApp.Auth, selection.Auth) - expectedApp := test.expectedApp.App - expectedApp.UserID = test.expectedApp.Auth.UserID + assert.Equal(t, tc.expectedApp.Auth, selection.Auth) + expectedApp := tc.expectedApp.App + expectedApp.UserID = tc.expectedApp.Auth.UserID assert.Equal(t, expectedApp, selection.App) } }) @@ -563,7 +563,7 @@ func TestPrompt_AppSelectPrompt_GetApps(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() @@ -571,21 +571,21 @@ func TestPrompt_AppSelectPrompt_GetApps(t *testing.T) { GetAppStatus, mock.Anything, mock.Anything, - tt.mockTeam1StatusAppIDs, + tc.mockTeam1StatusAppIDs, mock.Anything, ).Return( - tt.mockTeam1Status, - tt.mockTeam1StatusError, + tc.mockTeam1Status, + tc.mockTeam1StatusError, ) clientsMock.API.On( GetAppStatus, mock.Anything, mock.Anything, - tt.mockTeam2StatusAppIDs, + tc.mockTeam2StatusAppIDs, mock.Anything, ).Return( - tt.mockTeam2Status, - tt.mockTeam2StatusError, + tc.mockTeam2Status, + tc.mockTeam2StatusError, ) clientsMock.API.On( "ValidateSession", @@ -599,7 +599,7 @@ func TestPrompt_AppSelectPrompt_GetApps(t *testing.T) { Auths, mock.Anything, ).Return( - tt.mockAuths, + tc.mockAuths, nil, ) clientsMock.Auth.On( @@ -607,38 +607,38 @@ func TestPrompt_AppSelectPrompt_GetApps(t *testing.T) { mock.Anything, team2TeamID, ).Return( - tt.mockTeam2SavedAuth, - tt.mockTeam2SavedAuthError, + tc.mockTeam2SavedAuth, + tc.mockTeam2SavedAuthError, ) clientsMock.Auth.On( AuthWithTeamID, mock.Anything, team1TeamID, ).Return( - tt.mockTeam1SavedAuth, - tt.mockTeam1SavedAuthError, + tc.mockTeam1SavedAuth, + tc.mockTeam1SavedAuthError, ) clientsMock.Auth.On( AuthWithTeamID, mock.Anything, enterprise1TeamID, ).Return( - tt.mockEnterprise1SavedAuth, - tt.mockEnterprise1SavedAuthError, + tc.mockEnterprise1SavedAuth, + tc.mockEnterprise1SavedAuthError, ) clientsMock.AddDefaultMocks() clients := shared.NewClientFactory(clientsMock.MockClientFactory()) - for _, app := range tt.mockAppsSavedDeployed { + for _, app := range tc.mockAppsSavedDeployed { err := clients.AppClient().SaveDeployed(ctx, app) require.NoError(t, err) } - for _, app := range tt.mockAppsSavedLocal { + for _, app := range tc.mockAppsSavedLocal { err := clients.AppClient().SaveLocal(ctx, app) require.NoError(t, err) } apps, err := getApps(ctx, clients) - assert.Equal(t, tt.expectedError, err) - assert.Equal(t, tt.expectedApps, apps) + assert.Equal(t, tc.expectedError, err) + assert.Equal(t, tc.expectedApps, apps) }) } } @@ -1188,7 +1188,7 @@ func TestPrompt_AppSelectPrompt(t *testing.T) { expectedError: slackerror.New(slackerror.ErrTeamNotFound), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() @@ -1196,23 +1196,23 @@ func TestPrompt_AppSelectPrompt(t *testing.T) { Auths, mock.Anything, ).Return( - tt.mockAuths, + tc.mockAuths, nil, ) clientsMock.Auth.On( AuthWithTeamID, mock.Anything, - tt.mockAuthWithTeamIDTeamID, + tc.mockAuthWithTeamIDTeamID, ).Return( types.SlackAuth{}, - tt.mockAuthWithTeamIDError, + tc.mockAuthWithTeamIDError, ) clientsMock.Auth.On( AuthWithToken, mock.Anything, - tt.mockFlagToken, + tc.mockFlagToken, ).Return( - tt.mockAuthWithToken, + tc.mockAuthWithToken, nil, ) clientsMock.API.On( @@ -1360,10 +1360,10 @@ func TestPrompt_AppSelectPrompt(t *testing.T) { ), ).Return( iostreams.SelectPromptResponse{ - Flag: tt.teamPromptResponseFlag, - Prompt: tt.teamPromptResponsePrompt, - Option: tt.teamPromptResponseOption, - Index: tt.teamPromptResponseIndex, + Flag: tc.teamPromptResponseFlag, + Prompt: tc.teamPromptResponsePrompt, + Option: tc.teamPromptResponseOption, + Index: tc.teamPromptResponseIndex, }, nil, ) @@ -1371,7 +1371,7 @@ func TestPrompt_AppSelectPrompt(t *testing.T) { SelectPrompt, mock.Anything, "Select an app", - tt.appPromptConfigOptions, + tc.appPromptConfigOptions, iostreams.MatchPromptConfig( iostreams.SelectPromptConfig{ Required: true, @@ -1379,31 +1379,31 @@ func TestPrompt_AppSelectPrompt(t *testing.T) { ), ).Return( iostreams.SelectPromptResponse{ - Flag: tt.appPromptResponseFlag, - Prompt: tt.appPromptResponsePrompt, - Option: tt.appPromptResponseOption, - Index: tt.appPromptResponseIndex, + Flag: tc.appPromptResponseFlag, + Prompt: tc.appPromptResponsePrompt, + Option: tc.appPromptResponseOption, + Index: tc.appPromptResponseIndex, }, nil, ) clientsMock.AddDefaultMocks() - clientsMock.Config.AppFlag = tt.mockFlagApp - clientsMock.Config.TeamFlag = tt.mockFlagTeam - clientsMock.Config.TokenFlag = tt.mockFlagToken + clientsMock.Config.AppFlag = tc.mockFlagApp + clientsMock.Config.TeamFlag = tc.mockFlagTeam + clientsMock.Config.TokenFlag = tc.mockFlagToken clients := shared.NewClientFactory(clientsMock.MockClientFactory()) - for _, app := range tt.mockAppsDeployed { + for _, app := range tc.mockAppsDeployed { err := clients.AppClient().SaveDeployed(ctx, app) require.NoError(t, err) } - for _, app := range tt.mockAppsLocal { + for _, app := range tc.mockAppsLocal { err := clients.AppClient().SaveLocal(ctx, app) require.NoError(t, err) } - selectedApp, err := AppSelectPrompt(ctx, clients, tt.appPromptConfigEnvironment, tt.appPromptConfigStatus) - require.Equal(t, tt.expectedError, err) - require.Equal(t, tt.expectedSelection, selectedApp) - require.Contains(t, clientsMock.GetStdoutOutput(), tt.expectedStdout) - require.Contains(t, clientsMock.GetStderrOutput(), tt.expectedStderr) + selectedApp, err := AppSelectPrompt(ctx, clients, tc.appPromptConfigEnvironment, tc.appPromptConfigStatus) + require.Equal(t, tc.expectedError, err) + require.Equal(t, tc.expectedSelection, selectedApp) + require.Contains(t, clientsMock.GetStdoutOutput(), tc.expectedStdout) + require.Contains(t, clientsMock.GetStderrOutput(), tc.expectedStderr) }) } } @@ -1596,7 +1596,7 @@ func Test_ValidateGetOrgWorkspaceGrant(t *testing.T) { expectedGrant: "all", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() @@ -1604,12 +1604,12 @@ func Test_ValidateGetOrgWorkspaceGrant(t *testing.T) { clients := shared.NewClientFactory(clientsMock.MockClientFactory(), func(clients *shared.ClientFactory) { clients.SDKConfig = hooks.NewSDKConfigMock() }) - if tt.mockPrompt != nil { - tt.mockPrompt(clientsMock) + if tc.mockPrompt != nil { + tc.mockPrompt(clientsMock) } - returnedGrant, err := ValidateGetOrgWorkspaceGrant(ctx, clients, tt.app, tt.inputGrant, tt.firstPromptOptionAll) - assert.Equal(t, tt.expectedErr, err) - assert.Equal(t, tt.expectedGrant, returnedGrant) + returnedGrant, err := ValidateGetOrgWorkspaceGrant(ctx, clients, tc.app, tc.inputGrant, tc.firstPromptOptionAll) + assert.Equal(t, tc.expectedErr, err) + assert.Equal(t, tc.expectedGrant, returnedGrant) }) } } @@ -1707,7 +1707,7 @@ func Test_ValidateAuth(t *testing.T) { ioIsTTYResponse: true, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := shared.NewClientsMock() @@ -1718,8 +1718,8 @@ func Test_ValidateAuth(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.apiExchangeAuthTicketResultResponse, - tt.apiExchangeAuthTicketResultError, + tc.apiExchangeAuthTicketResultResponse, + tc.apiExchangeAuthTicketResultError, ) clientsMock.API.On( "GenerateAuthTicket", @@ -1727,14 +1727,14 @@ func Test_ValidateAuth(t *testing.T) { mock.Anything, mock.Anything, ).Return( - tt.apiGenerateAuthTicketResultResponse, - tt.apiGenerateAuthTicketResultError, + tc.apiGenerateAuthTicketResultResponse, + tc.apiGenerateAuthTicketResultError, ) - if tt.authProvided.APIHost != nil { + if tc.authProvided.APIHost != nil { clientsMock.API.On( "Host", ).Return( - *tt.authProvided.APIHost, + *tc.authProvided.APIHost, ) } clientsMock.API.On( @@ -1744,33 +1744,33 @@ func Test_ValidateAuth(t *testing.T) { clientsMock.API.On( "ValidateSession", mock.Anything, - tt.authProvided.Token, + tc.authProvided.Token, ).Return( - tt.apiValidateSessionResponse, - tt.apiValidateSessionError, + tc.apiValidateSessionResponse, + tc.apiValidateSessionError, ) clientsMock.Auth.On( "FilterKnownAuthErrors", mock.Anything, - tt.apiValidateSessionError, + tc.apiValidateSessionError, ).Return( - tt.authFilteredKnownAuthErrorsResponse, - tt.authFilteredKnownAuthErrorsError, + tc.authFilteredKnownAuthErrorsResponse, + tc.authFilteredKnownAuthErrorsError, ) clientsMock.Auth.On( "IsAPIHostSlackProd", mock.Anything, ).Return( - tt.authIsAPIHostSlackProdResponse, + tc.authIsAPIHostSlackProdResponse, ) clientsMock.Auth.On( "SetAuth", mock.Anything, mock.Anything, ).Return( - tt.authSetAuthResponse, + tc.authSetAuthResponse, "", - tt.authSetAuthError, + tc.authSetAuthError, ) clientsMock.Auth.On( "SetSelectedAuth", @@ -1791,19 +1791,19 @@ func Test_ValidateAuth(t *testing.T) { clientsMock.IO.On( "IsTTY", ).Return( - tt.ioIsTTYResponse, + tc.ioIsTTYResponse, ) clientsMock.AddDefaultMocks() clients := shared.NewClientFactory(clientsMock.MockClientFactory()) - err := validateAuth(ctx, clients, &tt.authProvided) + err := validateAuth(ctx, clients, &tc.authProvided) - tt.authProvided.LastUpdated = time.Time{} // ignore time for this test - assert.Equal(t, tt.expectedErr, err) - if tt.authExpected.APIHost != nil { - clientsMock.API.AssertCalled(t, "SetHost", *tt.authExpected.APIHost) + tc.authProvided.LastUpdated = time.Time{} // ignore time for this tc + assert.Equal(t, tc.expectedErr, err) + if tc.authExpected.APIHost != nil { + clientsMock.API.AssertCalled(t, "SetHost", *tc.authExpected.APIHost) } - assert.Equal(t, tt.authExpected, tt.authProvided) + assert.Equal(t, tc.authExpected, tc.authProvided) }) } } diff --git a/internal/runtime/node/npm_test.go b/internal/runtime/node/npm_test.go index 2a2f040c..44910957 100644 --- a/internal/runtime/node/npm_test.go +++ b/internal/runtime/node/npm_test.go @@ -59,7 +59,7 @@ func Test_NPMClient_InstallAllPackages(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Setup ctx := slackcontext.MockContext(t.Context()) @@ -76,20 +76,20 @@ func Test_NPMClient_InstallAllPackages(t *testing.T) { mockHookExecutor.On("Execute", mock.Anything, mock.Anything). Run(func(args mock.Arguments) { opts := args.Get(1).(hooks.HookExecOpts) - _, err := opts.Stdout.Write([]byte(tt.hookExecuteStdout)) + _, err := opts.Stdout.Write([]byte(tc.hookExecuteStdout)) require.NoError(t, err) }). - Return(tt.hookExecuteResponse, tt.hookExecuteError) + Return(tc.hookExecuteResponse, tc.hookExecuteError) // Test npm := NPMClient{} value, err := npm.InstallAllPackages(ctx, projectDirPath, mockHookExecutor, ios) // Assertions - require.Contains(t, value, tt.expectedValue) - require.Equal(t, tt.expectedError, err) - if tt.expectedVerboseOutput != "" { - ios.AssertCalled(t, "PrintDebug", mock.Anything, tt.expectedVerboseOutput, mock.MatchedBy(func(args ...any) bool { return true })) + require.Contains(t, value, tc.expectedValue) + require.Equal(t, tc.expectedError, err) + if tc.expectedVerboseOutput != "" { + ios.AssertCalled(t, "PrintDebug", mock.Anything, tc.expectedVerboseOutput, mock.MatchedBy(func(args ...any) bool { return true })) } }) } @@ -126,7 +126,7 @@ func Test_NPMClient_InstallDevPackage(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Setup ctx := slackcontext.MockContext(t.Context()) @@ -143,20 +143,20 @@ func Test_NPMClient_InstallDevPackage(t *testing.T) { mockHookExecutor.On("Execute", mock.Anything, mock.Anything). Run(func(args mock.Arguments) { opts := args.Get(1).(hooks.HookExecOpts) - _, err := opts.Stdout.Write([]byte(tt.hookExecuteStdout)) + _, err := opts.Stdout.Write([]byte(tc.hookExecuteStdout)) require.NoError(t, err) }). - Return(tt.hookExecuteResponse, tt.hookExecuteError) + Return(tc.hookExecuteResponse, tc.hookExecuteError) // Test npm := NPMClient{} value, err := npm.InstallDevPackage(ctx, slackCLIHooksPkgName, projectDirPath, mockHookExecutor, ios) // Assertions - require.Contains(t, value, tt.expectedValue) - require.Equal(t, tt.expectedError, err) - if tt.expectedVerboseOutput != "" { - ios.AssertCalled(t, "PrintDebug", mock.Anything, tt.expectedVerboseOutput, mock.MatchedBy(func(args ...any) bool { return true })) + require.Contains(t, value, tc.expectedValue) + require.Equal(t, tc.expectedError, err) + if tc.expectedVerboseOutput != "" { + ios.AssertCalled(t, "PrintDebug", mock.Anything, tc.expectedVerboseOutput, mock.MatchedBy(func(args ...any) bool { return true })) } }) } @@ -200,7 +200,7 @@ func Test_NPMClient_ListPackage(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Setup ctx := slackcontext.MockContext(t.Context()) @@ -217,18 +217,18 @@ func Test_NPMClient_ListPackage(t *testing.T) { mockHookExecutor.On("Execute", mock.Anything, mock.Anything). Run(func(args mock.Arguments) { opts := args.Get(1).(hooks.HookExecOpts) - _, err := opts.Stdout.Write([]byte(tt.hookExecuteStdout)) + _, err := opts.Stdout.Write([]byte(tc.hookExecuteStdout)) require.NoError(t, err) }). - Return(tt.hookExecuteResponse, tt.hookExecuteError) + Return(tc.hookExecuteResponse, tc.hookExecuteError) // Test npm := NPMClient{} pkgVersion, pkgExists := npm.ListPackage(ctx, slackCLIHooksPkgName, projectDirPath, mockHookExecutor, ios) // Assertions - require.Equal(t, tt.expectedPkgVersion, pkgVersion) - require.Equal(t, tt.expectedPkgExists, pkgExists) + require.Equal(t, tc.expectedPkgVersion, pkgVersion) + require.Equal(t, tc.expectedPkgExists, pkgExists) }) } } diff --git a/internal/runtime/python/python_test.go b/internal/runtime/python/python_test.go index bd1ec955..26edb8ab 100644 --- a/internal/runtime/python/python_test.go +++ b/internal/runtime/python/python_test.go @@ -419,19 +419,19 @@ func Test_Python_getProjectDirRelPath(t *testing.T) { expectedError: nil, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Create mocks osMock := slackdeps.NewOsMock() - osMock.On("Getwd").Return(tt.getwdPath, tt.getwdError) + osMock.On("Getwd").Return(tc.getwdPath, tc.getwdError) osMock.AddDefaultMocks() // Run the test - actualRelPath, actualErr := getProjectDirRelPath(osMock, tt.currentDirPath, tt.projectDirPath) + actualRelPath, actualErr := getProjectDirRelPath(osMock, tc.currentDirPath, tc.projectDirPath) // Assertions - require.Equal(t, tt.expectedRelPath, actualRelPath) - require.Equal(t, tt.expectedError, actualErr) + require.Equal(t, tc.expectedRelPath, actualRelPath) + require.Equal(t, tc.expectedError, actualErr) }) } } diff --git a/internal/shared/clients_test.go b/internal/shared/clients_test.go index 74ea4534..38d9c80c 100644 --- a/internal/shared/clients_test.go +++ b/internal/shared/clients_test.go @@ -111,20 +111,20 @@ func Test_ClientFactory_InitSDKConfig(t *testing.T) { expectedError: slackerror.New(slackerror.ErrHooksJSONLocation), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) clientsMock := NewClientsMock() clientsMock.AddDefaultMocks() clients := NewClientFactory(clientsMock.MockClientFactory()) - err := clients.Fs.MkdirAll(filepath.Dir(tt.mockHooksJSONFilePath), 0o755) + err := clients.Fs.MkdirAll(filepath.Dir(tc.mockHooksJSONFilePath), 0o755) require.NoError(t, err) - err = afero.WriteFile(clients.Fs, tt.mockHooksJSONFilePath, []byte(tt.mockHooksJSONContent), 0o600) + err = afero.WriteFile(clients.Fs, tc.mockHooksJSONFilePath, []byte(tc.mockHooksJSONContent), 0o600) require.NoError(t, err) - err = clients.InitSDKConfig(ctx, tt.mockWorkingDirectory) - assert.Equal(t, tt.expectedError, err) - assert.Equal(t, tt.expectedGetHooksScript, clients.SDKConfig.Hooks.GetHooks.Command) - assert.Equal(t, tt.expectedWorkingDirectory, clients.SDKConfig.WorkingDirectory) + err = clients.InitSDKConfig(ctx, tc.mockWorkingDirectory) + assert.Equal(t, tc.expectedError, err) + assert.Equal(t, tc.expectedGetHooksScript, clients.SDKConfig.Hooks.GetHooks.Command) + assert.Equal(t, tc.expectedWorkingDirectory, clients.SDKConfig.WorkingDirectory) }) } } diff --git a/internal/shared/types/app_manifest_test.go b/internal/shared/types/app_manifest_test.go index a6cd7d5a..bf626840 100644 --- a/internal/shared/types/app_manifest_test.go +++ b/internal/shared/types/app_manifest_test.go @@ -98,12 +98,12 @@ func Test_AppManifest_ConvertDataForRawJSON(t *testing.T) { want: map[string]interface{}{"name": "foo", "fruits": []string{"mango", "pineapple"}}, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { assert := assert.New(t) - have, err := json.Marshal(tt.have.convertData(*tt.have.Data)) + have, err := json.Marshal(tc.have.convertData(*tc.have.Data)) assert.Nil(err) - want, err := json.Marshal(tt.want) + want, err := json.Marshal(tc.want) assert.Nil(err) assert.Equal(want, have) }) @@ -120,12 +120,12 @@ func Test_AppManifest_ToRawJSON(t *testing.T) { want: &RawJSON{JSONData: &json.RawMessage{}}, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - if got := ToRawJSON(tt.have); !reflect.DeepEqual(got, tt.want) { + if got := ToRawJSON(tc.have); !reflect.DeepEqual(got, tc.want) { t.Log(got.Data) t.Log(got.JSONData) - t.Errorf("ToRawJSON() = %v, want %v", got, tt.want) + t.Errorf("ToRawJSON() = %v, want %v", got, tc.want) } }) } @@ -191,11 +191,11 @@ func Test_AppManifest_AppFeatures(t *testing.T) { want: `{"app_home":{},"bot_user":{"display_name":"business_bot"},"rich_previews":{"entity_types":["slack#/entities/file"]}}`, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actual, err := json.Marshal(tt.features) + actual, err := json.Marshal(tc.features) require.NoError(t, err) - assert.Equal(t, tt.want, string(actual)) + assert.Equal(t, tc.want, string(actual)) }) } } @@ -220,16 +220,16 @@ func Test_AppManifest_AppSettings_SiwsLinks(t *testing.T) { expectedJSON: `{"siws_links":{"initiate_uri":"an initiate uri"}}`, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { manifest := AppManifest{ - Settings: tt.settings, + Settings: tc.settings, } - if tt.settings != nil { - actualJSON, err := json.Marshal(tt.settings) + if tc.settings != nil { + actualJSON, err := json.Marshal(tc.settings) require.NoError(t, err) - assert.Equal(t, tt.expectedJSON, string(actualJSON)) - assert.Equal(t, tt.expectedSiwsLinks, manifest.Settings.SiwsLinks) + assert.Equal(t, tc.expectedJSON, string(actualJSON)) + assert.Equal(t, tc.expectedSiwsLinks, manifest.Settings.SiwsLinks) } else { assert.Nil(t, manifest.Settings) } @@ -258,16 +258,16 @@ func Test_AppManifest_AppSettings_IncomingWebhooks(t *testing.T) { expectedJSON: `{"incoming_webhooks":{"incoming_webhooks_enabled":false}}`, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { manifest := AppManifest{ - Settings: tt.settings, + Settings: tc.settings, } - if tt.settings != nil { - actualJSON, err := json.Marshal(tt.settings) + if tc.settings != nil { + actualJSON, err := json.Marshal(tc.settings) require.NoError(t, err) - assert.Equal(t, tt.expectedJSON, string(actualJSON)) - assert.Equal(t, tt.expectedIncomingWebhooksLinks, manifest.Settings.IncomingWebhooks) + assert.Equal(t, tc.expectedJSON, string(actualJSON)) + assert.Equal(t, tc.expectedIncomingWebhooksLinks, manifest.Settings.IncomingWebhooks) } else { assert.Nil(t, manifest.Settings) } @@ -317,15 +317,15 @@ func Test_AppManifest_AppSettings_FunctionRuntime(t *testing.T) { expectedRuntime: " ", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { manifest := AppManifest{ - Settings: tt.settings, + Settings: tc.settings, } - assert.Equal(t, tt.expectedHosted, manifest.IsFunctionRuntimeSlackHosted()) - assert.Equal(t, tt.expectedRuntime, manifest.FunctionRuntime()) - if tt.settings != nil { - assert.Equal(t, tt.expectedRuntime, manifest.Settings.FunctionRuntime) + assert.Equal(t, tc.expectedHosted, manifest.IsFunctionRuntimeSlackHosted()) + assert.Equal(t, tc.expectedRuntime, manifest.FunctionRuntime()) + if tc.settings != nil { + assert.Equal(t, tc.expectedRuntime, manifest.Settings.FunctionRuntime) } }) } diff --git a/internal/shared/types/app_test.go b/internal/shared/types/app_test.go index 63e9cf8e..dd98ad93 100644 --- a/internal/shared/types/app_test.go +++ b/internal/shared/types/app_test.go @@ -96,9 +96,9 @@ func Test_Apps_IsEmpty(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - require.Equal(t, tt.expectedIsEmpty, tt.expectedApps.IsEmpty()) + require.Equal(t, tc.expectedIsEmpty, tc.expectedApps.IsEmpty()) }) } } @@ -313,28 +313,28 @@ func Test_Apps_Set(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { apps := Apps{ DefaultAppTeamDomain: "", DeployedApps: map[string]App{}, LocalApps: map[string]App{}, } - err := apps.Set(tt.expectedApp) - require.Equal(t, tt.isError, err != nil) + err := apps.Set(tc.expectedApp) + require.Equal(t, tc.isError, err != nil) - if tt.isLocalApp { + if tc.isLocalApp { actualLocalApps := apps.GetAllLocalApps() - require.Contains(t, actualLocalApps, tt.expectedApp) + require.Contains(t, actualLocalApps, tc.expectedApp) } - if tt.isDeployedApp { + if tc.isDeployedApp { actualDeployedApps, _ := apps.GetAllDeployedApps() - require.Contains(t, actualDeployedApps, tt.expectedApp) + require.Contains(t, actualDeployedApps, tc.expectedApp) } - if tt.expectedDefaultAppTeamDomain != "" { - require.Equal(t, tt.expectedDefaultAppTeamDomain, apps.DefaultAppTeamDomain) + if tc.expectedDefaultAppTeamDomain != "" { + require.Equal(t, tc.expectedDefaultAppTeamDomain, apps.DefaultAppTeamDomain) } }) } @@ -467,19 +467,19 @@ func Test_Apps_RemoveDeployedByTeamID(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Assert app belonging to removedTeamID exists in apps - require.NotEmpty(t, tt.apps.DeployedApps[tt.removedTeamID]) + require.NotEmpty(t, tc.apps.DeployedApps[tc.removedTeamID]) // Remove the app - tt.apps.RemoveDeployedByTeamID(tt.removedTeamID) + tc.apps.RemoveDeployedByTeamID(tc.removedTeamID) // Assert app removed - require.Empty(t, tt.apps.DeployedApps[tt.removedTeamID]) + require.Empty(t, tc.apps.DeployedApps[tc.removedTeamID]) // Assert DefaultAppTeamDomain change - require.Equal(t, tt.expectedDefaultAppTeamDomain, tt.apps.DefaultAppTeamDomain) + require.Equal(t, tc.expectedDefaultAppTeamDomain, tc.apps.DefaultAppTeamDomain) }) } } @@ -765,9 +765,9 @@ func Test_App_Equals(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - require.Equal(t, tt.matches, expectedApp.Equals(tt.app)) + require.Equal(t, tc.matches, expectedApp.Equals(tc.app)) }) } } @@ -797,9 +797,9 @@ func Test_App_IsEmpty(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - require.Equal(t, tt.isEmpty, tt.app.IsEmpty()) + require.Equal(t, tc.isEmpty, tc.app.IsEmpty()) }) } } @@ -823,9 +823,9 @@ func Test_App_IsNew(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - require.Equal(t, tt.isNew, tt.app.IsNew()) + require.Equal(t, tc.isNew, tc.app.IsNew()) }) } } diff --git a/internal/shared/types/datastore_test.go b/internal/shared/types/datastore_test.go index 45f7375c..23c1017b 100644 --- a/internal/shared/types/datastore_test.go +++ b/internal/shared/types/datastore_test.go @@ -118,13 +118,13 @@ func Test_Datastore(t *testing.T) { setName: "D8", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - if tt.setName != "" { - tt.query.SetName(tt.setName) + if tc.setName != "" { + tc.query.SetName(tc.setName) } - assert.Equal(t, tt.name, tt.query.Name()) - assert.Equal(t, tt.appID, tt.query.AppID()) + assert.Equal(t, tc.name, tc.query.Name()) + assert.Equal(t, tc.appID, tc.query.AppID()) }) } } diff --git a/internal/slackcontext/slackcontext_test.go b/internal/slackcontext/slackcontext_test.go index 323a2e75..20626637 100644 --- a/internal/slackcontext/slackcontext_test.go +++ b/internal/slackcontext/slackcontext_test.go @@ -39,13 +39,13 @@ func Test_SlackContext_OpenTracingSpan(t *testing.T) { expectedError: slackerror.New(slackerror.ErrContextValueNotFound).WithMessage("The value for OpenTracing Span could not be found"), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = opentracing.ContextWithSpan(ctx, tt.expectedSpan) + ctx = opentracing.ContextWithSpan(ctx, tc.expectedSpan) actualSpan, actualError := OpenTracingSpan(ctx) - require.Equal(t, tt.expectedSpan, actualSpan) - require.Equal(t, tt.expectedError, actualError) + require.Equal(t, tc.expectedSpan, actualSpan) + require.Equal(t, tc.expectedError, actualError) }) } } @@ -58,12 +58,12 @@ func Test_SlackContext_SetOpenTracingSpan(t *testing.T) { expectedSpan: opentracing.StartSpan("test.span"), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = SetOpenTracingSpan(ctx, tt.expectedSpan) + ctx = SetOpenTracingSpan(ctx, tc.expectedSpan) actualSpan := opentracing.SpanFromContext(ctx) - require.Equal(t, tt.expectedSpan, actualSpan) + require.Equal(t, tc.expectedSpan, actualSpan) }) } } @@ -82,13 +82,13 @@ func Test_SlackContext_OpenTracingTraceID(t *testing.T) { expectedError: slackerror.New(slackerror.ErrContextValueNotFound).WithMessage("The value for OpenTracing Trace ID could not be found"), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = context.WithValue(ctx, contextKeyOpenTracingTraceID, tt.expectedTraceID) + ctx = context.WithValue(ctx, contextKeyOpenTracingTraceID, tc.expectedTraceID) actualTraceID, actualError := OpenTracingTraceID(ctx) - require.Equal(t, tt.expectedTraceID, actualTraceID) - require.Equal(t, tt.expectedError, actualError) + require.Equal(t, tc.expectedTraceID, actualTraceID) + require.Equal(t, tc.expectedError, actualError) }) } } @@ -101,12 +101,12 @@ func Test_SlackContext_SetOpenTracingTraceID(t *testing.T) { expectedTraceID: uuid.New().String(), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = SetOpenTracingTraceID(ctx, tt.expectedTraceID) + ctx = SetOpenTracingTraceID(ctx, tc.expectedTraceID) actualTraceID := ctx.Value(contextKeyOpenTracingTraceID).(string) - require.Equal(t, tt.expectedTraceID, actualTraceID) + require.Equal(t, tc.expectedTraceID, actualTraceID) }) } } @@ -127,13 +127,13 @@ func Test_SlackContext_OpenTracingTracer(t *testing.T) { expectedError: slackerror.New(slackerror.ErrContextValueNotFound).WithMessage("The value for OpenTracing Tracer could not be found"), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = context.WithValue(ctx, contextKeyOpenTracingTracer, tt.expectedTracer) + ctx = context.WithValue(ctx, contextKeyOpenTracingTracer, tc.expectedTracer) actualTracer, actualError := OpenTracingTracer(ctx) - require.Equal(t, tt.expectedTracer, actualTracer) - require.Equal(t, tt.expectedError, actualError) + require.Equal(t, tc.expectedTracer, actualTracer) + require.Equal(t, tc.expectedError, actualError) }) } } @@ -148,12 +148,12 @@ func Test_SlackContext_SetOpenTracingTracer(t *testing.T) { expectedTracer: _tracer, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = SetOpenTracingTracer(ctx, tt.expectedTracer) + ctx = SetOpenTracingTracer(ctx, tc.expectedTracer) actualTracer := ctx.Value(contextKeyOpenTracingTracer).(opentracing.Tracer) - require.Equal(t, tt.expectedTracer, actualTracer) + require.Equal(t, tc.expectedTracer, actualTracer) }) } } @@ -172,13 +172,13 @@ func Test_SlackContext_ProjectID(t *testing.T) { expectedError: slackerror.New(slackerror.ErrContextValueNotFound).WithMessage("The value for Project ID could not be found"), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = context.WithValue(ctx, contextKeyProjectID, tt.expectedProjectID) + ctx = context.WithValue(ctx, contextKeyProjectID, tc.expectedProjectID) actualProjectID, actualError := ProjectID(ctx) - require.Equal(t, tt.expectedProjectID, actualProjectID) - require.Equal(t, tt.expectedError, actualError) + require.Equal(t, tc.expectedProjectID, actualProjectID) + require.Equal(t, tc.expectedError, actualError) }) } } @@ -191,12 +191,12 @@ func Test_SlackContext_SetProjectID(t *testing.T) { expectedProjectID: uuid.New().String(), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = SetProjectID(ctx, tt.expectedProjectID) + ctx = SetProjectID(ctx, tc.expectedProjectID) actualProjectID := ctx.Value(contextKeyProjectID).(string) - require.Equal(t, tt.expectedProjectID, actualProjectID) + require.Equal(t, tc.expectedProjectID, actualProjectID) }) } } @@ -215,13 +215,13 @@ func Test_SlackContext_SessionID(t *testing.T) { expectedError: slackerror.New(slackerror.ErrContextValueNotFound).WithMessage("The value for Session ID could not be found"), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = context.WithValue(ctx, contextKeySessionID, tt.expectedSessionID) + ctx = context.WithValue(ctx, contextKeySessionID, tc.expectedSessionID) actualSessionID, actualError := SessionID(ctx) - require.Equal(t, tt.expectedSessionID, actualSessionID) - require.Equal(t, tt.expectedError, actualError) + require.Equal(t, tc.expectedSessionID, actualSessionID) + require.Equal(t, tc.expectedError, actualError) }) } } @@ -234,12 +234,12 @@ func Test_SlackContext_SetSessionID(t *testing.T) { expectedSessionID: uuid.New().String(), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = SetSessionID(ctx, tt.expectedSessionID) + ctx = SetSessionID(ctx, tc.expectedSessionID) actualSessionID := ctx.Value(contextKeySessionID).(string) - require.Equal(t, tt.expectedSessionID, actualSessionID) + require.Equal(t, tc.expectedSessionID, actualSessionID) }) } } @@ -258,13 +258,13 @@ func Test_SlackContext_SystemID(t *testing.T) { expectedError: slackerror.New(slackerror.ErrContextValueNotFound).WithMessage("The value for System ID could not be found"), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = context.WithValue(ctx, contextKeySystemID, tt.expectedSystemID) + ctx = context.WithValue(ctx, contextKeySystemID, tc.expectedSystemID) actualSystemID, actualError := SystemID(ctx) - require.Equal(t, tt.expectedSystemID, actualSystemID) - require.Equal(t, tt.expectedError, actualError) + require.Equal(t, tc.expectedSystemID, actualSystemID) + require.Equal(t, tc.expectedError, actualError) }) } } @@ -277,12 +277,12 @@ func Test_SlackContext_SetSystemID(t *testing.T) { expectedSystemID: uuid.New().String(), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = SetSystemID(ctx, tt.expectedSystemID) + ctx = SetSystemID(ctx, tc.expectedSystemID) actualSystemID := ctx.Value(contextKeySystemID).(string) - require.Equal(t, tt.expectedSystemID, actualSystemID) + require.Equal(t, tc.expectedSystemID, actualSystemID) }) } } @@ -301,13 +301,13 @@ func Test_SlackContext_Version(t *testing.T) { expectedError: slackerror.New(slackerror.ErrContextValueNotFound).WithMessage("The value for Version could not be found"), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = context.WithValue(ctx, contextKeyVersion, tt.expectedVersion) + ctx = context.WithValue(ctx, contextKeyVersion, tc.expectedVersion) actualVersion, actualError := Version(ctx) - require.Equal(t, tt.expectedVersion, actualVersion) - require.Equal(t, tt.expectedError, actualError) + require.Equal(t, tc.expectedVersion, actualVersion) + require.Equal(t, tc.expectedError, actualError) }) } } @@ -320,12 +320,12 @@ func Test_SlackContext_SetVersion(t *testing.T) { expectedVersion: "v1.2.3", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := t.Context() - ctx = SetVersion(ctx, tt.expectedVersion) + ctx = SetVersion(ctx, tc.expectedVersion) actualVersion := ctx.Value(contextKeyVersion).(string) - require.Equal(t, tt.expectedVersion, actualVersion) + require.Equal(t, tc.expectedVersion, actualVersion) }) } } diff --git a/internal/slackdeps/fs_test.go b/internal/slackdeps/fs_test.go index 027c004f..004bbbcc 100644 --- a/internal/slackdeps/fs_test.go +++ b/internal/slackdeps/fs_test.go @@ -29,13 +29,13 @@ func Test_NewFs(t *testing.T) { expectedFsType: &afero.OsFs{}, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Setup fs := NewFs() // Assertions - assert.IsType(t, tt.expectedFsType, fs) + assert.IsType(t, tc.expectedFsType, fs) }) } } diff --git a/internal/slackdeps/os_test.go b/internal/slackdeps/os_test.go index 7ebbd20b..013fb574 100644 --- a/internal/slackdeps/os_test.go +++ b/internal/slackdeps/os_test.go @@ -34,17 +34,17 @@ func Test_Os_GetExecutionDir(t *testing.T) { expectedExecutionDirPathAbs: "/path/to/execution/dir", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Setup os := NewOs() - os.executionDirPathAbs = tt.executionDirPathAbs + os.executionDirPathAbs = tc.executionDirPathAbs // Run the test actualExecutionDirPathAbs := os.GetExecutionDir() // Assertions - require.Equal(t, tt.expectedExecutionDirPathAbs, actualExecutionDirPathAbs) + require.Equal(t, tc.expectedExecutionDirPathAbs, actualExecutionDirPathAbs) }) } } @@ -66,18 +66,18 @@ func Test_Os_SetExecutionDir(t *testing.T) { expectedExecutionDirPathAbs: "/path/to/execution/dir", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Setup os := NewOs() - os.executionDirPathAbs = tt.executionDirPathAbs + os.executionDirPathAbs = tc.executionDirPathAbs // Run the test - os.SetExecutionDir(tt.setExecutionDirPathAbs) + os.SetExecutionDir(tc.setExecutionDirPathAbs) actualExecutionDirPathAbs := os.executionDirPathAbs // Assertions - require.Equal(t, tt.expectedExecutionDirPathAbs, actualExecutionDirPathAbs) + require.Equal(t, tc.expectedExecutionDirPathAbs, actualExecutionDirPathAbs) }) } } diff --git a/internal/slackerror/error_test.go b/internal/slackerror/error_test.go index 03c141ea..7b6c2924 100644 --- a/internal/slackerror/error_test.go +++ b/internal/slackerror/error_test.go @@ -39,10 +39,10 @@ func Test_AddAPIMethod(t *testing.T) { newEndpoint: "", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - _ = tt.err.AddAPIMethod(tt.newEndpoint) - require.Equal(t, tt.newEndpoint, tt.err.APIEndpoint) + _ = tc.err.AddAPIMethod(tc.newEndpoint) + require.Equal(t, tc.newEndpoint, tc.err.APIEndpoint) }) } } @@ -61,10 +61,10 @@ func Test_AddDetail(t *testing.T) { detail: ErrorDetail{Message: "detail"}, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - e := tt.err.AddDetail(tt.detail) - require.Contains(t, e.Details, tt.detail) + e := tc.err.AddDetail(tc.detail) + require.Contains(t, e.Details, tc.detail) }) } } @@ -91,10 +91,10 @@ func Test_AppendRemediation(t *testing.T) { expected: "hello world", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - err := New("").WithRemediation("%s", tt.initialMsg).AppendRemediation(tt.msgToAppend) - require.Equal(t, tt.expected, err.Remediation) + err := New("").WithRemediation("%s", tc.initialMsg).AppendRemediation(tc.msgToAppend) + require.Equal(t, tc.expected, err.Remediation) }) } } @@ -118,16 +118,16 @@ func Test_JSONUnmarshalErrorTest(t *testing.T) { err: New(ErrAccessDenied), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - err := JSONUnmarshalError(tt.err, tt.data) - if tt.err == nil { + err := JSONUnmarshalError(tc.err, tc.data) + if tc.err == nil { require.Nil(t, err) } else { require.Equal(t, ErrUnableToParseJSON, err.Code) - require.Contains(t, err.Error(), string(tt.data[:])) + require.Contains(t, err.Error(), string(tc.data[:])) - transformedErr := ToSlackError(tt.err) + transformedErr := ToSlackError(tc.err) require.Contains(t, err.Error(), transformedErr.Code) require.Contains(t, err.Error(), transformedErr.Message) require.Contains(t, err.Error(), transformedErr.Remediation) @@ -154,10 +154,10 @@ func Test_New(t *testing.T) { expected: ErrorCodeMap[ErrAccessDenied], }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - err := New(tt.msgOrCode) - require.Equal(t, tt.expected.Error(), err.Error()) + err := New(tc.msgOrCode) + require.Equal(t, tc.expected.Error(), err.Error()) }) } } @@ -203,15 +203,15 @@ func Test_NewAPIError(t *testing.T) { expected: *testErr.AddAPIMethod("fakeMethod").WithDetails(ErrorDetails{{Code: "c1", Message: "m1"}}), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - err := NewAPIError(tt.code, tt.description, tt.details, tt.apiMethod) - require.Equal(t, tt.expected.Code, err.Code) - require.Equal(t, tt.expected.Description, err.Description) - require.Equal(t, tt.expected.Message, err.Message) - require.Equal(t, tt.expected.Details, err.Details) - require.Equal(t, tt.expected.APIEndpoint, err.APIEndpoint) - require.Equal(t, tt.expected.Error(), err.Error()) + err := NewAPIError(tc.code, tc.description, tc.details, tc.apiMethod) + require.Equal(t, tc.expected.Code, err.Code) + require.Equal(t, tc.expected.Description, err.Description) + require.Equal(t, tc.expected.Message, err.Message) + require.Equal(t, tc.expected.Details, err.Details) + require.Equal(t, tc.expected.APIEndpoint, err.APIEndpoint) + require.Equal(t, tc.expected.Error(), err.Error()) }) } } @@ -243,18 +243,18 @@ func Test_Error(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - res := tt.err.Error() + res := tc.err.Error() - if tt.err == nil { + if tc.err == nil { require.Empty(t, res, "When slack error is nil, the string should be empty") } else { - require.Contains(t, res, tt.err.Code) - require.Contains(t, res, tt.err.Message) - require.Contains(t, res, tt.err.APIEndpoint) - require.Contains(t, res, tt.err.Remediation) - for _, d := range tt.err.Details { + require.Contains(t, res, tc.err.Code) + require.Contains(t, res, tc.err.Message) + require.Contains(t, res, tc.err.APIEndpoint) + require.Contains(t, res, tc.err.Remediation) + for _, d := range tc.err.Details { require.Contains(t, res, d.Message) require.Contains(t, res, d.Code) require.Contains(t, res, d.Remediation) @@ -291,9 +291,9 @@ func Test_recursiveUnwrap(t *testing.T) { expected: &Error{Message: "unknown"}, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - require.Equal(t, tt.expected, tt.err.recursiveUnwrap()) + require.Equal(t, tc.expected, tc.err.recursiveUnwrap()) }) } } @@ -324,10 +324,10 @@ func Test_ToSlackError(t *testing.T) { expected: Error{Message: ""}, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - err := ToSlackError(tt.err) - require.Equal(t, tt.expected, *err) + err := ToSlackError(tc.err) + require.Equal(t, tc.expected, *err) }) } } @@ -354,9 +354,9 @@ func Test_Unwrap(t *testing.T) { expected: &err2, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - require.Equal(t, tt.expected, tt.err.Unwrap()) + require.Equal(t, tc.expected, tc.err.Unwrap()) }) } } @@ -383,10 +383,10 @@ func Test_WithCode(t *testing.T) { newCode: "code1", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - err := New(tt.oldCode).WithCode(tt.newCode) - require.Equal(t, tt.newCode, err.Code) + err := New(tc.oldCode).WithCode(tc.newCode) + require.Equal(t, tc.newCode, err.Code) }) } } @@ -413,10 +413,10 @@ func Test_WithMessage(t *testing.T) { newMsg: "msg", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - err := New(tt.oldMsg).WithMessage("%s", tt.newMsg) - require.Equal(t, tt.newMsg, err.Message) + err := New(tc.oldMsg).WithMessage("%s", tc.newMsg) + require.Equal(t, tc.newMsg, err.Message) }) } } @@ -443,10 +443,10 @@ func Test_WithRemediation(t *testing.T) { newMsg: "msg", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - err := New("").WithRemediation("%s", tt.newMsg) - require.Equal(t, tt.newMsg, err.Remediation) + err := New("").WithRemediation("%s", tc.newMsg) + require.Equal(t, tc.newMsg, err.Remediation) }) } } @@ -473,13 +473,13 @@ func Test_WithRootCause(t *testing.T) { rootCause: &Error{Code: "code", Message: "msg", Details: ErrorDetails{{Message: "d3"}, {Message: "d4"}}}, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - errDetailsCountBefore := len(tt.err.Details) // keep track of the details count before adding the rootcause - err := tt.err.WithRootCause(tt.rootCause) // call the function + errDetailsCountBefore := len(tc.err.Details) // keep track of the details count before adding the rootcause + err := tc.err.WithRootCause(tc.rootCause) // call the function - rootCauseErr := ToSlackError(tt.rootCause) // cast the root cause error to a slack error for easy comparison + rootCauseErr := ToSlackError(tc.rootCause) // cast the root cause error to a slack error for easy comparison // During rootCause addition, the rootCause error's message is added as a detail // then in addition, all its details are also carried over @@ -489,7 +489,7 @@ func Test_WithRootCause(t *testing.T) { require.Contains(t, err.Error(), rootCauseErr.Code) require.Contains(t, err.Error(), rootCauseErr.Message) for _, d := range rootCauseErr.Details { - require.Contains(t, tt.err.Details, d) // see to it that all the details in rootCause were carried over + require.Contains(t, tc.err.Details, d) // see to it that all the details in rootCause were carried over } }) } diff --git a/internal/slackerror/warn_test.go b/internal/slackerror/warn_test.go index 2323e4ca..522f667b 100644 --- a/internal/slackerror/warn_test.go +++ b/internal/slackerror/warn_test.go @@ -253,10 +253,10 @@ func Test_Warning(t *testing.T) { }), }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actual := tt.warnings.Warning(tt.verbose, tt.message) - assert.Equal(t, tt.expected, actual) + actual := tc.warnings.Warning(tc.verbose, tc.message) + assert.Equal(t, tc.expected, actual) }) } } diff --git a/internal/slackhttp/http_test.go b/internal/slackhttp/http_test.go index 89fc269e..5b9d9674 100644 --- a/internal/slackhttp/http_test.go +++ b/internal/slackhttp/http_test.go @@ -54,21 +54,21 @@ func Test_NewHTTPClient(t *testing.T) { expectedTimeout: 120 * time.Second, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { // Setup opts := HTTPClientOptions{ - Retries: tt.expectedRetries, - SkipTLSVerify: tt.expectedSkipTLSVerify, - TotalTimeOut: tt.timeout, + Retries: tc.expectedRetries, + SkipTLSVerify: tc.expectedSkipTLSVerify, + TotalTimeOut: tc.timeout, } httpClient := NewHTTPClient(opts) // Assertions - assert.Equal(t, tt.expectedTimeout, httpClient.Timeout) - assert.Equal(t, tt.expectedSkipTLSVerify, httpClient.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify) - assert.ObjectsAreEqual(tt.expectedProxy, httpClient.Transport.(*http.Transport).Proxy) + assert.Equal(t, tc.expectedTimeout, httpClient.Timeout) + assert.Equal(t, tc.expectedSkipTLSVerify, httpClient.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify) + assert.ObjectsAreEqual(tc.expectedProxy, httpClient.Transport.(*http.Transport).Proxy) // TODO: add assertion for retries }) } diff --git a/internal/style/format_test.go b/internal/style/format_test.go index 8278953b..f275d285 100644 --- a/internal/style/format_test.go +++ b/internal/style/format_test.go @@ -229,10 +229,10 @@ func TestTracef(t *testing.T) { expected: "TRACE_ID_4=VALUE_A,VALUE_B", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - trace := Tracef(tt.traceID, tt.traceValues...) - assert.Equal(t, tt.expected, trace) + trace := Tracef(tc.traceID, tc.traceValues...) + assert.Equal(t, tc.expected, trace) }) } } @@ -249,13 +249,13 @@ func TestSurveyIcons(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { core.DisableColor = false - isStyleEnabled = tt.styleEnabled + isStyleEnabled = tc.styleEnabled _ = SurveyIcons() - assert.NotEqual(t, tt.styleEnabled, core.DisableColor) + assert.NotEqual(t, tc.styleEnabled, core.DisableColor) }) } } @@ -296,15 +296,15 @@ func Test_ExampleCommandsf(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { commandName := os.Args[0] os.Args[0] = "slack" defer func() { os.Args[0] = commandName }() t.Run(name, func(t *testing.T) { - actual := ExampleCommandsf(tt.commands) - assert.Equal(t, tt.expected, strings.Split(actual, "\n")) + actual := ExampleCommandsf(tc.commands) + assert.Equal(t, tc.expected, strings.Split(actual, "\n")) }) } } @@ -352,15 +352,15 @@ func Test_ExampleTemplatef(t *testing.T) { }, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { localColorStatus := isColorShown - isColorShown = tt.withColorShown + isColorShown = tc.withColorShown defer func() { isColorShown = localColorStatus }() - actual := ExampleTemplatef(strings.Join(tt.template, "\n")) - assert.Equal(t, strings.Join(tt.expected, "\n"), actual) + actual := ExampleTemplatef(strings.Join(tc.template, "\n")) + assert.Equal(t, strings.Join(tc.expected, "\n"), actual) }) } } @@ -387,10 +387,10 @@ func TestLocalRunDisplayNamePlain(t *testing.T) { expectedAppName: "bizz (local)", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actualAppName := LocalRunDisplayName(tt.mockAppName) - assert.Equal(t, tt.expectedAppName, actualAppName) + actualAppName := LocalRunDisplayName(tc.mockAppName) + assert.Equal(t, tc.expectedAppName, actualAppName) }) } } diff --git a/internal/style/spinner_test.go b/internal/style/spinner_test.go index d3b676a7..e0784de3 100644 --- a/internal/style/spinner_test.go +++ b/internal/style/spinner_test.go @@ -35,10 +35,10 @@ func Test_Spinner(t *testing.T) { spins: false, }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { buff := &bytes.Buffer{} - ToggleSpinner(tt.spins) + ToggleSpinner(tc.spins) spinner := NewSpinner(buff) active := spinner.Active() assert.False(t, spinner.active) @@ -58,7 +58,7 @@ func Test_Spinner(t *testing.T) { assert.False(t, spinner.active) assert.False(t, active) assert.Equal(t, "ending!", status) - if !tt.spins { + if !tc.spins { assert.Equal(t, buff.String(), "waiting\nchanged\nending!\n") } else { // No output is gathered because the test is not run in a terminal setting. diff --git a/internal/style/style_test.go b/internal/style/style_test.go index 46d6404e..5cd05499 100644 --- a/internal/style/style_test.go +++ b/internal/style/style_test.go @@ -50,10 +50,10 @@ func TestRemoveANSI(t *testing.T) { expected: "script was not found (sdk_hook_not_found)", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actual := RemoveANSI(tt.input) - assert.Equal(t, tt.expected, actual) + actual := RemoveANSI(tc.input) + assert.Equal(t, tc.expected, actual) }) } } @@ -109,10 +109,10 @@ func TestPluralize(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - if s := Pluralize(tt.singular, tt.plural, tt.count); s != tt.expectedResult { - t.Errorf("expected: %s, actual: %s", tt.expectedResult, s) + if s := Pluralize(tc.singular, tc.plural, tc.count); s != tc.expectedResult { + t.Errorf("expected: %s, actual: %s", tc.expectedResult, s) } }) } diff --git a/internal/style/template_test.go b/internal/style/template_test.go index 040c0407..4df88431 100644 --- a/internal/style/template_test.go +++ b/internal/style/template_test.go @@ -142,7 +142,7 @@ func TestPrintTemplate(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { defer func() { if r := recover(); r != nil { @@ -150,12 +150,12 @@ func TestPrintTemplate(t *testing.T) { } }() buff := &bytes.Buffer{} - err := PrintTemplate(buff, tt.tmpl, tt.data) - if err != nil || tt.err != "" { + err := PrintTemplate(buff, tc.tmpl, tc.data) + if err != nil || tc.err != "" { assert.Error(t, err) - assert.Contains(t, err.Error(), tt.err) + assert.Contains(t, err.Error(), tc.err) } else { - assert.Equal(t, tt.expected, buff.String()) + assert.Equal(t, tc.expected, buff.String()) } }) } diff --git a/internal/tracking/tracking_test.go b/internal/tracking/tracking_test.go index 1be1bfd0..d51a4333 100644 --- a/internal/tracking/tracking_test.go +++ b/internal/tracking/tracking_test.go @@ -65,11 +65,11 @@ func Test_Tracking_cleanSessionData(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { et := NewEventTracker() t.Run(name, func(t *testing.T) { - actual := et.cleanSessionData(tt.input) - require.Equal(t, tt.expectedOutput, actual) + actual := et.cleanSessionData(tc.input) + require.Equal(t, tc.expectedOutput, actual) }) } } @@ -147,7 +147,7 @@ func Test_Tracking_FlushToLogstash(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) et := NewEventTracker() @@ -156,8 +156,8 @@ func Test_Tracking_FlushToLogstash(t *testing.T) { requestSent = true res.WriteHeader(200) _, _ = res.Write([]byte("{\"ok\":true}")) - if tt.assertOnRequest != nil { - tt.assertOnRequest(t, req) + if tc.assertOnRequest != nil { + tc.assertOnRequest(t, req) } })) defer testServer.Close() @@ -166,14 +166,14 @@ func Test_Tracking_FlushToLogstash(t *testing.T) { fs := slackdeps.NewFsMock() cfg := config.NewConfig(fs, os) cfg.LogstashHostResolved = testServer.URL - if tt.setup != nil { - tt.setup(cfg) + if tc.setup != nil { + tc.setup(cfg) } ioMock := iostreams.NewIOStreamsMock(cfg, fs, os) ioMock.AddDefaultMocks() - err := et.FlushToLogstash(ctx, cfg, ioMock, tt.exitCode) + err := et.FlushToLogstash(ctx, cfg, ioMock, tc.exitCode) require.NoError(t, err) - if tt.shouldNotSendRequest && requestSent { + if tc.shouldNotSendRequest && requestSent { require.Fail(t, "Expected no event tracking request to be sent, but request was sent") } }) @@ -269,12 +269,12 @@ func Test_Tracking_SetSessionData(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { et := NewEventTracker() - tt.setterFunc(et, tt.value) - actual := tt.getterFunc(et) - assert.Equal(t, tt.value, actual) + tc.setterFunc(et, tc.value) + actual := tc.getterFunc(et) + assert.Equal(t, tc.value, actual) }) } } diff --git a/internal/update/cli_autoupdate_test.go b/internal/update/cli_autoupdate_test.go index 5efa5fa6..1af4adc2 100644 --- a/internal/update/cli_autoupdate_test.go +++ b/internal/update/cli_autoupdate_test.go @@ -95,15 +95,15 @@ func Test_CLI_getUpdateFileName(t *testing.T) { expectedErrorF: "auto-updating for the operating system (dragonfly) is unsupported", }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - filename, err := getUpdateFileName(tt.version, tt.operatingSystem, tt.architecture) - if tt.expectedErrorF != "" { + filename, err := getUpdateFileName(tc.version, tc.operatingSystem, tc.architecture) + if tc.expectedErrorF != "" { require.Error(t, err) - require.ErrorContains(t, err, tt.expectedErrorF) + require.ErrorContains(t, err, tc.expectedErrorF) } else { require.NoError(t, err) - require.Equal(t, tt.expectedFilename, filename) + require.Equal(t, tc.expectedFilename, filename) } }) } diff --git a/internal/update/cli_metadata_test.go b/internal/update/cli_metadata_test.go index 2e38b08e..a3540d0d 100644 --- a/internal/update/cli_metadata_test.go +++ b/internal/update/cli_metadata_test.go @@ -68,7 +68,7 @@ func Test_CLI_Metadata_CheckForUpdate(t *testing.T) { }, } - for name, s := range scenarios { + for name, tc := range scenarios { t.Run(name, func(t *testing.T) { ctx := slackcontext.MockContext(t.Context()) @@ -76,7 +76,7 @@ func Test_CLI_Metadata_CheckForUpdate(t *testing.T) { w := httptest.NewRecorder() _, _ = io.WriteString(w, fmt.Sprintf( `{ "slack-cli": { "releases": [ { "version": "%s" } ] } }`, - s.LatestVersion, + tc.LatestVersion, )) res := w.Result() @@ -86,11 +86,11 @@ func Test_CLI_Metadata_CheckForUpdate(t *testing.T) { // Check for an update md := Metadata{httpClient: httpClientMock} - releaseInfo, err := md.CheckForUpdate(ctx, metadataURL, s.CurrentVersion) + releaseInfo, err := md.CheckForUpdate(ctx, metadataURL, tc.CurrentVersion) // Assert expected results - if s.ExpectsResult { - require.Equal(t, s.LatestVersion, releaseInfo.Version) + if tc.ExpectsResult { + require.Equal(t, tc.LatestVersion, releaseInfo.Version) require.Nil(t, err) } else { require.Nil(t, releaseInfo) diff --git a/internal/update/semver_test.go b/internal/update/semver_test.go index 6e8bfb7b..e43b5989 100644 --- a/internal/update/semver_test.go +++ b/internal/update/semver_test.go @@ -75,17 +75,17 @@ func Test_Update_SemVerGreaterThan(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actual, err := SemVerGreaterThan(tt.v1, tt.v2) - if tt.err != nil { - expectedErr := slackerror.ToSlackError(tt.err) + actual, err := SemVerGreaterThan(tc.v1, tc.v2) + if tc.err != nil { + expectedErr := slackerror.ToSlackError(tc.err) actualErr := slackerror.ToSlackError(err) assert.Equal(t, expectedErr.Code, actualErr.Code) } else { assert.NoError(t, err) } - assert.Equal(t, tt.expected, actual) + assert.Equal(t, tc.expected, actual) }) } } @@ -144,17 +144,17 @@ func Test_Update_SemVerLessThan(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actual, err := SemVerLessThan(tt.v1, tt.v2) - if tt.err != nil { - expectedErr := slackerror.ToSlackError(tt.err) + actual, err := SemVerLessThan(tc.v1, tc.v2) + if tc.err != nil { + expectedErr := slackerror.ToSlackError(tc.err) actualErr := slackerror.ToSlackError(err) assert.Equal(t, expectedErr.Code, actualErr.Code) } else { assert.NoError(t, err) } - assert.Equal(t, tt.expected, actual) + assert.Equal(t, tc.expected, actual) }) } } diff --git a/internal/update/update_test.go b/internal/update/update_test.go index dd9c44ad..accde415 100644 --- a/internal/update/update_test.go +++ b/internal/update/update_test.go @@ -53,7 +53,7 @@ func (m *mockDependency) InstallUpdate(ctx context.Context) error { } func Test_Update_HasUpdate(t *testing.T) { - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { dependencyHasUpdate []bool expectedReturnValue bool }{ @@ -81,7 +81,7 @@ func Test_Update_HasUpdate(t *testing.T) { t.Run(name, func(t *testing.T) { // Setup mock dependencies var dependencies []Dependency - for _, hasUpdate := range tt.dependencyHasUpdate { + for _, hasUpdate := range tc.dependencyHasUpdate { dependency := mockDependency{} dependency.On("HasUpdate").Return(hasUpdate, nil) dependencies = append(dependencies, &dependency) @@ -106,13 +106,13 @@ func Test_Update_HasUpdate(t *testing.T) { } // Test - require.Equal(t, tt.expectedReturnValue, updateNotification.HasUpdate()) + require.Equal(t, tc.expectedReturnValue, updateNotification.HasUpdate()) }) } } func Test_Update_isIgnoredCommand(t *testing.T) { - for name, tt := range map[string]struct { + for name, tc := range map[string]struct { command string expected bool }{ @@ -134,15 +134,15 @@ func Test_Update_isIgnoredCommand(t *testing.T) { }, } { t.Run(name, func(t *testing.T) { - if tt.command != "" { - os.Args = []string{"placeholder", tt.command} + if tc.command != "" { + os.Args = []string{"placeholder", tc.command} } else { os.Args = []string{"placeholder"} } // Test updateNotification := &UpdateNotification{} actual := updateNotification.isIgnoredCommand() - require.Equal(t, tt.expected, actual) + require.Equal(t, tc.expected, actual) }) } } diff --git a/test/testutil/testutil_test.go b/test/testutil/testutil_test.go index 179cf43a..abf55dfa 100644 --- a/test/testutil/testutil_test.go +++ b/test/testutil/testutil_test.go @@ -35,10 +35,10 @@ func Test_Update_ContainsSemVer(t *testing.T) { }, } - for name, tt := range tests { + for name, tc := range tests { t.Run(name, func(t *testing.T) { - actual := ContainsSemVer(tt.version) - assert.Equal(t, tt.expected, actual) + actual := ContainsSemVer(tc.version) + assert.Equal(t, tc.expected, actual) }) } } From 3b361c3da0054a0a0caf9a5554034b61a01234b4 Mon Sep 17 00:00:00 2001 From: Michael Brooks Date: Wed, 28 Jan 2026 13:07:28 -0800 Subject: [PATCH 3/4] test: update slice pattern table tests to map pattern (simple use-cases) --- internal/goutils/slices_test.go | 33 ++++---- internal/goutils/strings_test.go | 107 +++++++++---------------- internal/shared/types/channel_test.go | 19 ++--- internal/shared/types/team_test.go | 19 ++--- internal/shared/types/triggers_test.go | 28 +++---- internal/shared/types/user_test.go | 44 ++++------ 6 files changed, 93 insertions(+), 157 deletions(-) diff --git a/internal/goutils/slices_test.go b/internal/goutils/slices_test.go index 7527543d..207a3408 100644 --- a/internal/goutils/slices_test.go +++ b/internal/goutils/slices_test.go @@ -21,33 +21,29 @@ import ( ) func Test_AppendStringIfNotMember(t *testing.T) { - tests := []struct { - name string + tests := map[string]struct { newElement string originalSlice []string expectedSlice []string }{ - { - name: "Append new element", + "Append new element": { newElement: "four", originalSlice: []string{"one", "two", "three"}, expectedSlice: []string{"one", "two", "three", "four"}, }, - { - name: "Do not append existing element", + "Do not append existing element": { newElement: "two", originalSlice: []string{"one", "two", "three"}, expectedSlice: []string{"one", "two", "three"}, }, - { - name: "Append new element to empty list", + "Append new element to empty list": { newElement: "one", originalSlice: []string{}, expectedSlice: []string{"one"}, }, } - for _, tc := range tests { - t.Run(tc.name, func(t *testing.T) { + for name, tc := range tests { + t.Run(name, func(t *testing.T) { actualSlice := AppendStringIfNotMember(tc.originalSlice, tc.newElement) require.ElementsMatch(t, tc.expectedSlice, actualSlice) }) @@ -55,21 +51,20 @@ func Test_AppendStringIfNotMember(t *testing.T) { } func Test_Contains(t *testing.T) { - tests := []struct { - name string + tests := map[string]struct { listToCheck []string toFind string isCaseSensitive bool want bool }{ - {name: "not_case_sensitive_success", listToCheck: []string{"hi", "hey"}, toFind: "Hey", isCaseSensitive: false, want: true}, - {name: "case_sensitive_success", listToCheck: []string{"hi", "Hey"}, toFind: "Hey", isCaseSensitive: true, want: true}, - {name: "case_sensitive_fail", listToCheck: []string{"hi", "hey", "hello", "apple", "pear"}, toFind: "Hey", isCaseSensitive: true, want: false}, - {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}, + "not_case_sensitive_success": {listToCheck: []string{"hi", "hey"}, toFind: "Hey", isCaseSensitive: false, want: true}, + "case_sensitive_success": {listToCheck: []string{"hi", "Hey"}, toFind: "Hey", isCaseSensitive: true, want: true}, + "case_sensitive_fail": {listToCheck: []string{"hi", "hey", "hello", "apple", "pear"}, toFind: "Hey", isCaseSensitive: true, want: false}, + "not_case_sensitive_fail": {listToCheck: []string{"hi", "hey", "hello", "apple", "pear"}, toFind: "Peach", isCaseSensitive: false, want: false}, + "not_case_sensitive_substring": {listToCheck: []string{"hi", "hey hello"}, toFind: "hey", isCaseSensitive: false, want: false}, } - for _, tc := range tests { - t.Run(tc.name, func(t *testing.T) { + for name, tc := range tests { + t.Run(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) } diff --git a/internal/goutils/strings_test.go b/internal/goutils/strings_test.go index 2d4ef724..7c9ecd4c 100644 --- a/internal/goutils/strings_test.go +++ b/internal/goutils/strings_test.go @@ -22,39 +22,34 @@ import ( ) func Test_HashString(t *testing.T) { - tests := []struct { - name string + tests := map[string]struct { text1 string text2 string expected bool }{ - { - name: "happy path - same string", + "happy path - same string": { text1: "one", text2: "one", expected: true, }, - { - name: "different strings", + "different strings": { text1: "one", text2: "two", expected: false, }, - { - name: "almost identical", + "almost identical": { text1: "one ", // add a space text2: "one", expected: false, }, - { - name: "empty strings should be same", + "empty strings should be same": { text1: "", text2: "", expected: true, }, } - for _, tc := range tests { - t.Run(tc.name, func(t *testing.T) { + for name, tc := range tests { + t.Run(name, func(t *testing.T) { hash1, err1 := HashString(tc.text1) hash2, err2 := HashString(tc.text2) require.Equal(t, hash1 == hash2, tc.expected) @@ -65,64 +60,53 @@ func Test_HashString(t *testing.T) { } func Test_ExtractFirstJSONFromString(t *testing.T) { - tests := []struct { - name string + tests := map[string]struct { text string expected string }{ - { - name: "one json - 1", + "one json - 1": { text: "{}", expected: "{}", }, - { - name: "one json - 2", + "one json - 2": { text: "blah blah blah {a: 1}", expected: "{a: 1}", }, - { - name: "one json - 3", + "one json - 3": { text: "blah {a: 1} blah blah", expected: "{a: 1}", }, - { - name: "multiple json", + "multiple json": { text: "{a: 1} {b: 2}", expected: "{a: 1}", }, - { - name: "no json present", + "no json present": { text: "foo bar", expected: "", }, - { - name: "nested json", + "nested json": { text: "{a: b: {c: {d: 1}}} {1}", expected: "{a: b: {c: {d: 1}}}", }, - { - name: "nested json - 2", + "nested json - 2": { text: "{{{}}}", expected: "{{{}}}", }, - { - name: "malformed json", + "malformed json": { text: "{{", expected: "", }, - { - name: "malformed json - 2", + "malformed json - 2": { text: "{{}", expected: "", }, - { - name: "malformed json - 3", + "malformed json - 3": { text: "}}", expected: "", }, } - for _, tc := range tests { - t.Run(tc.name, func(t *testing.T) { + for name, tc := range tests { + t.Run(name, func(t *testing.T) { actualRes := ExtractFirstJSONFromString(tc.text) require.Equal(t, tc.expected, actualRes) }) @@ -130,33 +114,29 @@ func Test_ExtractFirstJSONFromString(t *testing.T) { } func Test_addLogWhenValExist(t *testing.T) { - tests := []struct { - name string + tests := map[string]struct { title string val string expected string }{ - { - name: "Empty string when val is empty", + "Empty string when val is empty": { title: "hello world", val: "", expected: "", }, - { - name: "Empty string when val only has space", + "Empty string when val only has space": { title: "hello world", val: " ", expected: "", }, - { - name: "Return string when val is not empty", + "Return string when val is not empty": { title: "hello world", val: "slack", expected: "hello world: [slack]\n", }, } - for _, tc := range tests { - t.Run(tc.name, func(t *testing.T) { + for name, tc := range tests { + t.Run(name, func(t *testing.T) { output := AddLogWhenValExist(tc.title, tc.val) require.Equal(t, output, tc.expected) }) @@ -388,34 +368,29 @@ func Test_RedactPII(t *testing.T) { } } func Test_UpperCaseTrimAll(t *testing.T) { - tests := []struct { - name string + tests := map[string]struct { namedEntities string expected string }{ - { - name: "Empty string when val is empty", + "Empty string when val is empty": { namedEntities: "", expected: "", }, - { - name: "Empty string when val only has space", + "Empty string when val only has space": { namedEntities: " ", expected: "", }, - { - name: "Return string when val is all lower-case", + "Return string when val is all lower-case": { namedEntities: "slack", expected: "SLACK", }, - { - name: "Return string when val contains spaces", + "Return string when val contains spaces": { namedEntities: "hello, world", expected: "HELLO,WORLD", }, } - for _, tc := range tests { - t.Run(tc.name, func(t *testing.T) { + for name, tc := range tests { + t.Run(name, func(t *testing.T) { output := UpperCaseTrimAll(tc.namedEntities) require.Equal(t, output, tc.expected) }) @@ -423,29 +398,25 @@ func Test_UpperCaseTrimAll(t *testing.T) { } func Test_ToHTTPS(t *testing.T) { - tests := []struct { - name string + tests := map[string]struct { urlAddr string expected string }{ - { - name: "url with https protocol", + "url with https protocol": { urlAddr: "https://www.xyz.com", expected: "https://www.xyz.com", }, - { - name: "url with http protocol", + "url with http protocol": { urlAddr: "http://www.xyz.com", expected: "https://www.xyz.com", }, - { - name: "url with no protocol", + "url with no protocol": { urlAddr: "www.xyz.com", expected: "https://www.xyz.com", }, } - for _, tc := range tests { - t.Run(tc.name, func(t *testing.T) { + for name, tc := range tests { + t.Run(name, func(t *testing.T) { output := ToHTTPS(tc.urlAddr) require.Equal(t, output, tc.expected) }) diff --git a/internal/shared/types/channel_test.go b/internal/shared/types/channel_test.go index dc9c35ad..192c0d3e 100644 --- a/internal/shared/types/channel_test.go +++ b/internal/shared/types/channel_test.go @@ -21,36 +21,31 @@ import ( ) func Test_SlackChannel_String(t *testing.T) { - tests := []struct { - name string + tests := map[string]struct { channel *SlackChannel expectedString string }{ - { - name: "Both ChannelName and ID exist", + "Both ChannelName and ID exist": { channel: &SlackChannel{ChannelName: "#general", ID: "C01234"}, expectedString: "#general (C01234)", }, // TODO(@mbrooks) This test represents the current behaviour, but should the expectedString be "#general" instead? - { - name: "Only ChannelName exists", + "Only ChannelName exists": { channel: &SlackChannel{ChannelName: "#general"}, expectedString: "(#general)", }, // TODO(@mbrooks) This test represents the current behaviour, but should the expectedString be "C01234" instead? - { - name: "Only ID exists", + "Only ID exists": { channel: &SlackChannel{ID: "C01234"}, expectedString: "", }, - { - name: "Both ChannelName and ID do not exist", + "Both ChannelName and ID do not exist": { channel: &SlackChannel{}, expectedString: "", }, } - for _, tc := range tests { - t.Run(tc.name, func(t *testing.T) { + for name, tc := range tests { + t.Run(name, func(t *testing.T) { require.Equal(t, tc.channel.String(), tc.expectedString) }) } diff --git a/internal/shared/types/team_test.go b/internal/shared/types/team_test.go index f23fcf56..92ae2471 100644 --- a/internal/shared/types/team_test.go +++ b/internal/shared/types/team_test.go @@ -21,34 +21,29 @@ import ( ) func Test_SlackTeam_String(t *testing.T) { - tests := []struct { - name string + tests := map[string]struct { slackTeam *SlackTeam expectedString string }{ - { - name: "ID and TeamName exists", + "ID and TeamName exists": { slackTeam: &SlackTeam{ID: "T1234", TeamName: "Team Cats"}, expectedString: "Team Cats (T1234)", }, - { - name: "Only TeamName exists", + "Only TeamName exists": { slackTeam: &SlackTeam{ID: "", TeamName: "Team Cats"}, expectedString: "(Team Cats)", // TODO - confirm that this is the actual format that's desired }, - { - name: "Only ID exists", + "Only ID exists": { slackTeam: &SlackTeam{ID: "T1234", TeamName: ""}, expectedString: "", // TODO - confirm that this is the actual format that's desired }, - { - name: "None exists", + "None exists": { slackTeam: &SlackTeam{ID: "", TeamName: ""}, expectedString: "", }, } - for _, tc := range tests { - t.Run(tc.name, func(t *testing.T) { + for name, tc := range tests { + t.Run(name, func(t *testing.T) { returnedString := tc.slackTeam.String() require.Equal(t, tc.expectedString, returnedString) }) diff --git a/internal/shared/types/triggers_test.go b/internal/shared/types/triggers_test.go index 501a21cd..c72bb6b7 100644 --- a/internal/shared/types/triggers_test.go +++ b/internal/shared/types/triggers_test.go @@ -21,49 +21,41 @@ import ( ) func Test_Triggers_IsKnownType(t *testing.T) { - tests := []struct { - name string + tests := map[string]struct { trigger *Trigger expectedBool bool }{ - { - name: "Trigger type is TriggerTypeShortcut", + "Trigger type is TriggerTypeShortcut": { trigger: &Trigger{Type: TriggerTypeShortcut}, expectedBool: true, }, - { - name: "Trigger type is TriggerTypeSlashCommand", + "Trigger type is TriggerTypeSlashCommand": { trigger: &Trigger{Type: TriggerTypeSlashCommand}, expectedBool: true, }, - { - name: "Trigger type is TriggerTypeMessageShortcut", + "Trigger type is TriggerTypeMessageShortcut": { trigger: &Trigger{Type: TriggerTypeMessageShortcut}, expectedBool: true, }, - { - name: "Trigger type is TriggerTypeEvent", + "Trigger type is TriggerTypeEvent": { trigger: &Trigger{Type: TriggerTypeEvent}, expectedBool: true, }, - { - name: "Trigger type is TriggerTypeWebhook", + "Trigger type is TriggerTypeWebhook": { trigger: &Trigger{Type: TriggerTypeWebhook}, expectedBool: true, }, - { - name: "Trigger type is TriggerTypeScheduled", + "Trigger type is TriggerTypeScheduled": { trigger: &Trigger{Type: TriggerTypeScheduled}, expectedBool: true, }, - { - name: "Trigger type is invalid", + "Trigger type is invalid": { trigger: &Trigger{Type: "pickle pie"}, expectedBool: false, }, } - for _, tc := range tests { - t.Run(tc.name, func(t *testing.T) { + for name, tc := range tests { + t.Run(name, func(t *testing.T) { returnedBool := tc.trigger.IsKnownType() require.Equal(t, tc.expectedBool, returnedBool) }) diff --git a/internal/shared/types/user_test.go b/internal/shared/types/user_test.go index dbe5a720..79cf2f21 100644 --- a/internal/shared/types/user_test.go +++ b/internal/shared/types/user_test.go @@ -21,44 +21,37 @@ import ( ) func Test_SlackUser_String(t *testing.T) { - tests := []struct { - name string + tests := map[string]struct { slackUser *SlackUser expectedString string }{ - { - name: "UserName exists only", + "UserName exists only": { slackUser: &SlackUser{UserName: "charlie"}, expectedString: "charlie", }, - { - name: "UserName and ID exists", + "UserName and ID exists": { slackUser: &SlackUser{UserName: "charlie", ID: "U1234"}, expectedString: "charlie (U1234)", }, - { - name: "UserName,ID, and Email exists", + "UserName,ID, and Email exists": { slackUser: &SlackUser{UserName: "charlie", ID: "U1234", Email: "user@domain.com"}, expectedString: "charlie (U1234, user@domain.com)", }, - { - name: "UserName, ID, Email, and PermissionType exists", + "UserName, ID, Email, and PermissionType exists": { slackUser: &SlackUser{UserName: "charlie", ID: "U1234", Email: "user@domain.com", PermissionType: "owner"}, expectedString: "charlie (U1234, user@domain.com, owner)", }, - { - name: "UserName does not exist", + "UserName does not exist": { slackUser: &SlackUser{}, expectedString: "", }, - { - name: "UserName does not exist but other properties exist", + "UserName does not exist but other properties exist": { slackUser: &SlackUser{ID: "U1234", PermissionType: "owner"}, expectedString: " (U1234, owner)", // TODO - confirm that this is the result we want }, } - for _, tc := range tests { - t.Run(tc.name, func(t *testing.T) { + for name, tc := range tests { + t.Run(name, func(t *testing.T) { returnedString := tc.slackUser.String() require.Equal(t, tc.expectedString, returnedString) }) @@ -66,34 +59,29 @@ func Test_SlackUser_String(t *testing.T) { } func Test_SlackUser_ShorthandF(t *testing.T) { - tests := []struct { - name string + tests := map[string]struct { slackUser *SlackUser expectedString string }{ - { - name: "ID exists", + "ID exists": { slackUser: &SlackUser{ID: "U1234"}, expectedString: "U1234", }, - { - name: "Email exists", + "Email exists": { slackUser: &SlackUser{Email: "user@domain.com"}, expectedString: "user@domain.com", }, - { - name: "ID and Email exist", + "ID and Email exist": { slackUser: &SlackUser{ID: "U1234", Email: "user@domain.com"}, expectedString: "user@domain.com", }, - { - name: "ID and Email do not exist", + "ID and Email do not exist": { slackUser: &SlackUser{}, expectedString: "", }, } - for _, tc := range tests { - t.Run(tc.name, func(t *testing.T) { + for name, tc := range tests { + t.Run(name, func(t *testing.T) { returnedString := tc.slackUser.ShorthandF() require.Equal(t, tc.expectedString, returnedString) }) From 7a210a8a70222783b614f9cffc3540b1db8248d3 Mon Sep 17 00:00:00 2001 From: Michael Brooks Date: Fri, 30 Jan 2026 21:49:36 -0800 Subject: [PATCH 4/4] refactor(tests): cleanup formatting --- internal/goutils/slices_test.go | 35 ++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/internal/goutils/slices_test.go b/internal/goutils/slices_test.go index 207a3408..944a1ffe 100644 --- a/internal/goutils/slices_test.go +++ b/internal/goutils/slices_test.go @@ -57,11 +57,36 @@ func Test_Contains(t *testing.T) { isCaseSensitive bool want bool }{ - "not_case_sensitive_success": {listToCheck: []string{"hi", "hey"}, toFind: "Hey", isCaseSensitive: false, want: true}, - "case_sensitive_success": {listToCheck: []string{"hi", "Hey"}, toFind: "Hey", isCaseSensitive: true, want: true}, - "case_sensitive_fail": {listToCheck: []string{"hi", "hey", "hello", "apple", "pear"}, toFind: "Hey", isCaseSensitive: true, want: false}, - "not_case_sensitive_fail": {listToCheck: []string{"hi", "hey", "hello", "apple", "pear"}, toFind: "Peach", isCaseSensitive: false, want: false}, - "not_case_sensitive_substring": {listToCheck: []string{"hi", "hey hello"}, toFind: "hey", isCaseSensitive: false, want: false}, + "not_case_sensitive_success": { + listToCheck: []string{"hi", "hey"}, + toFind: "Hey", + isCaseSensitive: false, + want: true, + }, + "case_sensitive_success": { + listToCheck: []string{"hi", "Hey"}, + toFind: "Hey", + isCaseSensitive: true, + want: true, + }, + "case_sensitive_fail": { + listToCheck: []string{"hi", "hey", "hello", "apple", "pear"}, + toFind: "Hey", + isCaseSensitive: true, + want: false, + }, + "not_case_sensitive_fail": { + listToCheck: []string{"hi", "hey", "hello", "apple", "pear"}, + toFind: "Peach", + isCaseSensitive: false, + want: false, + }, + "not_case_sensitive_substring": { + listToCheck: []string{"hi", "hey hello"}, + toFind: "hey", + isCaseSensitive: false, + want: false, + }, } for name, tc := range tests { t.Run(name, func(t *testing.T) {