From 4e27937ccc0c0faecf0020950e99d1778bf3eb84 Mon Sep 17 00:00:00 2001
From: Richard Jones <richard@dagger.io>
Date: Tue, 4 Jan 2022 12:20:01 -0700
Subject: [PATCH] refactored tests and added more

Signed-off-by: Richard Jones <richard@dagger.io>
---
 tests/plan.bats                               |  9 ++++---
 tests/plan/with/actions.cue                   | 25 +++++++++++++++++++
 .../params/main.cue => with/params.cue}       |  0
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 tests/plan/with/actions.cue
 rename tests/plan/{inputs/params/main.cue => with/params.cue} (100%)

diff --git a/tests/plan.bats b/tests/plan.bats
index 52b567a4..f6aaaec0 100644
--- a/tests/plan.bats
+++ b/tests/plan.bats
@@ -82,15 +82,16 @@ setup() {
 	assert_output --partial 'failed: exec: "rtyet": executable file not found'
 }
 
-@test "plan/params" {
+@test "plan/with" {
   cd "$TESTDIR"
-  "$DAGGER" --europa up --with 'inputs: params: foo:"bar"' ./plan/inputs/params/main.cue
+  "$DAGGER" --europa up --with 'inputs: params: foo:"bar"' ./plan/with/params.cue
+  "$DAGGER" --europa up --with 'actions: verify: env: FOO: "bar"' ./plan/with/actions.cue
   
-  run "$DAGGER" --europa up --with 'inputs: params: foo:1' ./plan/inputs/params/main.cue
+  run "$DAGGER" --europa up --with 'inputs: params: foo:1' ./plan/with/params.cue
   assert_failure
   assert_output --partial "conflicting values string and 1"
   
-  run "$DAGGER" --europa up ./plan/inputs/params/main.cue
+  run "$DAGGER" --europa up ./plan/with/params.cue
   assert_failure
   assert_output --partial "actions.verify.env.FOO: non-concrete value string"
 }
diff --git a/tests/plan/with/actions.cue b/tests/plan/with/actions.cue
new file mode 100644
index 00000000..1d856fdd
--- /dev/null
+++ b/tests/plan/with/actions.cue
@@ -0,0 +1,25 @@
+package main
+
+import (
+	"alpha.dagger.io/europa/dagger/engine"
+)
+
+engine.#Plan & {
+
+	actions: {
+		image: engine.#Pull & {
+			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
+		}
+
+		verify: engine.#Exec & {
+			input: image.output
+			env: FOO: string
+			args: [
+				"sh", "-c",
+				#"""
+					test -n "$FOO"
+					"""#,
+			]
+		}
+	}
+}
diff --git a/tests/plan/inputs/params/main.cue b/tests/plan/with/params.cue
similarity index 100%
rename from tests/plan/inputs/params/main.cue
rename to tests/plan/with/params.cue