From 21e0ac21de45b6984517e5c66eb6519be43040fe Mon Sep 17 00:00:00 2001
From: Sam Alba <sam.alba@gmail.com>
Date: Fri, 2 Apr 2021 17:16:57 -0700
Subject: [PATCH] fixed tests

Signed-off-by: Sam Alba <sam.alba@gmail.com>
---
 tests/cli/input/main.cue |  2 +-
 tests/test-cli.sh        | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/cli/input/main.cue b/tests/cli/input/main.cue
index 636cf13a..fd0f7b94 100644
--- a/tests/cli/input/main.cue
+++ b/tests/cli/input/main.cue
@@ -11,7 +11,7 @@ foo:    "bar"
 bar: {
 	string
 
-	#compute: [
+	#up: [
 		llb.#FetchContainer & {ref: "busybox"},
 		llb.#Exec & {
 			args: ["cp", "/source/testfile", "/out"]
diff --git a/tests/test-cli.sh b/tests/test-cli.sh
index ebb221f4..276d50b1 100644
--- a/tests/test-cli.sh
+++ b/tests/test-cli.sh
@@ -65,17 +65,17 @@ test::cli::newgit() {
   DAGGER_STORE="$(mktemp -d -t dagger-store-XXXXXX)"
   export DAGGER_STORE
 
-  test::one "CLI: new: --plan-git" \
+  test::one "CLI: new git: --plan-git" \
       "$dagger" "${DAGGER_BINARY_ARGS[@]}" new --plan-git https://github.com/samalba/dagger-test.git simple
 
-  test::one "CLI: new: verify plan can be upped" \
+  test::one "CLI: new git: verify plan can be upped" \
       "$dagger" "${DAGGER_BINARY_ARGS[@]}" up -d "simple"
 
-  test::one "CLI: new: verify we have the right plan" --stdout='{
+  test::one "CLI: new git: verify we have the right plan" --stdout='{
     foo: "value"
     bar: "another value"
 }' \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" query -d "simple" -c
+      "$dagger" "${DAGGER_BINARY_ARGS[@]}" query -f cue -d "simple" -c
 }
 
 test::cli::query() {
@@ -129,7 +129,7 @@ test::cli::plan() {
     foo: "value"
     bar: "another value"
 }' \
-      "$dagger" "${DAGGER_BINARY_ARGS[@]}" query -d "simple" -c
+      "$dagger" "${DAGGER_BINARY_ARGS[@]}" query -f cue -d "simple" -c
 }
 
 test::cli::input() {
@@ -146,13 +146,13 @@ test::cli::input() {
   test::one "CLI: up: missing input" \
       "$dagger" "${DAGGER_BINARY_ARGS[@]}" up -d "input" --stdout='{"foo":"bar"}'
 
-  test::one "CLI: plan dir" \
+  test::one "CLI: input dir" \
       "$dagger" "${DAGGER_BINARY_ARGS[@]}" input -d "input" dir "source" ./tests/cli/input/testdata
 
   test::one "CLI: up: input is set with input dir" \
       "$dagger" "${DAGGER_BINARY_ARGS[@]}" up -d "input" --stdout='{"bar":"thisisatest\n","foo":"bar","source":{}}'
 
-  test::one "CLI: plan dir" \
+  test::one "CLI: input git" \
       "$dagger" "${DAGGER_BINARY_ARGS[@]}" input -d "input" git "source" https://github.com/samalba/dagger-test-simple.git
 
   test::one "CLI: up: input is set with input git" \