fix

Author: Begi

Makefile

@@ -45,7 +45,7 @@ $(ALL_RESULTS_TARGETS):
 
 .PHONY: build lint clean testrun test dist test-xunit package
 
-build: ## build all components and push them into dist directory
+build: clean ## build all components and push them into dist directory
 	$(info Building Component venom)
 	$(MAKE) build -C cmd/venom
 	$(MAKE) dist

executors/tavern/assert.go

@@ -18,6 +18,7 @@ func init() {
 // AssertResponse compares expected and actual responses and raises an error
 // if assertion fails
 func AssertResponse(actual interface{}, expected ...interface{}) error {
+
 	result, ok := actual.(Result)
 	if !ok {
 		return fmt.Errorf("bad actual type: expected: Result, actual: %T", actual)
@@ -209,7 +210,7 @@ func PathToRegexp(path string) string {
 }
 
 // ElementInList tells if given path is in filters list
-func ElementInList(path string, filters[]string) bool {
+func ElementInList(path string, filters []string) bool {
 	for _, filter := range filters {
 		if filter == path {
 			return true
@@ -234,4 +235,4 @@ func CheckAssertions(expected Response) error {
 		}
 	}
 	return nil
-}
+}

executors/tavern/tavern.go

@@ -101,7 +101,7 @@ func (Executor) ZeroValueResult() interface{} {
 
 // GetDefaultAssertions return default assertions for this executor
 func (Executor) GetDefaultAssertions() *venom.StepAssertions {
-	return &venom.StepAssertions{Assertions: []venom.Assertion{"result AssertResponse"}}
+	return &venom.StepAssertions{Assertions: []venom.Assertion{}}
 }
 
 // Run execute TestStep
@@ -114,7 +114,10 @@ func (Executor) Run(ctx context.Context, step venom.TestStep) (interface{}, erro
 
 	// dirty: mapstructure doesn't like decoding map[interface{}]interface{}, let's force manually
 	request := step["request"]
-	mapRequest := request.(map[string]interface{})
+	mapRequest, ok := request.(map[string]interface{})
+	if !ok {
+		return nil, fmt.Errorf("request is not map[string]interface{}")
+	}
 	e.Request.MultipartForm = mapRequest["multipart_form"]
 
 	r := Result{}
@@ -143,9 +146,9 @@ func (Executor) Run(ctx context.Context, step venom.TestStep) (interface{}, erro
 	}
 
 	if e.Request.TLS.ClientCert != "" {
-		cert, err := tls.X509KeyPair([]byte(e.Request.TLS.ClientCert), []byte(e.Request.TLS.ClientKey))
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse x509 mTLS certificate or key: %s", err)
+		cert, errB := tls.X509KeyPair([]byte(e.Request.TLS.ClientCert), []byte(e.Request.TLS.ClientKey))
+		if errB != nil {
+			return nil, fmt.Errorf("failed to parse x509 mTLS certificate or key: %s", errB)
 		}
 		opts = append(opts, httputil.WithTLSClientAuth(cert))
 	}
@@ -192,9 +195,9 @@ func (Executor) Run(ctx context.Context, step venom.TestStep) (interface{}, erro
 	}
 
 	if len(e.Request.Proxy) > 0 {
-		proxyURL, err := url.Parse(e.Request.Proxy)
-		if err != nil {
-			return nil, err
+		proxyURL, errB := url.Parse(e.Request.Proxy)
+		if errB != nil {
+			return nil, errB
 		}
 		tr.Proxy = http.ProxyURL(proxyURL)
 	}

process.go

@@ -167,15 +167,13 @@ func (v *Venom) Parse(ctx context.Context, path []string) error {
 func (v *Venom) Process(ctx context.Context, path []string) error {
 	v.Tests.Status = StatusRun
 	v.Tests.Start = time.Now()
-	var vars H
 	Debug(ctx, "nb testsuites: %d", len(v.Tests.TestSuites))
 	for i := range v.Tests.TestSuites {
 
-		v.Tests.TestSuites[i].Vars = vars
 		v.Tests.TestSuites[i].Start = time.Now()
 		// ##### RUN Test Suite Here
 		v.runTestSuite(ctx, &v.Tests.TestSuites[i])
-		vars.AddAll(v.Tests.TestSuites[i].ComputedVars)
+		v.AddVariables(v.Tests.TestSuites[i].ComputedVars)
 
 		v.Tests.TestSuites[i].End = time.Now()
 		v.Tests.TestSuites[i].Duration = v.Tests.TestSuites[i].End.Sub(v.Tests.TestSuites[i].Start).Seconds()