kdheepak/taskwarrior-tui
1
0
Fork 0
mirror of https://github.com/kdheepak/taskwarrior-tui.git synced 2025-08-26 03:07:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update tests

Browse source
This commit is contained in:
Dheepak Krishnamurthy 2021-02-23 14:50:10 -07:00
parent 110baba3ef
commit 9f90ef1acf
1 changed files with 97 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

129
src/app.rs
View file

@ -413,11 +413,11 @@ impl TTApp {
} }
AppMode::TaskHelpPopup => { AppMode::TaskHelpPopup => {
self.draw_command(f, rects[1], self.filter.as_str(), "Filter Tasks"); self.draw_command(f, rects[1], self.filter.as_str(), "Filter Tasks");
self.draw_help_popup(f); self.draw_help_popup(f, 80, 90);
} }
AppMode::TaskContextMenu => { AppMode::TaskContextMenu => {
self.draw_command(f, rects[1], self.filter.as_str(), "Filter Tasks"); self.draw_command(f, rects[1], self.filter.as_str(), "Filter Tasks");
self.draw_context_menu(f); self.draw_context_menu(f, 80, 50);
} }
_ => { _ => {
panic!("Reached unreachable code. Something went wrong"); panic!("Reached unreachable code. Something went wrong");
@ -425,19 +425,19 @@ impl TTApp {
} }
} }
fn draw_help_popup(&self, f: &mut Frame<impl Backend>) { fn draw_help_popup(&self, f: &mut Frame<impl Backend>, percent_x: u16, percent_y: u16) {
let area = centered_rect(80, 90, f.size()); let area = centered_rect(percent_x, percent_y, f.size());
f.render_widget(Clear, area); f.render_widget(Clear, area);
f.render_widget(&self.help_popup, area); f.render_widget(&self.help_popup, area);
} }
fn draw_context_menu(&mut self, f: &mut Frame<impl Backend>) { fn draw_context_menu(&mut self, f: &mut Frame<impl Backend>, percent_x: u16, percent_y: u16) {
let rects = Layout::default() let rects = Layout::default()
.direction(Direction::Vertical) .direction(Direction::Vertical)
.constraints([Constraint::Min(0)].as_ref()) .constraints([Constraint::Min(0)].as_ref())
.split(f.size()); .split(f.size());
let area = centered_rect(80, 50, f.size()); let area = centered_rect(percent_x, percent_y, f.size());
f.render_widget( f.render_widget(
Clear, Clear,
@ -628,7 +628,7 @@ impl TTApp {
} }
} }
for (i, header) in headers.iter().enumerate() { for (i, header) in headers.iter().enumerate() {
if header == "ID" { if header == "ID" || header == "Name" {
// always give ID a couple of extra for indicator // always give ID a couple of extra for indicator
widths[i] += self.config.uda_selection_indicator.as_str().graphemes(true).count(); widths[i] += self.config.uda_selection_indicator.as_str().graphemes(true).count();
} }
@ -898,6 +898,9 @@ impl TTApp {
for (i, line) in data.trim().split('\n').enumerate() { for (i, line) in data.trim().split('\n').enumerate() {
let line = line.trim(); let line = line.trim();
if line == "" || line == "Use 'task context none' to unset the current context." {
continue;
}
let mut s = line.split(' '); let mut s = line.split(' ');
let name = s.next().unwrap_or_default(); let name = s.next().unwrap_or_default();
let active = s.last().unwrap_or_default(); let active = s.last().unwrap_or_default();
@ -1761,7 +1764,6 @@ mod tests {
#[test] #[test]
fn test_taskwarrior_tui() { fn test_taskwarrior_tui() {
setup(); setup();
test_draw_help_popup();
test_draw_task_report(); test_draw_task_report();
test_draw_task_report_with_show_information(); test_draw_task_report_with_show_information();
test_task_tags(); test_task_tags();
@ -2472,12 +2474,11 @@ mod tests {
app.context_next(); app.context_next();
app.update().unwrap(); app.update().unwrap();
let backend = TestBackend::new(50, 15); let backend = TestBackend::new(40, 12);
let mut terminal = Terminal::new(backend).unwrap(); let mut terminal = Terminal::new(backend).unwrap();
terminal terminal
.draw(|f| { .draw(|f| {
app.draw(f); app.draw_help_popup(f, 100, 100);
app.draw(f);
}) })
.unwrap(); .unwrap();
@ -2486,30 +2487,21 @@ mod tests {
}; };
let mut expected = Buffer::with_lines(vec![ let mut expected = Buffer::with_lines(vec![
"╭Task╭Help──────────────────────────────────╮────╮", "╭Help──────────────────────────────────╮",
"│ │Keybindings: │ │", "│Keybindings: │",
"│ │ │ │", "│ │",
"│ │ Esc: │ │", "│ Esc: │",
"│ │ │ │", "│ │",
"╰────│ ]: Next view │────╯", "│ ]: Next view │",
"╭Task│ │────╮", "│ │",
"│ │ [: Previous view │ │", "│ [: Previous view │",
"│ │ │ │", "│ │",
"│ │ │ │", "│ │",
"│ │Keybindings for task report: │ │", "│Keybindings for task report: │",
"╰────│ │────╯", "╰──────────────────────────────────────╯",
"╭Filt╰──────────────────────────────────────╯────╮",
"│status:pending -private │",
"╰────────────────────────────────────────────────╯",
]); ]);
for i in 1..=4 { for i in 1..=4 {
// Task
expected
.get_mut(i, 0)
.set_style(Style::default().add_modifier(Modifier::DIM));
}
for i in 6..=9 {
// Calendar // Calendar
expected expected
.get_mut(i, 0) .get_mut(i, 0)
@ -2518,4 +2510,77 @@ mod tests {
test_case(&expected); test_case(&expected);
} }
fn test_draw_context_menu() {
let test_case = |expected: &Buffer| {
let mut app = TTApp::new().unwrap();
app.mode = AppMode::TaskContextMenu;
app.task_report_next();
app.context_next();
app.update().unwrap();
let backend = TestBackend::new(80, 10);
let mut terminal = Terminal::new(backend).unwrap();
terminal
.draw(|f| {
app.draw_context_menu(f, 100, 100);
app.draw_context_menu(f, 100, 100);
})
.unwrap();
assert_eq!(terminal.backend().size().unwrap(), expected.area);
terminal.backend().assert_buffer(expected);
};
let mut expected = Buffer::with_lines(vec![
"╭Context───────────────────────────────────────────────────────────────────────╮",
"│Name Description Active│",
"│ │",
"│• none yes │",
"│ finance +finance -private no │",
"│ personal +personal -private no │",
"│ work -personal -private no │",
"│ │",
"│ │",
"╰──────────────────────────────────────────────────────────────────────────────╯",
]);
for i in 1..=7 {
// Task
expected
.get_mut(i, 0)
.set_style(Style::default().add_modifier(Modifier::BOLD));
}
for i in 1..=10 {
// Task
expected
.get_mut(i, 1)
.set_style(Style::default().add_modifier(Modifier::UNDERLINED));
}
for i in 12..=71 {
// Task
expected
.get_mut(i, 1)
.set_style(Style::default().add_modifier(Modifier::UNDERLINED));
}
for i in 73..=78 {
// Task
expected
.get_mut(i, 1)
.set_style(Style::default().add_modifier(Modifier::UNDERLINED));
}
for i in 1..=78 {
// Task
expected
.get_mut(i, 3)
.set_style(Style::default().add_modifier(Modifier::BOLD));
}
test_case(&expected);
}
} }