Added from_file to TestBuilder and minor fix in if parser

crates/deno_task_shell/src/grammar.pest

@@ -284,7 +284,7 @@ if_clause = !{
 }
 
 else_part = !{
-    Elif ~ conditional_expression ~ Then ~ complete_command ~ linebreak ~ else_part? |
+    Elif ~ conditional_expression ~ linebreak ~ Then ~ complete_command ~ linebreak ~ else_part? |
     Else ~ linebreak ~ complete_command
 }
 

crates/tests/src/lib.rs

@@ -905,7 +905,18 @@ async fn if_clause() {
         .assert_stdout("FOO is 1\n")
         .run()
         .await;
+
+    TestBuilder::new()
+        .from_file("../../scripts/if_else.sh")
+        .assert_exit_code(0)
+        .assert_stdout("FOO is 2\n")
+        .assert_stdout("FOO is 2\n")
+        .assert_stdout("FOO is 2\n")
+        .assert_stdout("FOO is 2\n")
+        .run()
+        .await;
 }
+
 #[cfg(test)]
 fn no_such_file_error_text() -> &'static str {
     if cfg!(windows) {

crates/tests/src/test_builder.rs

@@ -128,6 +128,10 @@ impl TestBuilder {
         self
     }
 
+    pub fn from_file(&mut self, path: &str) -> &mut Self {
+        self.command(fs::read_to_string(path).unwrap().as_str())
+    }
+
     pub fn stdin(&mut self, stdin: &str) -> &mut Self {
         self.stdin = stdin.as_bytes().to_vec();
         self

scripts/if_else.sh

@@ -1,8 +1,41 @@
 FOO=2
-if [[ $FOO -eq 1 ]]; then
+if [[ $FOO -eq 1 ]];
+then
     echo "FOO is 1";
+elif [[ $FOO -eq 2 ]];
+then
+    echo "FOO is 2";
+else
+    echo "FOO is not 1 or 2";
+fi
+
+FOO=2
+if [[ $FOO -eq 1 ]]; then
+    echo "FOO is 1"
 elif [[ $FOO -eq 2 ]]; then
+    echo "FOO is 2"
+else
+    echo "FOO is not 1 or 2"
+fi
+
+FOO=2
+if [[ $FOO -eq 1 ]];
+then
+    echo "FOO is 1";
+elif [[ $FOO -eq 2 ]];
+then
     echo "FOO is 2";
 else
     echo "FOO is not 1 or 2";
 fi
+
+FOO=2
+if [[ $FOO -eq 1 ]]
+then
+    echo "FOO is 1";
+elif [[ $FOO -eq 2 ]]
+then
+    echo "FOO is 2";
+else
+    echo "FOO is not 1 or 2";
+fi