summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md4
-rw-r--r--Hledger/Web/Test.hs16
-rw-r--r--hledger-web.14
-rw-r--r--hledger-web.cabal12
-rw-r--r--hledger-web.info2
-rw-r--r--hledger-web.txt4
6 files changed, 22 insertions, 20 deletions
diff --git a/CHANGES.md b/CHANGES.md
index a37ab6a..6662cd9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,10 @@ __ _____| |__
User-visible changes in hledger-web.
See also the hledger changelog.
+# 1.22.2 2021-08-07
+
+- Use hledger 1.22.2.
+
# 1.22.1 2021-08-02
Improvements
diff --git a/Hledger/Web/Test.hs b/Hledger/Web/Test.hs
index 6a5e3c5..a6b6738 100644
--- a/Hledger/Web/Test.hs
+++ b/Hledger/Web/Test.hs
@@ -4,6 +4,7 @@ module Hledger.Web.Test (
hledgerWebTest
) where
+import Control.Monad.Except (runExceptT)
import qualified Data.Text as T
import Test.Hspec (hspec)
import Yesod.Default.Config
@@ -79,20 +80,18 @@ hledgerWebTest = do
-- yit "can add transactions" $ do
- -- test with forecasted transactions
- d <- getCurrentDay
let
- ropts = defreportopts{forecast_=Just nulldatespan}
- rspec = case reportOptsToSpec d ropts of
- Left e -> error $ "failed to set up report options for tests, shouldn't happen: " ++ show e
- Right rs -> rs
- copts = defcliopts{reportspec_=rspec, file_=[""]} -- non-empty, see file_ note above
+ -- Have forecasting on for testing
+ iopts = definputopts{forecast_=Just nulldatespan}
+ copts = defcliopts{inputopts_=iopts, file_=[""]} -- non-empty, see file_ note above
wopts = defwebopts{cliopts_=copts}
- j <- fmap (journalTransform copts) $ readJournal' (T.pack $ unlines -- PARTIAL: readJournal' should not fail
+ pj <- readJournal' (T.pack $ unlines -- PARTIAL: readJournal' should not fail
["~ monthly"
," assets 10"
," income"
])
+ -- Have to give a non-null filename "fake" so forecast transactions get index 0
+ j <- fmap (either error id) . runExceptT $ journalFinalise iopts "fake" "" pj -- PARTIAL: journalFinalise should not fail
runHspecTestsWith conf wopts j $ do
ydescribe "hledger-web --forecast" $ do
@@ -101,4 +100,3 @@ hledgerWebTest = do
statusIs 200
bodyContains "id=\"transaction-0-1\"" -- 0 indicates a fileless (forecasted) txn
bodyContains "id=\"transaction-0-2\"" -- etc.
-
diff --git a/hledger-web.1 b/hledger-web.1
index be25228..d499074 100644
--- a/hledger-web.1
+++ b/hledger-web.1
@@ -1,12 +1,12 @@
-.TH "HLEDGER-WEB" "1" "August 2021" "hledger-web-1.22.1 " "hledger User Manuals"
+.TH "HLEDGER-WEB" "1" "August 2021" "hledger-web-1.22.2 " "hledger User Manuals"
.SH NAME
.PP
hledger-web is a web interface (WUI) for the hledger accounting tool.
-This manual is for hledger-web 1.22.1.
+This manual is for hledger-web 1.22.2.
.SH SYNOPSIS
.PP
\f[C]hledger-web [OPTIONS]\f[R]
diff --git a/hledger-web.cabal b/hledger-web.cabal
index bf54045..7cfd697 100644
--- a/hledger-web.cabal
+++ b/hledger-web.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack
name: hledger-web
-version: 1.22.1
+version: 1.22.2
synopsis: Web-based user interface for the hledger accounting system
description: A simple web-based user interface for the hledger accounting system,
providing a more modern UI than the command-line or terminal interfaces.
@@ -151,7 +151,7 @@ library
hs-source-dirs:
./
ghc-options: -Wall -fwarn-tabs -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints
- cpp-options: -DVERSION="1.22.1"
+ cpp-options: -DVERSION="1.22.2"
build-depends:
Decimal >=0.5.1
, aeson >=1
@@ -170,8 +170,8 @@ library
, extra >=1.6.3
, filepath
, hjsmin
- , hledger >=1.22.1 && <1.23
- , hledger-lib >=1.22.1 && <1.23
+ , hledger >=1.22.2 && <1.23
+ , hledger-lib >=1.22.2 && <1.23
, hspec
, http-client
, http-conduit
@@ -211,7 +211,7 @@ executable hledger-web
hs-source-dirs:
app
ghc-options: -Wall -fwarn-tabs -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints
- cpp-options: -DVERSION="1.22.1"
+ cpp-options: -DVERSION="1.22.2"
build-depends:
base
, hledger-web
@@ -231,7 +231,7 @@ test-suite test
hs-source-dirs:
test
ghc-options: -Wall -fwarn-tabs -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints
- cpp-options: -DVERSION="1.22.1"
+ cpp-options: -DVERSION="1.22.2"
build-depends:
base
, hledger
diff --git a/hledger-web.info b/hledger-web.info
index 0708de1..12e5d2a 100644
--- a/hledger-web.info
+++ b/hledger-web.info
@@ -12,7 +12,7 @@ hledger-web(1)
**************
hledger-web is a web interface (WUI) for the hledger accounting tool.
-This manual is for hledger-web 1.22.1.
+This manual is for hledger-web 1.22.2.
'hledger-web [OPTIONS]'
'hledger web -- [OPTIONS]'
diff --git a/hledger-web.txt b/hledger-web.txt
index c38bff4..f6e59ae 100644
--- a/hledger-web.txt
+++ b/hledger-web.txt
@@ -5,7 +5,7 @@ HLEDGER-WEB(1) hledger User Manuals HLEDGER-WEB(1)
NAME
hledger-web is a web interface (WUI) for the hledger accounting tool.
- This manual is for hledger-web 1.22.1.
+ This manual is for hledger-web 1.22.2.
SYNOPSIS
hledger-web [OPTIONS]
@@ -556,4 +556,4 @@ SEE ALSO
-hledger-web-1.22.1 August 2021 HLEDGER-WEB(1)
+hledger-web-1.22.2 August 2021 HLEDGER-WEB(1)