From ff5d33a882c45a70b2e293099b91774f1b3e0aea Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Thu, 22 Aug 2019 13:28:05 -0400 Subject: [PATCH] mostly hlint cleanups --- test/SpecStripe.hs | 9 +++++---- test/Util/Gen.hs | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/test/SpecStripe.hs b/test/SpecStripe.hs index 6388d85..3796284 100644 --- a/test/SpecStripe.hs +++ b/test/SpecStripe.hs @@ -25,11 +25,12 @@ import Test.Hspec.Wai , liftIO ) import Test.Hspec.Wai.QuickCheck - ( -- Get Test.QuickCheck.Property.Testable instance for WaiExpectation - property + ( property ) import Test.QuickCheck - ( generate + ( Property + , generate + , forAll ) import Util.WAI ( postJSON @@ -61,7 +62,7 @@ spec_webhook = with (return app) $ spec_webhook' :: Spec spec_webhook' = with (return app) $ - describe "success behavior of POST /webhook" $ do + describe "success behavior of POST /webhook" $ it "responds to a JSON Event body with 200 (OK)" $ do event <- liftIO aChargeEvent postJSON "/webhook" event `shouldRespondWith` 200 diff --git a/test/Util/Gen.hs b/test/Util/Gen.hs index 1798441..64b838b 100644 --- a/test/Util/Gen.hs +++ b/test/Util/Gen.hs @@ -50,24 +50,24 @@ import Test.QuickCheck.Instances.Text instance Arbitrary Charge where arbitrary = Charge <$> arbitrary -- chargeId :: ChargeId - <*> (return "charge") -- chargeObject :: Text + <*> return "charge" -- chargeObject :: Text <*> arbitrary -- chargeCreated :: UTCTime <*> arbitrary -- chargeLiveMode :: Bool <*> arbitrary -- chargePaid :: Bool <*> arbitrary -- chargeAmount :: Amount - <*> (return UnknownCurrency) -- chargeCurrency :: Currency - <*> (return False) -- chargeRefunded :: Bool - <*> (return Nothing) -- chargeCreditCard :: Maybe Card + <*> return UnknownCurrency -- chargeCurrency :: Currency + <*> return False -- chargeRefunded :: Bool + <*> return Nothing -- chargeCreditCard :: Maybe Card <*> arbitrary -- chargeCaptured :: Bool - <*> (return mempty) -- chargeRefunds :: StripeList Refund - <*> (return Nothing) -- chargeBalanceTransaction :: Maybe (Expandable TransactionId) - <*> (return Nothing) -- chargeFailureMessage :: Maybe Text - <*> (return Nothing) -- chargeFailureCode :: Maybe Text - <*> (return 0) -- chargeAmountRefunded :: Int + <*> return mempty -- chargeRefunds :: StripeList Refund + <*> return Nothing -- chargeBalanceTransaction :: Maybe (Expandable TransactionId) + <*> return Nothing -- chargeFailureMessage :: Maybe Text + <*> return Nothing -- chargeFailureCode :: Maybe Text + <*> return 0 -- chargeAmountRefunded :: Int <*> arbitrary -- chargeCustomerId :: Maybe (Expandable CustomerId) - <*> (return Nothing) -- chargeInvoice :: Maybe (Expandable InvoiceId) + <*> return Nothing -- chargeInvoice :: Maybe (Expandable InvoiceId) <*> arbitrary -- chargeDescription :: Maybe Description - <*> (return Nothing) -- chargeDispute :: Maybe Dispute + <*> return Nothing -- chargeDispute :: Maybe Dispute <*> arbitrary -- chargeMetaData :: MetaData <*> arbitrary -- chargeStatementDescription :: Maybe StatementDescription <*> arbitrary -- chargeReceiptEmail :: Maybe Text @@ -123,10 +123,10 @@ chargeSucceededEvents = <$> arbitrary -- eventId <*> arbitrary -- eventCreated <*> arbitrary -- eventLiveMode - <*> (return ChargeSucceededEvent) -- eventType + <*> return ChargeSucceededEvent -- eventType <*> (ChargeEvent <$> arbitrary -- the charge ) -- eventData - <*> (return "event") -- eventObject + <*> return "event" -- eventObject <*> arbitrary -- eventPendingWebHooks <*> arbitrary -- eventRequest -- GitLab