Update tests to work with LSCOLORS update

Added another enum value to Theme `NoLscolors`. As of right now it only helps with tests, but maybe useful for something in future. Colouring based on LSCOLORS should be tested in the package so we should be good.
lsd-rs · Feb 8, 2019 · 28d50d3 · 28d50d3
1 parent d6dbbcf
commit 28d50d3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/src/color.rs b/src/color.rs
@@ -55,10 +55,13 @@ impl Elem {
 
 pub type ColoredString<'a> = ANSIString<'a>;
 
+
+#[allow(dead_code)]
 #[derive(Debug, Copy, Clone)]
 pub enum Theme {
     NoColor,
     Default,
+    NoLscolors,
 }
 
 pub struct Colors {
@@ -71,8 +74,13 @@ impl Colors {
         let colors = match theme {
             Theme::NoColor => None,
             Theme::Default => Some(Self::get_light_theme_colour_map()),
+            Theme::NoLscolors => Some(Self::get_light_theme_colour_map()),
+        };
+        let lscolors = match theme {
+            Theme::NoColor => None,
+            Theme::Default => LsColors::from_env(),
+            Theme::NoLscolors => None,
         };
-        let lscolors = LsColors::from_env();
 
         Self { colors, lscolors }
     }

diff --git a/src/display.rs b/src/display.rs
@@ -439,7 +439,7 @@ mod tests {
             );
             let output = name
                 .render(
-                    &Colors::new(color::Theme::Default),
+                    &Colors::new(color::Theme::NoLscolors),
                     &Icons::new(icon::Theme::NoIcon),
                 )
                 .to_string();

diff --git a/src/meta/filetype.rs b/src/meta/filetype.rs
@@ -84,7 +84,7 @@ mod test {
         File::create(&file_path).expect("failed to create file");
         let meta = file_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(Theme::Default);
+        let colors = Colors::new(Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
 
         assert_eq!(Colour::Fixed(184).paint("."), file_type.render(&colors));
@@ -95,7 +95,7 @@ mod test {
         let tmp_dir = TempDir::new("test_dir_type").expect("failed to create temp dir");
         let meta = tmp_dir.path().metadata().expect("failed to get metas");
 
-        let colors = Colors::new(Theme::Default);
+        let colors = Colors::new(Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
 
         assert_eq!(Colour::Fixed(33).paint("d"), file_type.render(&colors));
@@ -116,7 +116,7 @@ mod test {
             .symlink_metadata()
             .expect("failed to get metas");
 
-        let colors = Colors::new(Theme::Default);
+        let colors = Colors::new(Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
 
         assert_eq!(Colour::Fixed(44).paint("l"), file_type.render(&colors));
@@ -136,7 +136,7 @@ mod test {
         assert_eq!(true, success, "failed to exec mkfifo");
         let meta = pipe_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(Theme::Default);
+        let colors = Colors::new(Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
 
         assert_eq!(Colour::Fixed(44).paint("|"), file_type.render(&colors));
@@ -161,7 +161,7 @@ mod test {
         assert_eq!(true, success, "failed to exec mknod");
         let meta = char_device_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(Theme::Default);
+        let colors = Colors::new(Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
 
         assert_eq!(Colour::Fixed(44).paint("c"), file_type.render(&colors));
@@ -176,7 +176,7 @@ mod test {
         UnixListener::bind(&socket_path).expect("failed to create the socket");
         let meta = socket_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(Theme::Default);
+        let colors = Colors::new(Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
 
         assert_eq!(Colour::Fixed(44).paint("s"), file_type.render(&colors));

diff --git a/src/meta/name.rs b/src/meta/name.rs
@@ -115,7 +115,7 @@ mod test {
         File::create(&file_path).expect("failed to create file");
         let meta = file_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(color::Theme::Default);
+        let colors = Colors::new(color::Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
         let name = Name::new(&file_path, file_type);
 
@@ -135,7 +135,7 @@ mod test {
         fs::create_dir(&dir_path).expect("failed to create the dir");
         let meta = dir_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(color::Theme::Default);
+        let colors = Colors::new(color::Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
         let name = Name::new(&dir_path, file_type);
 
@@ -161,7 +161,7 @@ mod test {
             .symlink_metadata()
             .expect("failed to get metas");
 
-        let colors = Colors::new(color::Theme::Default);
+        let colors = Colors::new(color::Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
         let name = Name::new(&symlink_path, file_type);
 
@@ -186,7 +186,7 @@ mod test {
         assert_eq!(true, success, "failed to exec mkfifo");
         let meta = pipe_path.metadata().expect("failed to get metas");
 
-        let colors = Colors::new(color::Theme::Default);
+        let colors = Colors::new(color::Theme::NoLscolors);
         let file_type = FileType::new(&meta, &Permissions::from(&meta));
         let name = Name::new(&pipe_path, file_type);