leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #586 from joshuamegnauth54/fix-tests

Browse source 
Fix tests, a compile error for the Wayland feature, and a deprecation notice
This commit is contained in:
Jeremy Soller 2024-10-10 06:17:23 -06:00 • committed by GitHub
commit a1c2828591
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/app.rs
View file

@ -2991,7 +2991,7 @@ impl Application for App {
};
let (entity, command) = self.open_tab_entity(
Location::Desktop(crate::desktop_dir(), display),
Location::Desktop(crate::desktop_dir(), display, self.config.desktop),
false,
None,
);
@ -4217,11 +4217,7 @@ pub(crate) mod test_utils {
// New tab with items
let location = Location::Path(path.to_owned());
let items = location.scan(
DesktopConfig::default(),
Mounters::new(MounterMap::new()),
IconSizes::default(),
);
let items = location.scan(IconSizes::default());
let mut tab = Tab::new(location, TabConfig::default());
tab.set_items(items);

2
src/tab.rs
View file

@ -306,7 +306,7 @@ impl Display for FormatTime {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let date_time = chrono::DateTime::<chrono::Local>::from(self.0);
let now = chrono::Local::now();
if date_time.date() == now.date() {
if date_time.date_naive() == now.date_naive() {
write!(
f,
"{}, {}",