Fixed Tests

Author: ShahanaFarooqui

apps/frontend/src/components/cln/CLNOffersList/CLNOffersList.test.tsx

@@ -1,5 +1,5 @@
 import { screen, within } from '@testing-library/react';
-import { mockAppStore, mockBKPRStoreData, mockCLNStoreData, mockListOffers, mockRootStoreData } from '../../../utilities/test-utilities/mockData';
+import { mockAppStore, mockBKPRStoreData, mockCLNStoreData, mockRootStoreData } from '../../../utilities/test-utilities/mockData';
 import { renderWithProviders } from '../../../utilities/test-utilities/mockStore';
 import CLNOffersList from './CLNOffersList';
 
@@ -10,8 +10,10 @@ describe('CLNOffersList component ', () => {
       cln: {
         ...mockCLNStoreData,
         listOffers: {
-          ...mockListOffers,
-          isLoading: true
+          isLoading: true,
+          page: 1,
+          hasMore: true,
+          offers: []
         }
       },
       bkpr: mockBKPRStoreData

apps/frontend/src/components/cln/CLNTransactionsList/CLNTransactionsList.test.tsx

@@ -75,7 +75,7 @@ describe('CLNTransactionsList component ', () => {
       bkpr: mockBKPRStoreData
     };
     await renderWithProviders(<CLNTransactionsList />, { preloadedState: customMockStore, initialRoute: ['/cln'] });
-    expect(screen.getByText('No transaction found. Open channel to start!')).toBeInTheDocument();
+    expect(screen.getByText('No channel found. Open channel to start!')).toBeInTheDocument();
   });
 
   it('if there are are active channels, show the text saying to use a channel', async () => {

apps/frontend/src/utilities/bookkeeper-sql.ts

@@ -29,16 +29,4 @@ export const SatsFlowSQL = (startTimestamp: number, endTimestamp: number): strin
   endTimestamp +
   ';';
 
-export const VolumeSQL =
-  'SELECT in_channel, ' +
-  '(SELECT peer_id FROM peerchannels WHERE peerchannels.short_channel_id=in_channel) AS in_channel_peerid, ' +
-  '(SELECT nodes.alias FROM nodes WHERE nodes.nodeid=(SELECT peer_id FROM peerchannels WHERE peerchannels.short_channel_id=in_channel)) AS in_channel_peer_alias, ' +
-  'SUM(in_msat), ' +
-  'out_channel, ' +
-  '(SELECT peer_id FROM peerchannels WHERE peerchannels.short_channel_id=out_channel) AS out_channel_peerid, ' +
-  '(SELECT nodes.alias FROM nodes WHERE nodes.nodeid=(SELECT peer_id FROM peerchannels WHERE peerchannels.short_channel_id=out_channel)) AS out_channel_peer_alias, ' +
-  'SUM(out_msat), ' +
-  'SUM(fee_msat) ' +
-  'FROM forwards ' +
-  "WHERE forwards.status='settled' " +
-  'GROUP BY in_channel, out_channel;';
+export const VolumeSQL = "SELECT f.in_channel, pc_in.peer_id AS in_channel_peerid, n_in.alias AS in_channel_peer_alias, SUM(f.in_msat) AS total_in_msat, f.out_channel, pc_out.peer_id AS out_channel_peerid, n_out.alias AS out_channel_peer_alias, SUM(f.out_msat) AS total_out_msat, SUM(f.fee_msat) AS total_fee_msat FROM forwards f LEFT JOIN peerchannels pc_in ON pc_in.short_channel_id = f.in_channel LEFT JOIN nodes n_in ON n_in.nodeid = pc_in.peer_id LEFT JOIN peerchannels pc_out ON pc_out.short_channel_id = f.out_channel LEFT JOIN nodes n_out ON n_out.nodeid = pc_out.peer_id WHERE f.status = 'settled' GROUP BY f.in_channel, pc_in.peer_id, n_in.alias, f.out_channel, pc_out.peer_id, n_out.alias;";

apps/frontend/src/utilities/test-utilities/mockData.tsx

@@ -636,6 +636,11 @@ export const mockActiveChannels = [mockActiveChannel1, mockActiveChannel2, mockA
 export const mockPendingChannels = [];
 export const mockInactiveChannels = [];
 
+export const mockListChannelsAPIRes = {
+  channels: [...mockActiveChannels, ...mockPendingChannels, ...mockInactiveChannels],
+  isLoading: false
+};
+
 export const mockListChannels = {
   activeChannels: mockActiveChannels,
   pendingChannels: mockPendingChannels,

apps/frontend/src/utilities/test-utilities/mockService.ts

@@ -1,6 +1,6 @@
 import SHA256 from 'crypto-js/sha256';
 import { BookkeeperService, CLNService, RootService } from '../../services/http.service';
-import { mockAccountEventsData, mockAuthStatus, mockDecodedInvoice, mockFetchInvoice, mockInvoiceRune, mockListChannels, mockListFunds, mockNewAddr, mockNodeInfo, mockSatsFlowData, mockSendPayment, mockSQLResponse, mockVolumeData } from '../../utilities/test-utilities/mockData';
+import { mockAccountEventsData, mockAuthStatus, mockDecodedInvoice, mockFetchInvoice, mockInvoiceRune, mockListChannelsAPIRes, mockListFunds, mockNewAddr, mockNodeInfo, mockSatsFlowData, mockSendPayment, mockSQLResponse, mockVolumeData } from '../../utilities/test-utilities/mockData';
 
 export const spyOnUserLogin = () => (
   jest.spyOn(RootService, 'userLogin').mockImplementation(async (password) => {
@@ -19,7 +19,7 @@ export const spyOnGetInfo = () => (
 );
 
 export const spyOnListChannels = () => (
-  jest.spyOn(RootService, 'listChannels').mockImplementation(async () => mockListChannels)
+  jest.spyOn(RootService, 'listChannels').mockImplementation(async () => mockListChannelsAPIRes)
 );
 
 export const spyOnListFunds = () => (