From 908db8423281a819bde2fa97de0a25f5dd168874 Mon Sep 17 00:00:00 2001
From: Mats Rauhala <mats.rauhala@iki.fi>
Date: Mon, 21 Jan 2019 21:31:13 +0200
Subject: [PATCH] Fix tests

---
 backend/backend.cabal | 19 ++++++++++---------
 backend/src/Spec.hs   | 27 ++++++++++++++-------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/backend/backend.cabal b/backend/backend.cabal
index 8eb7d79..9ca8765 100644
--- a/backend/backend.cabal
+++ b/backend/backend.cabal
@@ -94,25 +94,30 @@ test-suite spec
   main-is:             Spec.hs
   hs-source-dirs:      src
   build-depends:       base >=4.10
-                     , exceptions
-                     , monad-control
-                     , common
                      , aeson
                      , asn1-data
                      , asn1-types
                      , bytestring
                      , classy-prelude
+                     , common
                      , cryptonite
                      , dhall
                      , directory
+                     , exceptions
                      , foreign-store
                      , generic-lens
+                     , genvalidity-hspec
+                     , genvalidity-hspec-aeson
+                     , genvalidity-property
+                     , genvalidity-text
+                     , hspec
                      , http-api-data
                      , http-media
                      , jose
                      , lens
                      , lucid
                      , memory
+                     , monad-control
                      , monad-logger
                      , mtl
                      , pandoc
@@ -124,25 +129,21 @@ test-suite spec
                      , selda-postgresql
                      , servant
                      , servant-auth
+                     , servant-auth-docs
                      , servant-auth-server
                      , servant-docs
-                     , servant-auth-docs
                      , servant-lucid
                      , servant-multipart
                      , servant-server
                      , text
                      , transformers
+                     , validity
                      , wai
                      , warp
                      , x509
                      , x509-store
                      , xml-conduit
                      , xml-hamlet
-                     , validity
-                     , genvalidity-hspec
-                     , genvalidity-property
-                     , genvalidity-text
-                     , hspec
   default-extensions:  DeriveGeneric
                      , NoImplicitPrelude
                      , OverloadedStrings
diff --git a/backend/src/Spec.hs b/backend/src/Spec.hs
index 2508991..6c7607b 100644
--- a/backend/src/Spec.hs
+++ b/backend/src/Spec.hs
@@ -1,15 +1,16 @@
-{-# Language TypeApplications #-}
+{-# LANGUAGE TypeApplications #-}
 module Main where
 
 import           API.Books
-import qualified Data.Aeson as A
-import           Data.Char (isPrint)
+import qualified Data.Aeson            as A
+import           Data.Char             (isPrint)
 import           Data.GenValidity.Text ()
-import qualified Data.Text as T
+import qualified Data.Text             as T
 import           Database.Schema
 import           Prelude
 import           Test.Hspec
 import           Test.Validity
+import           Test.Validity.Aeson
 
 instance GenUnchecked PlainPassword
 instance GenValid PlainPassword
@@ -51,15 +52,15 @@ instance Validity PostBook
 spec :: Spec
 spec = do
   describe "JSON encoding" $ do
-    it "Works for PlainPassword" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @PlainPassword) A.decode
-    it "Works for Email" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @Email) A.decode
-    it "Username" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @Username) A.decode
-    it "Works for BookID" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @BookID) A.decode
-    it "Works for ChannelID" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @ChannelID) A.decode
-    it "Works for Role" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @Role) A.decode
-    it "Works for Visibility" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @Visibility) A.decode
-    it "Works for JsonBook" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @JsonBook) A.decode
-    it "Works for PostBook" $ inverseFunctionsIfSecondSucceedsOnValid (A.encode @PostBook) A.decode
+    jsonSpecOnValid @PlainPassword
+    jsonSpecOnValid @Email
+    jsonSpecOnValid @Username
+    jsonSpecOnValid @BookID
+    jsonSpecOnValid @ChannelID
+    jsonSpecOnValid @Role
+    jsonSpecOnValid @Visibility
+    jsonSpecOnValid @JsonBook
+    jsonSpecOnValid @PostBook
 
 main :: IO ()
 main = hspec spec