From 5f156fd09c2aad62888080a0448def34671f76d0 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Thu, 17 May 2018 16:12:13 -0400
Subject: [PATCH] tidy, and revert changes to cli test sample commands
---
test/cli/index.js | 5 +++--
test/cli/samples/basic/command.sh | 2 +-
test/cli/samples/custom-element/command.sh | 2 +-
test/cli/samples/dev/command.sh | 2 +-
test/cli/samples/dir-sourcemap/command.sh | 2 +-
test/cli/samples/dir-subdir/command.sh | 2 +-
test/cli/samples/dir/command.sh | 2 +-
test/cli/samples/globals/command.sh | 2 +-
test/cli/samples/sourcemap-inline/command.sh | 2 +-
test/cli/samples/sourcemap/command.sh | 2 +-
test/cli/samples/ssr/command.sh | 2 +-
test/cli/samples/store/command.sh | 2 +-
12 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/test/cli/index.js b/test/cli/index.js
index 5ddb4eac10..bb17ec50c4 100644
--- a/test/cli/index.js
+++ b/test/cli/index.js
@@ -36,7 +36,9 @@ describe('cli', () => {
shell.mkdir("-p", "actual");
shell.rm("-rf", "actual/*");
- const { commandErr } = shell.exec(`node ${cli} ${command}`);
+ const { commandErr } = shell.exec(
+ command.replace(/^svelte /, `node ${cli} `)
+ );
if (commandErr) {
done(commandErr);
@@ -74,7 +76,6 @@ describe('cli', () => {
});
done();
- // });
});
});
});
diff --git a/test/cli/samples/basic/command.sh b/test/cli/samples/basic/command.sh
index 7a5e0e4892..0ae80e4c95 100644
--- a/test/cli/samples/basic/command.sh
+++ b/test/cli/samples/basic/command.sh
@@ -1 +1 @@
-compile src/Main.html > actual/Main.js
+svelte compile src/Main.html > actual/Main.js
diff --git a/test/cli/samples/custom-element/command.sh b/test/cli/samples/custom-element/command.sh
index f638d82a80..b93c2cb16a 100644
--- a/test/cli/samples/custom-element/command.sh
+++ b/test/cli/samples/custom-element/command.sh
@@ -1 +1 @@
-compile src/Main.html --customElement > actual/Main.js
+svelte compile src/Main.html --customElement > actual/Main.js
diff --git a/test/cli/samples/dev/command.sh b/test/cli/samples/dev/command.sh
index aac44940ff..37d9b87fc0 100644
--- a/test/cli/samples/dev/command.sh
+++ b/test/cli/samples/dev/command.sh
@@ -1 +1 @@
-compile src/Main.html -d > actual/Main.js
+svelte compile src/Main.html -d > actual/Main.js
\ No newline at end of file
diff --git a/test/cli/samples/dir-sourcemap/command.sh b/test/cli/samples/dir-sourcemap/command.sh
index f914d1d591..37089f3f44 100644
--- a/test/cli/samples/dir-sourcemap/command.sh
+++ b/test/cli/samples/dir-sourcemap/command.sh
@@ -1 +1 @@
-compile src -m -o actual
+svelte compile src -m -o actual
\ No newline at end of file
diff --git a/test/cli/samples/dir-subdir/command.sh b/test/cli/samples/dir-subdir/command.sh
index c767d236bb..10067cb1f9 100644
--- a/test/cli/samples/dir-subdir/command.sh
+++ b/test/cli/samples/dir-subdir/command.sh
@@ -1 +1 @@
-compile src -o actual
+svelte compile src -o actual
\ No newline at end of file
diff --git a/test/cli/samples/dir/command.sh b/test/cli/samples/dir/command.sh
index c767d236bb..10067cb1f9 100644
--- a/test/cli/samples/dir/command.sh
+++ b/test/cli/samples/dir/command.sh
@@ -1 +1 @@
-compile src -o actual
+svelte compile src -o actual
\ No newline at end of file
diff --git a/test/cli/samples/globals/command.sh b/test/cli/samples/globals/command.sh
index a37e9f856a..9ed0c2a844 100644
--- a/test/cli/samples/globals/command.sh
+++ b/test/cli/samples/globals/command.sh
@@ -1 +1 @@
-compile src/Main.html -f iife -g the-answer:theAnswer > actual/Main.js
+svelte compile src/Main.html -f iife -g the-answer:theAnswer > actual/Main.js
\ No newline at end of file
diff --git a/test/cli/samples/sourcemap-inline/command.sh b/test/cli/samples/sourcemap-inline/command.sh
index df0c2f9afe..36b5b71b8d 100644
--- a/test/cli/samples/sourcemap-inline/command.sh
+++ b/test/cli/samples/sourcemap-inline/command.sh
@@ -1 +1 @@
-compile src/Main.html -m inline -o actual/Main.js
+svelte compile src/Main.html -m inline -o actual/Main.js
\ No newline at end of file
diff --git a/test/cli/samples/sourcemap/command.sh b/test/cli/samples/sourcemap/command.sh
index 9e957c28fc..4309d50b89 100644
--- a/test/cli/samples/sourcemap/command.sh
+++ b/test/cli/samples/sourcemap/command.sh
@@ -1 +1 @@
-compile src/Main.html -m -o actual/Main.js
+svelte compile src/Main.html -m -o actual/Main.js
\ No newline at end of file
diff --git a/test/cli/samples/ssr/command.sh b/test/cli/samples/ssr/command.sh
index ae8bc695f1..30e155691a 100644
--- a/test/cli/samples/ssr/command.sh
+++ b/test/cli/samples/ssr/command.sh
@@ -1 +1 @@
-compile --generate ssr src/Main.html > actual/Main.js
+svelte compile --generate ssr src/Main.html > actual/Main.js
diff --git a/test/cli/samples/store/command.sh b/test/cli/samples/store/command.sh
index ec919719d5..a734fdc772 100644
--- a/test/cli/samples/store/command.sh
+++ b/test/cli/samples/store/command.sh
@@ -1 +1 @@
-compile src/Main.html --store > actual/Main.js
+svelte compile src/Main.html --store > actual/Main.js