Merge pull request #3 from Kobzol/ci-os

Run CI on Windows and macOS too

.github/workflows/check.yml

@@ -10,10 +10,20 @@ on:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        rust-version: [ stable, beta, nightly ]
+        include:
+          - rust-version: stable
+            os: ubuntu-latest
+          - rust-version: beta
+            os: ubuntu-latest
+          - rust-version: nightly
+            os: ubuntu-latest
+          - rust-version: stable
+            os: windows-latest
+          - rust-version: stable
+            os: macos-12
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4

Cargo.toml

@@ -39,6 +39,8 @@ toml_edit = "0.22.6"
 [dev-dependencies]
 tempfile = "3.10.1"
 insta = "1.35.1"
+
+[target.'cfg(target_os = "linux")'.dev-dependencies]
 rexpect = "0.5.0"
 
 [profile.dev]

tests/integration/main.rs

@@ -1,3 +1,4 @@
 mod apply;
+#[cfg(target_os = "linux")]
 mod dialog;
 mod utils;

tests/integration/utils/mod.rs

@@ -2,9 +2,11 @@ use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Output, Stdio};
 
-use rexpect::session::{spawn_command, PtySession};
 use tempfile::TempDir;
 
+#[cfg(target_os = "linux")]
+mod terminal;
+
 pub struct CargoProject {
     _name: String,
     pub dir: PathBuf,
@@ -99,9 +101,10 @@ pub struct Cmd {
 }
 
 impl Cmd {
-    pub fn start_terminal(self) -> anyhow::Result<Terminal> {
-        let session = spawn_command(self.create_std_cmd(false), Some(1000))?;
-        Ok(Terminal { session })
+    #[cfg(target_os = "linux")]
+    pub fn start_terminal(self) -> anyhow::Result<terminal::Terminal> {
+        let session = rexpect::session::spawn_command(self.create_std_cmd(false), Some(1000))?;
+        Ok(terminal::Terminal { session })
     }
 
     pub fn run(self) -> anyhow::Result<Output> {
@@ -151,59 +154,6 @@ impl Cmd {
     }
 }
 
-pub struct Terminal {
-    pub session: PtySession,
-}
-
-impl Terminal {
-    pub fn expect(&mut self, text: &str) -> anyhow::Result<()> {
-        self.session.exp_string(text)?;
-        Ok(())
-    }
-
-    pub fn line(&mut self, text: &str) -> anyhow::Result<()> {
-        self.session.send_line(text)?;
-        Ok(())
-    }
-
-    pub fn key_enter(&mut self) -> anyhow::Result<()> {
-        self.session.send_line("")?;
-        Ok(())
-    }
-
-    pub fn key_down(&mut self) -> anyhow::Result<()> {
-        // Arrow down, detected through `showkey -a`
-        self.session.send("\x1b\x5b\x42")?;
-        self.session.flush()?;
-        Ok(())
-    }
-
-    /// Find a line that begings by `> {prefix}` by going through a list using the down arrow key.
-    pub fn select_line(&mut self, prefix: &str) -> anyhow::Result<()> {
-        let max_tries = 20;
-        for _ in 0..max_tries {
-            if self
-                .session
-                .exp_regex(&format!("\n>\\s*{prefix}.*"))
-                .is_ok()
-            {
-                return self.key_enter();
-            }
-            self.key_down()?;
-        }
-        eprintln!("Could not find line beginning with {prefix} in {max_tries} tries.");
-        // Print terminal output
-        self.session
-            .exp_string(&format!("<missing {prefix} in list>"))?;
-        unreachable!();
-    }
-
-    pub fn wait(self) -> anyhow::Result<()> {
-        self.session.process.wait()?;
-        Ok(())
-    }
-}
-
 pub trait OutputExt {
     fn assert_ok(self) -> Self;
 

tests/integration/utils/terminal.rs

@@ -0,0 +1,54 @@
+use rexpect::session::PtySession;
+
+pub struct Terminal {
+    pub session: PtySession,
+}
+
+impl Terminal {
+    pub fn expect(&mut self, text: &str) -> anyhow::Result<()> {
+        self.session.exp_string(text)?;
+        Ok(())
+    }
+
+    pub fn line(&mut self, text: &str) -> anyhow::Result<()> {
+        self.session.send_line(text)?;
+        Ok(())
+    }
+
+    pub fn key_enter(&mut self) -> anyhow::Result<()> {
+        self.session.send_line("")?;
+        Ok(())
+    }
+
+    pub fn key_down(&mut self) -> anyhow::Result<()> {
+        // Arrow down, detected through `showkey -a`
+        self.session.send("\x1b\x5b\x42")?;
+        self.session.flush()?;
+        Ok(())
+    }
+
+    /// Find a line that begings by `> {prefix}` by going through a list using the down arrow key.
+    pub fn select_line(&mut self, prefix: &str) -> anyhow::Result<()> {
+        let max_tries = 20;
+        for _ in 0..max_tries {
+            if self
+                .session
+                .exp_regex(&format!("\n>\\s*{prefix}.*"))
+                .is_ok()
+            {
+                return self.key_enter();
+            }
+            self.key_down()?;
+        }
+        eprintln!("Could not find line beginning with {prefix} in {max_tries} tries.");
+        // Print terminal output
+        self.session
+            .exp_string(&format!("<missing {prefix} in list>"))?;
+        unreachable!();
+    }
+
+    pub fn wait(self) -> anyhow::Result<()> {
+        self.session.process.wait()?;
+        Ok(())
+    }
+}