Skip to content

Commit a398f5b

Browse files
committed
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.
1 parent d6dbbcf commit a398f5b

4 files changed

Lines changed: 18 additions & 12 deletions

File tree

src/color.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ pub type ColoredString<'a> = ANSIString<'a>;
5959
pub enum Theme {
6060
NoColor,
6161
Default,
62+
NoLscolors,
6263
}
6364

6465
pub struct Colors {
@@ -71,8 +72,13 @@ impl Colors {
7172
let colors = match theme {
7273
Theme::NoColor => None,
7374
Theme::Default => Some(Self::get_light_theme_colour_map()),
75+
Theme::NoLscolors => Some(Self::get_light_theme_colour_map()),
76+
};
77+
let lscolors = match theme {
78+
Theme::NoColor => None,
79+
Theme::Default => LsColors::from_env(),
80+
Theme::NoLscolors => None,
7481
};
75-
let lscolors = LsColors::from_env();
7682

7783
Self { colors, lscolors }
7884
}

src/display.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ mod tests {
439439
);
440440
let output = name
441441
.render(
442-
&Colors::new(color::Theme::Default),
442+
&Colors::new(color::Theme::NoLscolors),
443443
&Icons::new(icon::Theme::NoIcon),
444444
)
445445
.to_string();

src/meta/filetype.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ mod test {
8484
File::create(&file_path).expect("failed to create file");
8585
let meta = file_path.metadata().expect("failed to get metas");
8686

87-
let colors = Colors::new(Theme::Default);
87+
let colors = Colors::new(Theme::NoLscolors);
8888
let file_type = FileType::new(&meta, &Permissions::from(&meta));
8989

9090
assert_eq!(Colour::Fixed(184).paint("."), file_type.render(&colors));
@@ -95,7 +95,7 @@ mod test {
9595
let tmp_dir = TempDir::new("test_dir_type").expect("failed to create temp dir");
9696
let meta = tmp_dir.path().metadata().expect("failed to get metas");
9797

98-
let colors = Colors::new(Theme::Default);
98+
let colors = Colors::new(Theme::NoLscolors);
9999
let file_type = FileType::new(&meta, &Permissions::from(&meta));
100100

101101
assert_eq!(Colour::Fixed(33).paint("d"), file_type.render(&colors));
@@ -116,7 +116,7 @@ mod test {
116116
.symlink_metadata()
117117
.expect("failed to get metas");
118118

119-
let colors = Colors::new(Theme::Default);
119+
let colors = Colors::new(Theme::NoLscolors);
120120
let file_type = FileType::new(&meta, &Permissions::from(&meta));
121121

122122
assert_eq!(Colour::Fixed(44).paint("l"), file_type.render(&colors));
@@ -136,7 +136,7 @@ mod test {
136136
assert_eq!(true, success, "failed to exec mkfifo");
137137
let meta = pipe_path.metadata().expect("failed to get metas");
138138

139-
let colors = Colors::new(Theme::Default);
139+
let colors = Colors::new(Theme::NoLscolors);
140140
let file_type = FileType::new(&meta, &Permissions::from(&meta));
141141

142142
assert_eq!(Colour::Fixed(44).paint("|"), file_type.render(&colors));
@@ -161,7 +161,7 @@ mod test {
161161
assert_eq!(true, success, "failed to exec mknod");
162162
let meta = char_device_path.metadata().expect("failed to get metas");
163163

164-
let colors = Colors::new(Theme::Default);
164+
let colors = Colors::new(Theme::NoLscolors);
165165
let file_type = FileType::new(&meta, &Permissions::from(&meta));
166166

167167
assert_eq!(Colour::Fixed(44).paint("c"), file_type.render(&colors));
@@ -176,7 +176,7 @@ mod test {
176176
UnixListener::bind(&socket_path).expect("failed to create the socket");
177177
let meta = socket_path.metadata().expect("failed to get metas");
178178

179-
let colors = Colors::new(Theme::Default);
179+
let colors = Colors::new(Theme::NoLscolors);
180180
let file_type = FileType::new(&meta, &Permissions::from(&meta));
181181

182182
assert_eq!(Colour::Fixed(44).paint("s"), file_type.render(&colors));

src/meta/name.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ mod test {
115115
File::create(&file_path).expect("failed to create file");
116116
let meta = file_path.metadata().expect("failed to get metas");
117117

118-
let colors = Colors::new(color::Theme::Default);
118+
let colors = Colors::new(color::Theme::NoLscolors);
119119
let file_type = FileType::new(&meta, &Permissions::from(&meta));
120120
let name = Name::new(&file_path, file_type);
121121

@@ -135,7 +135,7 @@ mod test {
135135
fs::create_dir(&dir_path).expect("failed to create the dir");
136136
let meta = dir_path.metadata().expect("failed to get metas");
137137

138-
let colors = Colors::new(color::Theme::Default);
138+
let colors = Colors::new(color::Theme::NoLscolors);
139139
let file_type = FileType::new(&meta, &Permissions::from(&meta));
140140
let name = Name::new(&dir_path, file_type);
141141

@@ -161,7 +161,7 @@ mod test {
161161
.symlink_metadata()
162162
.expect("failed to get metas");
163163

164-
let colors = Colors::new(color::Theme::Default);
164+
let colors = Colors::new(color::Theme::NoLscolors);
165165
let file_type = FileType::new(&meta, &Permissions::from(&meta));
166166
let name = Name::new(&symlink_path, file_type);
167167

@@ -186,7 +186,7 @@ mod test {
186186
assert_eq!(true, success, "failed to exec mkfifo");
187187
let meta = pipe_path.metadata().expect("failed to get metas");
188188

189-
let colors = Colors::new(color::Theme::Default);
189+
let colors = Colors::new(color::Theme::NoLscolors);
190190
let file_type = FileType::new(&meta, &Permissions::from(&meta));
191191
let name = Name::new(&pipe_path, file_type);
192192

0 commit comments

Comments
 (0)