Merge pull request #3 from saymedia/ADS-5069-Make-wait-step-exception

Added wait step check

pipeline.go

@@ -171,7 +171,9 @@ func lowerStep(step Step, context *Context, stepContext *StepContext) Step {
 	env, ok := step["env"].(map[interface{}]interface{})
 	if !ok {
 		env = make(map[interface{}]interface{})
-		step["env"] = env
+		if _, exists := step["wait"]; !exists {
+			step["env"] = env
+		}
 	}
 	env["JOBSWORTH_CAUTIOUS"] = stepContext.CautiousStr()
 	env["JOBSWORTH_CODEBASE"] = context.CodebaseName()

pipeline_test.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"reflect"
 	"testing"
 
 	"gopkg.in/yaml.v2"
@@ -26,3 +27,28 @@ plugins:
 	}
 	deepCopyStep(step)
 }
+
+func TestWaitStep(t *testing.T) {
+	context := &Context{}
+	stepContext := &StepContext{}
+
+	step := Step{}
+	stepBytes := []byte(`
+command: foo
+`)
+	yaml.Unmarshal(stepBytes, &step)
+	step = lowerStep(step, context, stepContext)
+	if reflect.DeepEqual(step["env"], nil) {
+		t.Errorf("env should be set")
+	}
+
+	step = Step{}
+	stepBytes = []byte(`
+wait: ~
+`)
+	yaml.Unmarshal(stepBytes, &step)
+	step = lowerStep(step, context, stepContext)
+	if !reflect.DeepEqual(step["env"], nil) {
+		t.Errorf("env should not be set for a wait step")
+	}
+}