fix scenario value lookup, add holder lookup for callback post stream

pkg/mock/definition.go

@@ -9,6 +9,8 @@ import (
 
 type Values map[string][]string
 
+type ScenarioValues map[string]string
+
 type Cookies map[string]string
 
 type HttpHeaders struct {
@@ -47,7 +49,7 @@ type Callback struct {
 
 type Scenario struct {
 	Name          string   `json:"name"`
-	Values		map[string]string `json:"values"` 
+	Values        ScenarioValues `json:"values"` 
 	RequiredState []string `json:"requiredState"`
 	NewState      string   `json:"newState"`
 }

pkg/vars/evaluator.go

@@ -30,6 +30,9 @@ func (fp ResponseMessageEvaluator) Eval(req *mock.Request, m *mock.Definition, s
 
 	//first replace the external streams
 	holders := fp.walkAndGet(m.Response.HTTPEntity)
+	holders = append(holders, fp.walkAndGet(m.Callback.HTTPEntity)...)
+
+	//fill holders with the correct values
 	vars := streamFiller.Fill(holders)
 	fp.walkAndFill(&m.Response.HTTPEntity, vars)
 	fp.walkAndFill(&m.Callback.HTTPEntity, vars)
@@ -45,6 +48,7 @@ func (fp ResponseMessageEvaluator) Eval(req *mock.Request, m *mock.Definition, s
 	vars = requestFiller.Fill(holders)
 	fp.mergeVars(vars, fakeFiller.Fill(holders))
 
+	// if we have a scenario, fill any scenario.* holders
 	if m.Control.Scenario.Name != "" {
 	  scenarioFiller := fp.FillerFactory.CreateScenarioFiller(req, m, store, m.Control.Scenario.Name)
 	  fp.mergeVars(vars, scenarioFiller.Fill(holders))
@@ -107,6 +111,7 @@ func (fp ResponseMessageEvaluator) replaceVars(input string, vars map[string][]s
 
 func (fp ResponseMessageEvaluator) extractVars(input string, vars *[]string) {
 	if m := varsRegex.FindAllString(input, -1); m != nil {
+
 		for _, v := range m {
 			varName := strings.Trim(v, "{} ")
 			*vars = append(*vars, varName)

pkg/vars/scenario.go

@@ -19,8 +19,9 @@ func (sf ScenarioFiller) Fill(holders []string) map[string][]string {
      for _, tag := range holders {
          found := false
          s := ""
+
 	 if strings.HasPrefix(tag, "scenario.") {
-	   s, found = sf.Store.GetStateValue(sf.Name, tag[8:])
+	   s, found = sf.Store.GetStateValue(sf.Name, tag[9:])
 	 }
 
 	 if found {