fixed tests

fastn-stack · Nov 11, 2023 · c407ddc · c407ddc
1 parent 4bbafbf
commit c407ddc
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 12 deletions.
diff --git a/fastn-core/tests/02-hello/cmd.p1 b/fastn-core/tests/02-hello/cmd.p1
@@ -1,5 +1,5 @@
 -- fbt:
-cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --test --ignore-failed
+cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --edition 2022 --ignore-failed
 output: amitu/.build
 
 -- stdout:

diff --git a/fastn-core/tests/03-nested-document/cmd.p1 b/fastn-core/tests/03-nested-document/cmd.p1
@@ -1,5 +1,5 @@
 -- fbt:
-cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --test
+cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --edition 2022
 output: amitu/.build
 
 

diff --git a/fastn-core/tests/04-import-code-block/cmd.p1 b/fastn-core/tests/04-import-code-block/cmd.p1
@@ -1,5 +1,5 @@
 -- fbt:
-cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --test
+cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --edition 2022
 output: amitu/.build
 
 

diff --git a/fastn-core/tests/05-hello-font/cmd.p1 b/fastn-core/tests/05-hello-font/cmd.p1
@@ -1,5 +1,5 @@
 -- fbt:
-cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --test
+cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --edition 2022
 output: amitu/.build
 
 -- stdout:

diff --git a/fastn-core/tests/08-static-assets/cmd.p1 b/fastn-core/tests/08-static-assets/cmd.p1
@@ -1,5 +1,5 @@
 -- fbt:
-cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --test
+cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build
 output: amitu/.build
 
 -- stdout:

diff --git a/fastn-core/tests/09-markdown-pages/cmd.p1 b/fastn-core/tests/09-markdown-pages/cmd.p1
@@ -1,5 +1,5 @@
 -- fbt:
-cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --test
+cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build
 output: amitu/.build
 
 -- stdout:

diff --git a/fastn-core/tests/10-readme-index/cmd.p1 b/fastn-core/tests/10-readme-index/cmd.p1
@@ -1,5 +1,5 @@
 -- fbt:
-cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --test
+cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build
 output: amitu/.build
 skip: temporarily removed markdown support
 

diff --git a/fastn-core/tests/11-readme-with-index/cmd.p1 b/fastn-core/tests/11-readme-with-index/cmd.p1
@@ -1,5 +1,5 @@
 -- fbt:
-cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --test
+cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --edition 2022
 output: amitu/.build
 
 -- stdout:

diff --git a/fastn-core/tests/15-fpm-dependency-alias/cmd.p1 b/fastn-core/tests/15-fpm-dependency-alias/cmd.p1
@@ -1,5 +1,5 @@
 -- fbt:
-cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --test
+cmd: cd amitu && $FBT_CWD/../target/debug/fastn --test build --edition 2022
 output: amitu/.build
 
 -- stdout:

diff --git a/fastn-core/tests/16-include-processor/cmd.p1 b/fastn-core/tests/16-include-processor/cmd.p1
@@ -1,5 +1,5 @@
 -- fbt:
-cmd: $FBT_CWD/../target/debug/fastn --test build --test
+cmd: $FBT_CWD/../target/debug/fastn --test build --edition 2022
 output: .build
 
 -- stdout:

diff --git a/fastn/src/main.rs b/fastn/src/main.rs
@@ -173,7 +173,7 @@ async fn fastn_core_commands(matches: &clap::ArgMatches) -> fastn_core::Result<(
             build.value_of_("file"), // TODO: handle more than one files
             build.value_of_("base").unwrap_or("/"),
             build.get_flag("ignore-failed"),
-            build.get_flag("test"),
+            matches.get_flag("test"),
             build.get_flag("check-build"),
         )
         .await;
@@ -337,7 +337,6 @@ fn app(version: &'static str) -> clap::Command {
                 .arg(clap::arg!(-b --base [BASE] "The base path.").default_value("/"))
                 .arg(clap::arg!(--"ignore-failed" "Ignore failed files."))
                 .arg(clap::arg!(--"check-build" "Checks .build for index files validation."))
-                .arg(clap::arg!(--"test" "Use for test"))
                 .arg(clap::arg!(--"external-js" <URL> "Script added in ftd files")
                     .action(clap::ArgAction::Append))
                 .arg(clap::arg!(--"js" <URL> "Script text added in ftd files")