From 2976afad66d5d90ec83375f1d0e0c1871909f33c Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dagger.io>
Date: Thu, 10 Jun 2021 10:50:49 +0000
Subject: [PATCH] universe: spin out js/yarn tests

Signed-off-by: Solomon Hykes <solomon@dagger.io>
---
 stdlib/.dagger/env/js-yarn/.gitignore         |  2 ++
 .../.dagger/env/js-yarn/plan}/yarn.cue        |  0
 stdlib/.dagger/env/js-yarn/values.yaml        | 25 +++++++++++++++++++
 .../js/yarn/testdata/package.json             |  0
 stdlib/universe.bats                          |  4 +++
 tests/stdlib.bats                             |  4 ---
 6 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 stdlib/.dagger/env/js-yarn/.gitignore
 rename {tests/stdlib/js/yarn => stdlib/.dagger/env/js-yarn/plan}/yarn.cue (100%)
 create mode 100644 stdlib/.dagger/env/js-yarn/values.yaml
 rename {tests/stdlib => stdlib}/js/yarn/testdata/package.json (100%)

diff --git a/stdlib/.dagger/env/js-yarn/.gitignore b/stdlib/.dagger/env/js-yarn/.gitignore
new file mode 100644
index 00000000..01ec19b0
--- /dev/null
+++ b/stdlib/.dagger/env/js-yarn/.gitignore
@@ -0,0 +1,2 @@
+# dagger state
+state/**
diff --git a/tests/stdlib/js/yarn/yarn.cue b/stdlib/.dagger/env/js-yarn/plan/yarn.cue
similarity index 100%
rename from tests/stdlib/js/yarn/yarn.cue
rename to stdlib/.dagger/env/js-yarn/plan/yarn.cue
diff --git a/stdlib/.dagger/env/js-yarn/values.yaml b/stdlib/.dagger/env/js-yarn/values.yaml
new file mode 100644
index 00000000..fc1aa34d
--- /dev/null
+++ b/stdlib/.dagger/env/js-yarn/values.yaml
@@ -0,0 +1,25 @@
+name: js-yarn
+inputs:
+    TestData:
+        dir:
+            path: ./js/yarn/testdata
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1gxwmtwahzwdmrskhf90ppwlnze30lgpm056kuesrxzeuyclrwvpsupwtpk
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPSmNvdnFQKzd3QUJZU0ZM
+            cEJHUEpvK3NieEF1SVlWWkxWRHJncFEvc1RjCklDWURWcE1sYm9ES2FtZVNpRGlJ
+            NkJmRHFOYkJ0UHhSbWhsOWZiTjAyeUkKLS0tIDJlWU9hS05SWnZESi9HN1BkZkRN
+            S2JsNXRkbWVERHM0WWk0bXBJSXJIK1kK9R3gMDcbeKRRlt0HHM+w2kcs+sGfASmE
+            0YhxbFF2qQPFwHHR7aPmM+L1ML8cXOrxOOyWmmWhXNgtURCJ9/SO3A==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2021-06-10T10:36:57Z"
+    mac: ENC[AES256_GCM,data:5fm+j9FWlB1fWEMsru5GUkhnYMuh+nvBx8ts4YsExpZpvnb6kD9o0OFqiX5ND5/Bk8Gzh/FrgHBcPI57HeSX4otoKbujk69UxiZJzy0AdtOkxABWVGSAk5KD4whi6A8nIl2GTfs87CUSQmaYpKUyasIhAj57FS17epBvmnK2AxM=,iv:Sc6CVkKwGuQR5yqNVBuFV+Bgqg9r1Mjbfqs6uJnR184=,tag:HK/D4kKb/0TZs1MwUEA3Kg==,type:str]
+    pgp: []
+    encrypted_suffix: secret
+    version: 3.7.1
diff --git a/tests/stdlib/js/yarn/testdata/package.json b/stdlib/js/yarn/testdata/package.json
similarity index 100%
rename from tests/stdlib/js/yarn/testdata/package.json
rename to stdlib/js/yarn/testdata/package.json
diff --git a/stdlib/universe.bats b/stdlib/universe.bats
index b530db96..cb041f53 100644
--- a/stdlib/universe.bats
+++ b/stdlib/universe.bats
@@ -4,6 +4,10 @@ setup() {
     common_setup
 }
 
+@test "js/yarn" {
+    dagger -e js-yarn up
+}
+
 @test "alpine" {
     dagger -e alpine up
 }
diff --git a/tests/stdlib.bats b/tests/stdlib.bats
index 1eaf96f0..e76c5c4f 100644
--- a/tests/stdlib.bats
+++ b/tests/stdlib.bats
@@ -4,10 +4,6 @@ setup() {
     common_setup
 }
 
-@test "stdlib: yarn" {
-    "$DAGGER" compute "$TESTDIR"/stdlib/js/yarn --input-dir TestData="$TESTDIR"/stdlib/js/yarn/testdata
-}
-
 @test "stdlib: go" {
     "$DAGGER" compute "$TESTDIR"/stdlib/go --input-dir TestData="$TESTDIR"/stdlib/go/testdata
 }