Update test to use 'devcontainer features test'

toms74209200 · toms74209200 · commit bde7d366b757 · 2024-02-24T23:11:09.000+09:00
diff --git a/.github/workflows/test-feature.yml b/.github/workflows/test-feature.yml
@@ -15,23 +15,15 @@ on:
       - README.md
       - .github/**
       - "!.github/workflows/test-feature.yml"
+  workflow_call:
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
   test-feature:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - image: mcr.microsoft.com/devcontainers/base:ubuntu
-            options: '{ "version": "1.30.0" }'
-          - image: debian:bookworm-slim
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - run: npm install -g @devcontainers/cli
-      - run: bash test.sh "$IMAGE" "$OPTIONS"
-        env:
-          IMAGE: ${{ matrix.image }}
-          OPTIONS: ${{ matrix.options }}
+      - run: devcontainer features test -f deno --skip-autogenerated
diff --git a/src/deno/devcontainer-feature.json b/src/deno/devcontainer-feature.json
@@ -1,47 +1,47 @@
-{
-    "name": "Deno",
-    "id": "deno",
-    "version": "1.2.0",
-    "description": "Installs Deno",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "1.41.0",
-                "1.40.5",
-                "1.39.4",
-                "1.38.5",
-                "1.37.2",
-                "1.36.4",
-                "1.35.3",
-                "1.34.3",
-                "1.33.4",
-                "1.32.5",
-                "1.31.3",
-                "1.30.3",
-                "1.29.4",
-                "1.28.3",
-                "1.27.2",
-                "1.26.2",
-                "1.25.4",
-                "1.24.3"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Deno version to install"
-        }
-    },
-    "customizations": {
-        "vscode": {
-            "settings": { 
-				"deno.enable": true,
-				"deno.lint": true,
-				"editor.defaultFormatter": "denoland.vscode-deno"
-			},
-            "extensions": [
-                "denoland.vscode-deno"
-            ]
-        }
-    }
-}
+{
+    "name": "Deno",
+    "id": "deno",
+    "version": "1.1.0",
+    "description": "Installs Deno",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "none",
+                "1.41.0",
+                "1.40.5",
+                "1.39.4",
+                "1.38.5",
+                "1.37.2",
+                "1.36.4",
+                "1.35.3",
+                "1.34.3",
+                "1.33.4",
+                "1.32.5",
+                "1.31.3",
+                "1.30.3",
+                "1.29.4",
+                "1.28.3",
+                "1.27.2",
+                "1.26.2",
+                "1.25.4",
+                "1.24.3"
+            ],
+            "default": "latest",
+            "description": "Select or enter a Deno version to install"
+        }
+    },
+    "customizations": {
+        "vscode": {
+            "settings": { 
+				"deno.enable": true,
+				"deno.lint": true,
+				"editor.defaultFormatter": "denoland.vscode-deno"
+			},
+            "extensions": [
+                "denoland.vscode-deno"
+            ]
+        }
+    }
+}
diff --git a/src/deno/install.sh b/src/deno/install.sh
diff --git a/test.sh b/test.sh
diff --git a/test/deno/scenarios.json b/test/deno/scenarios.json
@@ -0,0 +1,16 @@
+{
+    "test": {
+        "image": "mcr.microsoft.com/devcontainers/base:debian",
+        "features": {
+            "deno": {}
+        }
+    },
+    "specified_version": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "deno": {
+                "version": "1.30.3"
+            }
+        }
+    }
+}
diff --git a/test/deno/specified_version.sh b/test/deno/specified_version.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+source dev-container-features-test-lib
+
+check "deno version" deno --version | grep '1.30.3'
+
+reportResults
diff --git a/test/deno/test.sh b/test/deno/test.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+source dev-container-features-test-lib
+
+check "deno version" deno --version
+
+reportResults
