fix: variables in test blocks should have access to case data

mumoshu · Apr 24, 2020 · dac93f7 · dac93f7
1 parent 34d41b2
commit dac93f7
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pkg/app/app.go b/pkg/app/app.go
@@ -1053,11 +1053,6 @@ func (app *App) execTestCase(t Test, c Case) (*Result, error) {
 		},
 	}
 
-	ctx, err := addVariables(ctx, t.Variables)
-	if err != nil {
-		return nil, err
-	}
-
 	caseFields := map[string]cty.Value{}
 
 	for k, expr := range c.Args {
@@ -1072,6 +1067,11 @@ func (app *App) execTestCase(t Test, c Case) (*Result, error) {
 	caseVal := cty.ObjectVal(caseFields)
 	ctx.Variables["case"] = caseVal
 
+	ctx, err := addVariables(ctx, t.Variables)
+	if err != nil {
+		return nil, err
+	}
+
 	jobCtx := &JobContext{
 		evalContext: ctx,
 		globalArgs:  map[string]interface{}{},