test(cardano-services): rebuild fixtues and adapt the tests

input-output-hk · May 30, 2024 · cd351b0 · cd351b0
1 parent c6d0d7b
commit cd351b0
Show file tree

Hide file tree

Showing 7 changed files with 8,200 additions and 14,658 deletions.
diff --git a/packages/cardano-services/test/StakePool/StakePoolHttpService.test.ts b/packages/cardano-services/test/StakePool/StakePoolHttpService.test.ts
@@ -962,9 +962,10 @@ describe('StakePoolHttpService', () => {
               expect(response.pageResults).toEqual(responseCached.pageResults);
               expect(response.pageResults[0].status).toEqual(Cardano.StakePoolStatus.Activating);
             });
-            it('pledgeMet false, status activating, and condition', async () => {
+
+            it('pledgeMet false, status active, and condition', async () => {
               const activating = await fixtureBuilder.getPools(1, {
-                with: [PoolWith.ActivatingState, PoolWith.PledgeNotMet]
+                with: [PoolWith.ActiveState, PoolWith.PledgeNotMet]
               });
               const filter: QueryStakePoolsArgs = {
                 filters: {
@@ -975,13 +976,14 @@ describe('StakePoolHttpService', () => {
                 pagination
               };
 
-              const options = addPledgeMetFilter(addStatusFilter(filter, Cardano.StakePoolStatus.Activating), false);
+              const options = addPledgeMetFilter(addStatusFilter(filter, Cardano.StakePoolStatus.Active), false);
               const response = await provider.queryStakePools(options);
               const responseCached = await provider.queryStakePools(options);
               expect(response.pageResults.length).toBeGreaterThan(0);
               expect(response.pageResults).toEqual(responseCached.pageResults);
-              expect(response.pageResults[0].status).toEqual(Cardano.StakePoolStatus.Activating);
+              expect(response.pageResults[0].status).toEqual(Cardano.StakePoolStatus.Active);
             });
+
             it('pledgeMet true, status retired, or condition', async () => {
               const options = addPledgeMetFilter(
                 addStatusFilter(setFilterCondition(filterArgs, 'or'), Cardano.StakePoolStatus.Retired),

diff --git a/...cardano-services/test/StakePool/TypeormStakePoolProvider/TypeormStakePoolProvider.test.ts b/...cardano-services/test/StakePool/TypeormStakePoolProvider/TypeormStakePoolProvider.test.ts
@@ -81,6 +81,7 @@ describe('TypeormStakePoolProvider', () => {
   let filterArgs: QueryStakePoolsArgs;
   let poolsInfo: PoolInfo[];
   let poolsInfoWithMeta: PoolInfo[];
+  let poolsInfoWithUniqueMeta: PoolInfo[];
   let poolsInfoWithMetaFiltered: PoolInfo[];
   let poolsInfoWithMetrics: PoolInfo[];
   let poolsInfoWithMetricsFiltered: PoolInfo[];
@@ -108,15 +109,18 @@ describe('TypeormStakePoolProvider', () => {
     poolsInfo = await fixtureBuilder.getPools(1000, ['active', 'activating', 'retired', 'retiring']);
     poolsInfoWithMeta = poolsInfo.filter((pool) => isNotNil(pool.metadataUrl));
     poolsInfoWithMetrics = poolsInfo.filter((pool) => isNotNil(pool.saturation));
+    poolsInfoWithUniqueMeta = poolsInfoWithMeta
+      .filter(({ name, ticker }) => name !== 'Same Name' && ticker !== 'SP6a7')
+      .sort((a, b) => (a.name < b.name ? -1 : 1));
 
     filterArgs = {
       filters: {
         identifier: {
           _condition: 'or',
           values: [
-            { ticker: poolsInfoWithMeta[0].ticker },
-            { name: poolsInfoWithMeta[1].name },
-            { id: poolsInfoWithMeta[2].id }
+            { ticker: poolsInfoWithUniqueMeta[0].ticker },
+            { name: poolsInfoWithUniqueMeta[1].name },
+            { id: poolsInfoWithUniqueMeta[2].id }
           ]
         }
       },
@@ -625,7 +629,7 @@ describe('TypeormStakePoolProvider', () => {
           describe('by default, result is sorted by relevance', () => {
             it('with stringent search', async () => {
               const response = await provider.queryStakePools({ filters: { text: 'sp11' }, pagination });
-              expect(response.pageResults.map(({ metadata }) => metadata?.ticker)).toEqual(['SP11', 'SP1', 'SP10']);
+              expect(response.pageResults.map(({ metadata }) => metadata?.ticker)).toEqual(['SP11', 'SP10', 'SP1']);
             });
 
             it('with mild search', async () => {
@@ -739,7 +743,7 @@ describe('TypeormStakePoolProvider', () => {
               const response = await provider.queryStakePools(
                 setSortCondition(setFilterCondition(filterArgs, 'or'), 'asc', 'ticker')
               );
-              const expected = [...poolsInfoWithMeta].sort((a, b) => (a.ticker < b.ticker ? -1 : 1));
+              const expected = [...poolsInfoWithMetricsFiltered].sort((a, b) => (a.ticker < b.ticker ? -1 : 1));
               expect(response.pageResults[0].metadata?.ticker).toEqual(expected[0].ticker);
               expect(response.pageResults[1].metadata?.ticker).toEqual(expected[1].ticker);
             });

diff --git a/packages/cardano-services/test/jest-setup/rebuild-test-db.sh b/packages/cardano-services/test/jest-setup/rebuild-test-db.sh
@@ -19,7 +19,6 @@ yarn test:build:verify
 
 yarn workspace @cardano-sdk/e2e local-network:down
 yarn workspace @cardano-sdk/e2e local-network:up -d --build
-yarn workspace @cardano-sdk/e2e wait-for-network
 
 yarn workspace @cardano-sdk/e2e test:wallet
 yarn workspace @cardano-sdk/e2e test:long-running simple-delegation-rewards.test.ts