diff --git a/.golangci.yaml b/.golangci.yaml index 59dd309..b4f8404 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -1,3 +1,4 @@ -linters: +version: "2" +formatters: enable: - gofumpt diff --git a/internal/cmd/config_set_test.go b/internal/cmd/config_set_test.go index 315cc6d..a03d677 100644 --- a/internal/cmd/config_set_test.go +++ b/internal/cmd/config_set_test.go @@ -44,8 +44,8 @@ func TestNewConfigSetCmd(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.Setenv("EDITOR", "emacs") - os.Setenv("SHELL", "/bin/sh") + assert.NoError(t, os.Setenv("EDITOR", "emacs")) + assert.NoError(t, os.Setenv("SHELL", "/bin/sh")) errBuf := &bytes.Buffer{} outBuf := &bytes.Buffer{} w, args := s.setup(t) diff --git a/internal/cmd/create_env_test.go b/internal/cmd/create_env_test.go index af3a00f..7f7d845 100644 --- a/internal/cmd/create_env_test.go +++ b/internal/cmd/create_env_test.go @@ -53,8 +53,8 @@ func TestNewCreateEnvCmd(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.Setenv("EDITOR", "emacs") - os.Setenv("SHELL", "/bin/sh") + assert.NoError(t, os.Setenv("EDITOR", "emacs")) + assert.NoError(t, os.Setenv("SHELL", "/bin/sh")) errBuf := &bytes.Buffer{} outBuf := &bytes.Buffer{} w, args := s.setup(t) diff --git a/internal/cmd/create_test.go b/internal/cmd/create_test.go index 2081de0..bc59062 100644 --- a/internal/cmd/create_test.go +++ b/internal/cmd/create_test.go @@ -53,8 +53,8 @@ func TestNewCreateCmd(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.Setenv("EDITOR", "emacs") - os.Setenv("SHELL", "/bin/sh") + assert.NoError(t, os.Setenv("EDITOR", "emacs")) + assert.NoError(t, os.Setenv("SHELL", "/bin/sh")) errBuf := &bytes.Buffer{} outBuf := &bytes.Buffer{} w, args := s.setup(t) diff --git a/internal/cmd/edit_env_test.go b/internal/cmd/edit_env_test.go index e077189..8586a69 100644 --- a/internal/cmd/edit_env_test.go +++ b/internal/cmd/edit_env_test.go @@ -44,8 +44,8 @@ func TestNewEditEnvCmd(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.Setenv("EDITOR", "emacs") - os.Setenv("SHELL", "/bin/sh") + assert.NoError(t, os.Setenv("EDITOR", "emacs")) + assert.NoError(t, os.Setenv("SHELL", "/bin/sh")) errBuf := &bytes.Buffer{} outBuf := &bytes.Buffer{} w, args := s.setup(t) diff --git a/internal/cmd/edit_test.go b/internal/cmd/edit_test.go index 3129c4c..7ce0857 100644 --- a/internal/cmd/edit_test.go +++ b/internal/cmd/edit_test.go @@ -44,8 +44,8 @@ func TestNewEditCmd(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.Setenv("EDITOR", "emacs") - os.Setenv("SHELL", "/bin/sh") + assert.NoError(t, os.Setenv("EDITOR", "emacs")) + assert.NoError(t, os.Setenv("SHELL", "/bin/sh")) errBuf := &bytes.Buffer{} outBuf := &bytes.Buffer{} w, args := s.setup(t) diff --git a/internal/cmd/fix_test.go b/internal/cmd/fix_test.go index aa327ae..66f112e 100644 --- a/internal/cmd/fix_test.go +++ b/internal/cmd/fix_test.go @@ -42,8 +42,8 @@ func TestNewFixCmd(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.Setenv("EDITOR", "emacs") - os.Setenv("SHELL", "/bin/sh") + assert.NoError(t, os.Setenv("EDITOR", "emacs")) + assert.NoError(t, os.Setenv("SHELL", "/bin/sh")) errBuf := &bytes.Buffer{} outBuf := &bytes.Buffer{} w := s.setup(t) diff --git a/internal/cmd/global_get.go b/internal/cmd/global_get.go index 70b795f..a447647 100644 --- a/internal/cmd/global_get.go +++ b/internal/cmd/global_get.go @@ -17,7 +17,7 @@ func newGlobalGetCmd(workspaceManager workspaceManager, completionManager comple case "config-dir": cmd.Printf("%s", workspaceManager.GetConfigDir()) default: - return fmt.Errorf("Key '%s' does not exist", args[0]) + return fmt.Errorf("key '%s' does not exist", args[0]) } return nil }, diff --git a/internal/cmd/global_get_test.go b/internal/cmd/global_get_test.go index b75a93d..7b3108a 100644 --- a/internal/cmd/global_get_test.go +++ b/internal/cmd/global_get_test.go @@ -40,8 +40,8 @@ func TestNewGlobalGetCmd(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.Setenv("EDITOR", "emacs") - os.Setenv("SHELL", "/bin/sh") + assert.NoError(t, os.Setenv("EDITOR", "emacs")) + assert.NoError(t, os.Setenv("SHELL", "/bin/sh")) errBuf := &bytes.Buffer{} outBuf := &bytes.Buffer{} w, args := s.setup(t) diff --git a/internal/cmd/list_test.go b/internal/cmd/list_test.go index 759c2b3..a5d3e33 100644 --- a/internal/cmd/list_test.go +++ b/internal/cmd/list_test.go @@ -68,8 +68,8 @@ func TestNewListCmd(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.Setenv("EDITOR", "emacs") - os.Setenv("SHELL", "/bin/sh") + assert.NoError(t, os.Setenv("EDITOR", "emacs")) + assert.NoError(t, os.Setenv("SHELL", "/bin/sh")) errBuf := &bytes.Buffer{} outBuf := &bytes.Buffer{} w := s.setup(t) diff --git a/internal/cmd/remove_test.go b/internal/cmd/remove_test.go index e4973ce..a2c4967 100644 --- a/internal/cmd/remove_test.go +++ b/internal/cmd/remove_test.go @@ -44,8 +44,8 @@ func TestNewRemoveCmd(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.Setenv("EDITOR", "emacs") - os.Setenv("SHELL", "/bin/sh") + assert.NoError(t, os.Setenv("EDITOR", "emacs")) + assert.NoError(t, os.Setenv("SHELL", "/bin/sh")) errBuf := &bytes.Buffer{} outBuf := &bytes.Buffer{} w, args := s.setup(t) diff --git a/internal/cmd/root_test.go b/internal/cmd/root_test.go index 1c98b74..5282451 100644 --- a/internal/cmd/root_test.go +++ b/internal/cmd/root_test.go @@ -17,8 +17,8 @@ func TestNewWorkspaceManager(t *testing.T) { { "Missing VISUAL or EDITOR variable", func(t *testing.T) { - os.Unsetenv("VISUAL") - os.Unsetenv("EDITOR") + assert.NoError(t, os.Unsetenv("VISUAL")) + assert.NoError(t, os.Unsetenv("EDITOR")) }, func(t *testing.T, w workspaceManager, err error) { assert.Error(t, err) @@ -27,8 +27,8 @@ func TestNewWorkspaceManager(t *testing.T) { { "Missing SHELL variable", func(t *testing.T) { - os.Setenv("VISUAL", "emacs") - os.Unsetenv("SHELL") + assert.NoError(t, os.Setenv("VISUAL", "emacs")) + assert.NoError(t, os.Unsetenv("SHELL")) }, func(t *testing.T, w workspaceManager, err error) { assert.Error(t, err) @@ -37,9 +37,9 @@ func TestNewWorkspaceManager(t *testing.T) { { "Customize the config directory", func(t *testing.T) { - os.Setenv("VISUAL", "emacs") - os.Setenv("SHELL", "/bin/bash") - os.Setenv("WO_CONFIG_PATH", os.TempDir()) + assert.NoError(t, os.Setenv("VISUAL", "emacs")) + assert.NoError(t, os.Setenv("SHELL", "/bin/bash")) + assert.NoError(t, os.Setenv("WO_CONFIG_PATH", os.TempDir())) }, func(t *testing.T, w workspaceManager, err error) { assert.NoError(t, err) diff --git a/internal/cmd/run_test.go b/internal/cmd/run_test.go index 45d737c..d57c33c 100644 --- a/internal/cmd/run_test.go +++ b/internal/cmd/run_test.go @@ -43,8 +43,8 @@ func TestNewRunCmd(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.Setenv("EDITOR", "emacs") - os.Setenv("SHELL", "/bin/sh") + assert.NoError(t, os.Setenv("EDITOR", "emacs")) + assert.NoError(t, os.Setenv("SHELL", "/bin/sh")) w, args := s.setup(t) cmd := newRunCmd(w, newMockCompletionManager(t)) cmd.SetArgs(args) diff --git a/internal/cmd/setup_test.go b/internal/cmd/setup_test.go index 429d20c..3cd91f6 100644 --- a/internal/cmd/setup_test.go +++ b/internal/cmd/setup_test.go @@ -206,8 +206,8 @@ export WO_THEME=light } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.Setenv("EDITOR", "emacs") - os.Setenv("SHELL", "/bin/sh") + assert.NoError(t, os.Setenv("EDITOR", "emacs")) + assert.NoError(t, os.Setenv("SHELL", "/bin/sh")) errBuf := &bytes.Buffer{} outBuf := &bytes.Buffer{} w := s.setup(t) diff --git a/internal/cmd/show_test.go b/internal/cmd/show_test.go index 84b64f7..a1410ee 100644 --- a/internal/cmd/show_test.go +++ b/internal/cmd/show_test.go @@ -134,8 +134,8 @@ Envs } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.Setenv("EDITOR", "emacs") - os.Setenv("SHELL", "/bin/sh") + assert.NoError(t, os.Setenv("EDITOR", "emacs")) + assert.NoError(t, os.Setenv("SHELL", "/bin/sh")) errBuf := &bytes.Buffer{} outBuf := &bytes.Buffer{} w, args := s.setup(t) diff --git a/internal/workspace/workspace_test.go b/internal/workspace/workspace_test.go index d6132f7..9f207d4 100644 --- a/internal/workspace/workspace_test.go +++ b/internal/workspace/workspace_test.go @@ -78,7 +78,7 @@ func TestNewWorkspaceManager(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.RemoveAll(config.getPath(t)) + assert.NoError(t, os.RemoveAll(config.getPath(t))) visual, editor, shell := s.setup() manager, err := NewWorkspaceManager(WithEditor(editor, visual), WithShellPath(shell), WithConfigPath(config.getPath(t))) s.test(t, manager, err) @@ -127,7 +127,7 @@ func TestList(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.RemoveAll(config.getPath(t)) + assert.NoError(t, os.RemoveAll(config.getPath(t))) w, err := NewWorkspaceManager(WithEditor("emacs", "emacs"), WithShellPath("/bin/bash"), WithConfigPath(config.getPath(t))) assert.NoError(t, err) s.setup(t, w) @@ -215,7 +215,7 @@ test_func2() { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.RemoveAll(config.getPath(t)) + assert.NoError(t, os.RemoveAll(config.getPath(t))) w, err := NewWorkspaceManager(WithEditor("emacs", "emacs"), WithShellPath("/bin/bash"), WithConfigPath(config.getPath(t))) assert.NoError(t, err) s.setup(t, w) @@ -301,7 +301,7 @@ func TestCreate(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.RemoveAll(config.getPath(t)) + assert.NoError(t, os.RemoveAll(config.getPath(t))) w, err := NewWorkspaceManager(WithEditor("emacs", "emacs"), WithShellPath("/bin/bash"), WithConfigPath(config.getPath(t))) assert.NoError(t, err) projectPath := s.setup(t, w) @@ -350,7 +350,7 @@ func TestCreateEnv(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.RemoveAll(config.getPath(t)) + assert.NoError(t, os.RemoveAll(config.getPath(t))) w, err := NewWorkspaceManager(WithEditor("emacs", "emacs"), WithShellPath("/bin/bash"), WithConfigPath(config.getPath(t))) assert.NoError(t, err) assert.NoError(t, w.Create("test", project.getPath(t))) @@ -385,7 +385,7 @@ func TestEdit(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.RemoveAll(config.getPath(t)) + assert.NoError(t, os.RemoveAll(config.getPath(t))) w, err := NewWorkspaceManager(WithEditor("emacs", "emacs"), WithShellPath("/bin/bash"), WithConfigPath(config.getPath(t))) assert.NoError(t, err) exec := NewMockCommander(t) @@ -423,7 +423,7 @@ func TestEditEnv(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.RemoveAll(config.getPath(t)) + assert.NoError(t, os.RemoveAll(config.getPath(t))) w, err := NewWorkspaceManager(WithEditor("emacs", "emacs"), WithShellPath("/bin/bash"), WithConfigPath(config.getPath(t))) assert.NoError(t, err) err = w.Create("test", project.getPath(t)) @@ -513,7 +513,7 @@ end } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.RemoveAll(config.getPath(t)) + assert.NoError(t, os.RemoveAll(config.getPath(t))) w, err := NewWorkspaceManager(WithEditor("emacs", "emacs"), WithShellPath(s.shell), WithConfigPath(config.getPath(t))) assert.NoError(t, err) err = w.Create("test", project.getPath(t)) @@ -568,7 +568,7 @@ func TestRemove(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.RemoveAll(config.getPath(t)) + assert.NoError(t, os.RemoveAll(config.getPath(t))) w, err := NewWorkspaceManager(WithEditor("emacs", "emacs"), WithShellPath("/bin/bash"), WithConfigPath(config.getPath(t))) assert.NoError(t, err) err = w.Create("test", project.getPath(t)) @@ -624,7 +624,7 @@ func TestFix(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.RemoveAll(config.getPath(t)) + assert.NoError(t, os.RemoveAll(config.getPath(t))) w, err := NewWorkspaceManager(WithEditor("emacs", "emacs"), WithShellPath("/bin/bash"), WithConfigPath(config.getPath(t))) assert.NoError(t, err) err = w.Create("test", project.getPath(t)) @@ -701,7 +701,7 @@ func TestSetConfig(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.RemoveAll(config.getPath(t)) + assert.NoError(t, os.RemoveAll(config.getPath(t))) w, err := NewWorkspaceManager(WithEditor("emacs", "emacs"), WithShellPath("/bin/bash"), WithConfigPath(config.getPath(t))) assert.NoError(t, err) err = w.Create("test", project.getPath(t)) @@ -734,7 +734,7 @@ func TestBuildAliases(t *testing.T) { } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { - os.RemoveAll(config.getPath(t)) + assert.NoError(t, os.RemoveAll(config.getPath(t))) w, err := NewWorkspaceManager(WithEditor("emacs", "emacs"), WithShellPath("/bin/bash"), WithConfigPath(config.getPath(t))) assert.NoError(t, err) testProjectPath := fmt.Sprintf("%s/test", project.getPath(t))