fix(tests): Change tests to look for empty string instead of None

src/modules/aws.rs

@@ -126,7 +126,7 @@ mod tests {
     #[test]
     fn no_region_set() -> io::Result<()> {
         let actual = ModuleRenderer::new("aws").collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())
@@ -384,7 +384,7 @@ region = us-east-2
                 format = "on [$symbol$region]($style) "
             })
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())

src/modules/cmake.rs

@@ -67,7 +67,7 @@ mod tests {
     fn folder_without_cmake_lists() -> io::Result<()> {
         let dir = tempfile::tempdir()?;
         let actual = ModuleRenderer::new("cmake").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/cmd_duration.rs

@@ -159,7 +159,7 @@ mod tests {
             .cmd_duration(1000)
             .collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         Ok(())
     }
@@ -185,7 +185,7 @@ mod tests {
             .cmd_duration(3000)
             .collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         Ok(())
     }
@@ -215,7 +215,7 @@ mod tests {
             .cmd_duration(1000)
             .collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         Ok(())
     }

src/modules/conda.rs

@@ -63,7 +63,7 @@ mod tests {
     fn not_in_env() -> io::Result<()> {
         let actual = ModuleRenderer::new("conda").collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())
@@ -79,7 +79,7 @@ mod tests {
             })
             .collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())

src/modules/crystal.rs

@@ -77,7 +77,7 @@ mod tests {
     fn folder_without_crystal_files() -> io::Result<()> {
         let dir = tempfile::tempdir()?;
         let actual = ModuleRenderer::new("crystal").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
 
         dir.close()

src/modules/dart.rs

@@ -83,7 +83,7 @@ mod tests {
     fn folder_without_dart_file() -> io::Result<()> {
         let dir = tempfile::tempdir()?;
         let actual = ModuleRenderer::new("dart").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/dotnet.rs

@@ -366,7 +366,7 @@ mod tests {
     #[test]
     fn shows_nothing_in_directory_with_zero_relevant_files() -> io::Result<()> {
         let workspace = create_workspace(false)?;
-        expect_output(&workspace.path(), None)?;
+        expect_output(&workspace.path(), Some(String::from("")))?;
         workspace.close()
     }
 

src/modules/elixir.rs

@@ -96,7 +96,7 @@ Elixir 1.10 (compiled with Erlang/OTP 22)
     fn test_without_mix_file() -> io::Result<()> {
         let dir = tempfile::tempdir()?;
 
-        let expected = None;
+        let expected = Some(String::from(""));
         let output = ModuleRenderer::new("elixir").path(dir.path()).collect();
 
         assert_eq!(output, expected);

src/modules/elm.rs

@@ -69,7 +69,7 @@ mod tests {
     fn folder_without_elm() -> io::Result<()> {
         let dir = tempfile::tempdir()?;
         let actual = ModuleRenderer::new("elm").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/env_var.rs

@@ -65,7 +65,7 @@ mod test {
                 [env_var]
             })
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())
@@ -94,7 +94,7 @@ mod test {
                 variable = "TEST_VAR"
             })
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())

src/modules/erlang.rs

@@ -76,7 +76,7 @@ mod tests {
     fn test_without_config() -> io::Result<()> {
         let dir = tempfile::tempdir()?;
 
-        let expected = None;
+        let expected = Some(String::from(""));
         let output = ModuleRenderer::new("erlang").path(dir.path()).collect();
 
         assert_eq!(output, expected);

src/modules/gcloud.rs

@@ -311,7 +311,7 @@ project = abc
                 format = "on [$symbol$region]($style) "
             })
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         dir.close()

src/modules/git_branch.rs

@@ -87,7 +87,7 @@ mod tests {
         let actual = ModuleRenderer::new("git_branch")
             .path(repo_dir.path())
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         repo_dir.close()

src/modules/git_commit.rs

@@ -79,7 +79,7 @@ mod tests {
             .path(&repo_dir.path())
             .collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         repo_dir.close()
@@ -158,7 +158,7 @@ mod tests {
             .path(&repo_dir.path())
             .collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         repo_dir.close()

src/modules/git_state.rs

@@ -175,7 +175,7 @@ mod tests {
             .path(repo_dir.path())
             .collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         repo_dir.close()

src/modules/git_status.rs

@@ -408,7 +408,7 @@ mod tests {
         let actual = ModuleRenderer::new("git_status")
             .path(repo_dir.path())
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         repo_dir.close()
@@ -601,7 +601,7 @@ mod tests {
         let actual = ModuleRenderer::new("git_status")
             .path(&repo_dir.path())
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         repo_dir.close()

src/modules/golang.rs

@@ -97,7 +97,7 @@ mod tests {
 
         let actual = ModuleRenderer::new("golang").path(dir.path()).collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/helm.rs

@@ -88,7 +88,7 @@ mod tests {
 
         let actual = ModuleRenderer::new("helm").path(dir.path()).collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/hg_branch.rs

@@ -120,7 +120,7 @@ mod tests {
             .path(repo_dir.path())
             .collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         repo_dir.close()
     }
@@ -279,7 +279,7 @@ mod tests {
         for expect in expectations {
             match expect {
                 Expect::Empty => {
-                    assert_eq!(None, actual);
+                    assert_eq!(Some(String::from("")), actual);
                     return Ok(());
                 }
                 Expect::Symbol(symbol) => {

src/modules/hostname.rs

@@ -109,7 +109,7 @@ mod tests {
                 ssh_only = true
             })
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())

src/modules/java.rs

@@ -157,7 +157,7 @@ mod tests {
     fn folder_without_java_file() -> io::Result<()> {
         let dir = tempfile::tempdir()?;
         let actual = ModuleRenderer::new("java").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/jobs.rs

@@ -63,7 +63,7 @@ mod test {
     fn config_blank_job_0() -> io::Result<()> {
         let actual = ModuleRenderer::new("jobs").jobs(0).collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         Ok(())
     }

src/modules/julia.rs

@@ -83,7 +83,7 @@ mod tests {
 
         let actual = ModuleRenderer::new("julia").path(dir.path()).collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/nim.rs

@@ -101,7 +101,7 @@ mod tests {
         let dir = tempfile::tempdir()?;
         File::create(dir.path().join("nim.txt"))?.sync_all()?;
         let actual = ModuleRenderer::new("nim").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/nix_shell.rs

@@ -69,7 +69,7 @@ mod tests {
     #[test]
     fn no_env_variables() -> io::Result<()> {
         let actual = ModuleRenderer::new("nix_shell").collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())
@@ -80,7 +80,7 @@ mod tests {
         let actual = ModuleRenderer::new("nix_shell")
             .env("IN_NIX_SHELL", "something_wrong")
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())

src/modules/nodejs.rs

@@ -70,7 +70,7 @@ mod tests {
     fn folder_without_node_files() -> io::Result<()> {
         let dir = tempfile::tempdir()?;
         let actual = ModuleRenderer::new("nodejs").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }
@@ -94,7 +94,7 @@ mod tests {
         fs::create_dir_all(&esy_lock)?;
 
         let actual = ModuleRenderer::new("nodejs").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/ocaml.rs

@@ -78,7 +78,7 @@ mod tests {
     fn folder_without_ocaml_file() -> io::Result<()> {
         let dir = tempfile::tempdir()?;
         let actual = ModuleRenderer::new("ocaml").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/package.rs

@@ -759,7 +759,7 @@ end";
         if contains.is_some() {
             assert_eq!(actual, expected);
         } else {
-            assert_eq!(actual, None);
+            assert_eq!(actual, Some(String::from("")));
         }
 
         Ok(())

src/modules/perl.rs

@@ -75,7 +75,7 @@ mod tests {
 
         let actual = ModuleRenderer::new("perl").path(dir.path()).collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/php.rs

@@ -89,7 +89,7 @@ mod tests {
 
         let actual = ModuleRenderer::new("php").path(dir.path()).collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/purescript.rs

@@ -64,7 +64,7 @@ mod tests {
     fn folder_without_purescript_files() -> io::Result<()> {
         let dir = tempfile::tempdir()?;
         let actual = ModuleRenderer::new("purescript").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/python.rs

@@ -133,7 +133,7 @@ mod tests {
     fn folder_without_python_files() -> io::Result<()> {
         let dir = tempfile::tempdir()?;
         let actual = ModuleRenderer::new("python").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
 
         dir.close()
@@ -224,7 +224,7 @@ mod tests {
         let dir = tempfile::tempdir()?;
         File::create(dir.path().join("foo.py"))?.sync_all()?;
 
-        let expected = None;
+        let expected = Some(String::from(""));
         let config = toml::toml! {
             [python]
             scan_for_pyfiles = false

src/modules/ruby.rs

@@ -83,7 +83,7 @@ mod tests {
 
         let actual = ModuleRenderer::new("ruby").path(dir.path()).collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/shlvl.rs

@@ -67,7 +67,7 @@ mod tests {
             })
             .env(SHLVL_ENV_VAR, "2")
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())
@@ -96,7 +96,7 @@ mod tests {
                 disabled = false
             })
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())
@@ -111,7 +111,7 @@ mod tests {
             })
             .env(SHLVL_ENV_VAR, "1")
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())
@@ -143,7 +143,7 @@ mod tests {
             })
             .env(SHLVL_ENV_VAR, "1")
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())

src/modules/singularity.rs

@@ -51,7 +51,7 @@ mod tests {
     fn no_env_set() -> io::Result<()> {
         let actual = ModuleRenderer::new("singularity").collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         Ok(())
     }

src/modules/swift.rs

@@ -81,7 +81,7 @@ mod tests {
         let dir = tempfile::tempdir()?;
         File::create(dir.path().join("swift.txt"))?.sync_all()?;
         let actual = ModuleRenderer::new("swift").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }

src/modules/terraform.rs

@@ -194,7 +194,7 @@ is 0.12.14. You can update by downloading from www.terraform.io/downloads.html
         let dir = tempfile::tempdir()?;
 
         let actual = ModuleRenderer::new("terraform").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         dir.close()

src/modules/time.rs

@@ -485,7 +485,7 @@ mod tests {
     fn config_blank() -> io::Result<()> {
         let actual = ModuleRenderer::new("time").collect();
 
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         Ok(())
     }

src/modules/username.rs

@@ -75,7 +75,7 @@ mod tests {
     #[test]
     fn no_env_variables() -> io::Result<()> {
         let actual = ModuleRenderer::new("username").collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())
@@ -87,7 +87,7 @@ mod tests {
             .env("LOGNAME", "astronaut")
             .env("USER", "astronaut")
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())
@@ -99,7 +99,7 @@ mod tests {
         let actual = ModuleRenderer::new("username")
             .env("SSH_CONNECTION", "192.168.223.17 36673 192.168.223.229 22")
             .collect();
-        let expected = None;
+        let expected = Some(String::from(""));
 
         assert_eq!(expected, actual);
         Ok(())

src/modules/zig.rs

@@ -67,7 +67,7 @@ mod tests {
         let dir = tempfile::tempdir()?;
         File::create(dir.path().join("zig.txt"))?.sync_all()?;
         let actual = ModuleRenderer::new("zig").path(dir.path()).collect();
-        let expected = None;
+        let expected = Some(String::from(""));
         assert_eq!(expected, actual);
         dir.close()
     }