diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp index 6d237a761..df84f2784 100644 --- a/src/commands/Command.cpp +++ b/src/commands/Command.cpp @@ -176,7 +176,7 @@ void Command::factory (std::map & all) c = new CmdCustom ( *report, - "task " + *report + " [tags] [attrs] desc...", + "task " + *report + " []", context.config.get ("report." + *report + ".description")); all[c->keyword ()] = c; diff --git a/test/duration.t.cpp b/test/duration.t.cpp index 120f063fb..5e11b35cf 100644 --- a/test/duration.t.cpp +++ b/test/duration.t.cpp @@ -676,10 +676,10 @@ int main (int argc, char** argv) t.is (convertDuration ("10 mths"), 300, "valid duration 10 mths"); t.is (convertDuration ("10 mth"), 300, "valid duration 10 mth"); t.is (convertDuration ("10mo"), 300, "valid duration 10mo"); - t.is (convertDuration ("0m"), "valid duration 0m"); - t.is (convertDuration ("1m"), "valid duration 1m"); - t.is (convertDuration ("10m"), "valid duration 10m"); - t.is (convertDuration ("-1m"), "valid duration -1m"); + t.is (convertDuration ("0m"), 0, "valid duration 0m"); + t.is (convertDuration ("1m"), 30, "valid duration 1m"); + t.is (convertDuration ("10m"), 300, "valid duration 10m"); + t.is (convertDuration ("-1m"), 30, "valid duration -1m"); t.is (convertDuration ("0 wks"), 0, "valid duration 0 wks"); t.is (convertDuration ("0 wk"), 0, "valid duration 0 wk"); diff --git a/test/label.t b/test/label.t index c9b2b9938..f28a70209 100755 --- a/test/label.t +++ b/test/label.t @@ -43,9 +43,9 @@ if (open my $fh, '>', 'custom.rc') ok (-r 'custom.rc', 'Created custom.rc'); } -# Generate the usage screen, and locate the custom report on it. -my $output = qx{../src/task rc:custom.rc usage}; -like ($output, qr/task foo \[tags\] \[attrs\] desc\.\.\.\s+DESC\n/m, 'report.foo'); +# Generate the help screen, and locate the custom report on it. +my $output = qx{../src/task rc:custom.rc help}; +like ($output, qr/task foo \[\]\s+DESC\n/m, 'report.foo'); qx{../src/task rc:custom.rc add project:A one}; qx{../src/task rc:custom.rc add two}; diff --git a/test/view.t.cpp b/test/view.t.cpp index 604a4f05a..d7be50d26 100644 --- a/test/view.t.cpp +++ b/test/view.t.cpp @@ -24,6 +24,7 @@ // USA // //////////////////////////////////////////////////////////////////////////////// + #include #include #include