codingworkshop/act
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: remove gotest.tools (#688)

Browse Source 
* refactor: remove `gotest.tools`

* remove all references to `gotest.tools` and replace it with
  `github.com/stretchr/testify` which was originally used for tests
* bump `golangci-lint` version
* add `depguard` and `importas` to prevent import of unwanted packages
* add custom schema and information about config since
  schemastore.org has broken schema for `golangci-lint` config

* fix: handle more error cases
This commit is contained in:
Ryan (hackercat)
2021-05-18 06:14:49 +00:00
committed by GitHub
parent 3e22b1b374
commit f571290b25
9 changed files with 71 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/runner/run_context_test.go
View File

@@ -10,11 +10,10 @@ import (
"testing"
"github.com/nektos/act/pkg/model"
a "github.com/stretchr/testify/assert"
"gotest.tools/v3/assert"
log "github.com/sirupsen/logrus"
"github.com/sirupsen/logrus/hooks/test"
assert "github.com/stretchr/testify/assert"
)
func TestRunContext_EvalBool(t *testing.T) {
@@ -142,15 +141,15 @@ func TestRunContext_EvalBool(t *testing.T) {
for _, table := range tables {
table := table
t.Run(table.in, func(t *testing.T) {
assert := a.New(t)
assertObject := assert.New(t)
defer hook.Reset()
b, err := rc.EvalBool(table.in)
if table.wantErr {
assert.Error(err)
assertObject.Error(err)
}
assert.Equal(table.out, b, fmt.Sprintf("Expected %s to be %v, was %v", table.in, table.out, b))
assert.Empty(hook.LastEntry(), table.in)
assertObject.Equal(table.out, b, fmt.Sprintf("Expected %s to be %v, was %v", table.in, table.out, b))
assertObject.Empty(hook.LastEntry(), table.in)
})
}
}
@@ -269,10 +268,10 @@ func TestRunContext_GetBindsAndMounts(t *testing.T) {
if runtime.GOOS == "darwin" {
fullBind += ":delegated"
}
a.Contains(t, gotbind, fullBind)
assert.Contains(t, gotbind, fullBind)
} else {
mountkey := testcase.rc.jobContainerName()
a.EqualValues(t, testcase.wantmount, gotmount[mountkey])
assert.EqualValues(t, testcase.wantmount, gotmount[mountkey])
}
})
}
@@ -284,7 +283,7 @@ func TestGetGitHubContext(t *testing.T) {
log.SetLevel(log.DebugLevel)
cwd, err := os.Getwd()
assert.NilError(t, err)
assert.Nil(t, err)
rc := &RunContext{
Config: &Config{