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

20
pkg/runner/expression_test.go
View File

@@ -8,7 +8,7 @@ import (
"testing"
"github.com/nektos/act/pkg/model"
a "github.com/stretchr/testify/assert"
assert "github.com/stretchr/testify/assert"
)
func TestEvaluate(t *testing.T) {
@@ -115,14 +115,14 @@ func TestEvaluate(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)
out, _, err := ee.Evaluate(table.in)
if table.errMesg == "" {
assert.NoError(err, table.in)
assert.Equal(table.out, out, table.in)
assertObject.NoError(err, table.in)
assertObject.Equal(table.out, out, table.in)
} else {
assert.Error(err, table.in)
assert.Equal(table.errMesg, err.Error(), table.in)
assertObject.Error(err, table.in)
assertObject.Equal(table.errMesg, err.Error(), table.in)
}
})
}
@@ -188,9 +188,9 @@ func TestInterpolate(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)
out := ee.Interpolate(table.in)
assert.Equal(table.out, out, table.in)
assertObject.Equal(table.out, out, table.in)
})
}
}
@@ -277,9 +277,9 @@ func TestRewrite(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)
re := ee.Rewrite(table.in)
assert.Equal(table.re, re, table.in)
assertObject.Equal(table.re, re, table.in)
})
}
}