diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/HWWallets.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/HWWallets.hs index 229d7622316..bd6ff7100af 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/HWWallets.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/HWWallets.hs @@ -101,7 +101,7 @@ spec :: forall n t. , EncodeAddress n , PaymentAddress n IcarusKey ) => SpecWith (Context t) -spec = do +spec = describe "BYRON_HW_WALLETS" $ do it "HW_WALLETS_01 - Restoration from account public key preserves funds" $ \ctx -> do wSrc <- fixtureIcarusWallet ctx -- create wallet diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Migrations.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Migrations.hs index f4cd1c355d1..d1da388d487 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Migrations.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Migrations.hs @@ -100,7 +100,7 @@ spec :: forall n t. , PaymentAddress n IcarusKey , PaymentAddress n ByronKey ) => SpecWith (Context t) -spec = do +spec = describe "BYRON_MIGRATIONS" $ do it "BYRON_CALCULATE_01 - \ \for non-empty wallet calculated fee is > zero." $ \ctx -> forM_ [fixtureRandomWallet, fixtureIcarusWallet] diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Network.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Network.hs index 41cce289396..ac2a0cefeec 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Network.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Network.hs @@ -16,7 +16,7 @@ import Data.Quantity import Data.Ratio ( (%) ) import Test.Hspec - ( SpecWith, it, shouldBe ) + ( SpecWith, describe, it, shouldBe ) import Test.Integration.Framework.DSL ( Context (..) , Headers (..) @@ -31,7 +31,7 @@ import qualified Cardano.Wallet.Api.Link as Link import qualified Network.HTTP.Types.Status as HTTP spec :: forall t. SpecWith (Context t) -spec = do +spec = describe "BYRON_NETWORK" $ do it "NETWORK_PARAMS - Able to fetch network parameters" $ \ctx -> do r <- request @ApiNetworkParameters ctx Link.getNetworkParams Default Empty expectResponseCode @IO HTTP.status200 r diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Transactions.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Transactions.hs index 60272d15979..6f432282586 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Transactions.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Transactions.hs @@ -72,7 +72,7 @@ spec :: forall n t. ( DecodeAddress n , DecodeStakeAddress n ) => SpecWith (Context t) -spec = do +spec = describe "BYRON_MIGRATIONS" $ do it "BYRON_RESTORE_08 - Icarus wallet with high indexes" $ \ctx -> do -- NOTE diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Wallets.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Wallets.hs index 9a35302de9a..d2b40cab4d6 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Wallets.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/API/Byron/Wallets.hs @@ -107,7 +107,7 @@ spec :: forall n t. , EncodeAddress n , PaymentAddress n ByronKey ) => SpecWith (Context t) -spec = do +spec = describe "BYRON_WALLETS" $ do it "BYRON_GET_04, DELETE_01 - Deleted wallet is not available" $ \ctx -> do w <- emptyRandomWallet ctx _ <- request @ApiByronWallet ctx (Link.deleteWallet @'Byron w) Default Empty diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Network.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Network.hs index 58cb920c189..c61a825e47c 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/API/Network.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/API/Network.hs @@ -33,7 +33,7 @@ import Data.Maybe import Data.Time.Clock ( getCurrentTime ) import Test.Hspec - ( SpecWith, pendingWith, shouldBe ) + ( SpecWith, describe, pendingWith, shouldBe ) import Test.Hspec.Extra ( it ) import Test.Integration.Framework.DSL @@ -56,7 +56,7 @@ import qualified Cardano.Wallet.Api.Link as Link import qualified Network.HTTP.Types.Status as HTTP spec :: forall t. SpecWith (Context t) -spec = do +spec = describe "COMMON_NETWORK" $ do it "NETWORK - Can query network information" $ \ctx -> do eventually "wallet's syncProgress = Ready" $ do now <- liftIO getCurrentTime diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Addresses.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Addresses.hs index 0af185583c8..152aeba3b69 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Addresses.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Addresses.hs @@ -69,7 +69,7 @@ spec :: forall n t. , DecodeStakeAddress n , EncodeAddress n ) => SpecWith (Context t) -spec = do +spec = describe "SHELLEY_ADDRESSES" $ do it "BYRON_ADDRESS_LIST - Byron wallet on Shelley ep" $ \ctx -> do w <- emptyRandomWallet ctx let wid = w ^. walletId diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/HWWallets.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/HWWallets.hs index b812f7ba86f..c0ceff99701 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/HWWallets.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/HWWallets.hs @@ -84,7 +84,7 @@ spec :: forall n t. , DecodeStakeAddress n , EncodeAddress n ) => SpecWith (Context t) -spec = do +spec = describe "SHELLEY_HW_WALLETS" $ do it "HW_WALLETS_01 - Restoration from account public key preserves funds" $ \ctx -> do wSrc <- fixtureWallet ctx -- create wallet diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Migrations.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Migrations.hs index 4104d10d8ca..870080e48fc 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Migrations.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Migrations.hs @@ -97,7 +97,7 @@ spec :: forall n t. , PaymentAddress n IcarusKey , PaymentAddress n ByronKey ) => SpecWith (Context t) -spec = do +spec = describe "SHELLEY_MIGRATIONS" $ do it "SHELLEY_CALCULATE_01 - \ \for non-empty wallet calculated fee is > zero." $ \ctx -> do @@ -121,7 +121,7 @@ spec = do , expectErrorMessage (errMsg403NothingToMigrate $ w ^. walletId) ] - it "SHELLEY_CALCULATE_02 - \ + Hspec.it "SHELLEY_CALCULATE_02 - \ \Cannot calculate fee for wallet with dust, that cannot be migrated." $ \ctx -> do -- NOTE diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Network.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Network.hs index 09aae01b42f..c62a907dd89 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Network.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Network.hs @@ -16,7 +16,7 @@ import Data.Quantity import Data.Ratio ( (%) ) import Test.Hspec - ( SpecWith, shouldBe, shouldNotBe ) + ( SpecWith, describe, shouldBe, shouldNotBe ) import Test.Hspec.Extra ( it ) import Test.Integration.Framework.DSL @@ -35,7 +35,7 @@ import qualified Cardano.Wallet.Api.Link as Link import qualified Network.HTTP.Types.Status as HTTP spec :: forall t. SpecWith (Context t) -spec = do +spec = describe "SHELLEY_NETWORK" $ do it "NETWORK_PARAMS - Able to fetch network parameters" $ \ctx -> eventually "hardfork is detected in network parameters " $ do r <- request @ApiNetworkParameters ctx Link.getNetworkParams Default Empty diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/StakePools.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/StakePools.hs index f0859c30f6f..83dd5b5b13a 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/StakePools.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/StakePools.hs @@ -118,7 +118,7 @@ spec :: forall n t. , EncodeAddress n , PaymentAddress n ShelleyKey ) => SpecWith (Context t) -spec = do +spec = describe "SHELLEY_STAKE_POOLS" $ do let listPools ctx stake = request @[ApiStakePool] @IO ctx (Link.listStakePools stake) Default Empty diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Transactions.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Transactions.hs index 63c8c4977f7..028f8d2fbc0 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Transactions.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Transactions.hs @@ -157,7 +157,7 @@ spec :: forall n t. , EncodeAddress n , PaymentAddress n IcarusKey ) => SpecWith (Context t) -spec = do +spec = describe "SHELLEY_TRANSACTIONS" $ do it "TRANS_MIN_UTXO_01 - I cannot spend less than minUTxOValue" $ \ctx -> do wSrc <- fixtureWallet ctx wDest <- emptyWallet ctx diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Wallets.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Wallets.hs index 0f58ba2262f..4b87dde8f7b 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Wallets.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Wallets.hs @@ -139,7 +139,7 @@ spec :: forall n t. , PaymentAddress n IcarusKey , PaymentAddress n ByronKey ) => SpecWith (Context t) -spec = do +spec = describe "SHELLEY_WALLETS" $ do it "WALLETS_CREATE_01 - Create a wallet" $ \ctx -> do let payload = Json [json| { "name": "1st Wallet", diff --git a/lib/core-integration/src/Test/Integration/Scenario/CLI/Byron/Wallets.hs b/lib/core-integration/src/Test/Integration/Scenario/CLI/Byron/Wallets.hs index f90f67cc02d..9eb079b06cd 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/CLI/Byron/Wallets.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/CLI/Byron/Wallets.hs @@ -93,7 +93,7 @@ spec :: forall n t. ( DecodeAddress n , KnownCommand t ) => SpecWith (Context t) -spec = do +spec = describe "BYRON_CLI_WALLETS" $ do describe "CLI_BYRON_GET_04, CLI_BYRON_DELETE_01, BYRON_RESTORE_02, BYRON_RESTORE_03 -\ \ Deleted wallet is not available, but can be restored" $ do diff --git a/lib/core-integration/src/Test/Integration/Scenario/CLI/Miscellaneous.hs b/lib/core-integration/src/Test/Integration/Scenario/CLI/Miscellaneous.hs index e7604c11a5c..246ec4f8579 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/CLI/Miscellaneous.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/CLI/Miscellaneous.hs @@ -27,7 +27,7 @@ import Test.Integration.Framework.DSL import qualified Data.List as L spec :: forall t. KnownCommand t => SpecWith () -spec = do +spec = describe "COMMON_CLI_MISC" $ do it "CLI_VERSION - cardano-wallet shows version" $ do (Exit c, Stdout out) <- cardanoWalletCLI @t ["version"] let v = L.dropWhileEnd (== '\n') out diff --git a/lib/core-integration/src/Test/Integration/Scenario/CLI/Network.hs b/lib/core-integration/src/Test/Integration/Scenario/CLI/Network.hs index abe02d46294..cb5da70f302 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/CLI/Network.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/CLI/Network.hs @@ -35,7 +35,7 @@ import System.Command import System.Exit ( ExitCode (..) ) import Test.Hspec - ( SpecWith, pendingWith ) + ( SpecWith, describe, pendingWith ) import Test.Hspec.Expectations.Lifted ( shouldBe, shouldContain ) import Test.Hspec.Extra @@ -54,7 +54,7 @@ import Test.Utils.Paths ( inNixBuild ) spec :: forall t. KnownCommand t => SpecWith (Context t) -spec = do +spec = describe "COMMON_CLI_NETWORK" $ do it "CLI_NETWORK - cardano-wallet network information" $ \ctx -> do info <- getNetworkInfoViaCLI ctx let nextEpochNum = diff --git a/lib/core-integration/src/Test/Integration/Scenario/CLI/Port.hs b/lib/core-integration/src/Test/Integration/Scenario/CLI/Port.hs index f09a941fb24..f524f6c5e86 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/CLI/Port.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/CLI/Port.hs @@ -52,7 +52,7 @@ import qualified Data.Text.IO as TIO spec :: forall t s. (HasType (Port "wallet") s, KnownCommand t) => SpecWith s -spec = do +spec = describe "COMMON_CLI_PORTS" $ do let overPort :: forall sym. HasType (Port sym) s => (Int -> Int) -> s -> s overPort fn = over (typed @(Port sym)) (\(Port p) -> Port $ fn p) diff --git a/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/Addresses.hs b/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/Addresses.hs index 41b2aa51080..a8b90246301 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/Addresses.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/Addresses.hs @@ -66,7 +66,7 @@ spec :: forall n t. , DecodeAddress n , EncodeAddress n ) => SpecWith (Context t) -spec = do +spec = describe "SHELLEY_CLI_ADDRESSES" $ do it "ADDRESS_LIST_01 - Can list addresses - default poolGap" $ \ctx -> do let g = fromIntegral $ getAddressPoolGap defaultAddressPoolGap diff --git a/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/HWWallets.hs b/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/HWWallets.hs index aa1f1e90327..f516ed8ca7e 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/HWWallets.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/HWWallets.hs @@ -90,7 +90,7 @@ spec :: forall n t. , DecodeStakeAddress n , EncodeAddress n ) => SpecWith (Context t) -spec = describe "HW_WALLETS_CLI" $ do +spec = describe "SHELLEY_CLI_HW_WALLETS" $ do it "HW_WALLETS_01x - Restoration from account public key preserves funds" $ \ctx -> do wSrc <- fixtureWallet ctx diff --git a/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/Transactions.hs b/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/Transactions.hs index 117b0e89bc1..106b25e7dbe 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/Transactions.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/Transactions.hs @@ -104,7 +104,7 @@ spec :: forall n t. , DecodeStakeAddress n , EncodeAddress n ) => SpecWith (Context t) -spec = do +spec = describe "SHELLEY_CLI_TRANSACTIONS" $ do it "TRANS_CREATE_01 - Can create transaction via CLI" $ \ctx -> do wSrc <- fixtureWallet ctx wDest <- emptyWallet ctx diff --git a/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/Wallets.hs b/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/Wallets.hs index f69a4746ac2..b0e32b15200 100644 --- a/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/Wallets.hs +++ b/lib/core-integration/src/Test/Integration/Scenario/CLI/Shelley/Wallets.hs @@ -103,7 +103,7 @@ spec :: forall n t. , DecodeStakeAddress n , EncodeAddress n ) => SpecWith (Context t) -spec = do +spec = describe "SHELLEY_CLI_WALLETS" $ do it "BYRON_GET_03 - Shelley CLI does not show Byron wallet" $ \ctx -> do wid <- emptyRandomWallet' ctx (Exit c, Stdout out, Stderr err) <- getWalletViaCLI @t ctx wid