diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index f409200a..7a548be5 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -89,6 +89,7 @@ jobs: DEBUG=* yo "$path_to_generator" examples cd examples/example-adapter yarn build + yarn tsc -b --noEmit tsconfig.test.json yarn test env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/scripts/generator-adapter/generators/app/templates/test/integration/adapter-ws.test.ts.ejs b/scripts/generator-adapter/generators/app/templates/test/integration/adapter-ws.test.ts.ejs index db4100e4..99c6396b 100644 --- a/scripts/generator-adapter/generators/app/templates/test/integration/adapter-ws.test.ts.ejs +++ b/scripts/generator-adapter/generators/app/templates/test/integration/adapter-ws.test.ts.ejs @@ -1,3 +1,4 @@ +import { SettingsDefinitionFromConfig } from '@chainlink/external-adapter-framework/config' import { WebSocketClassProvider } from '@chainlink/external-adapter-framework/transports' import { TestAdapter, @@ -5,13 +6,15 @@ import { mockWebSocketProvider, MockWebsocketServer, } from '@chainlink/external-adapter-framework/util/testing-utils' -import FakeTimers from '@sinonjs/fake-timers' +import FakeTimers, { InstalledClock } from '@sinonjs/fake-timers' +import { config } from '../../src/config' import { mockWebsocketServer } from './fixtures' +type SettingsDefinition = SettingsDefinitionFromConfig describe('websocket', () => { let mockWsServer: MockWebsocketServer | undefined - let testAdapter: TestAdapter + let testAdapter: TestAdapter const wsEndpoint = 'ws://localhost:9090' let oldEnv: NodeJS.ProcessEnv <% for(let i=0; i @@ -32,7 +35,7 @@ describe('websocket', () => { const adapter = (await import('./../../src')).adapter testAdapter = await TestAdapter.startWithMockedCache(adapter, { clock: FakeTimers.install(), - testAdapter: {} as TestAdapter, + testAdapter: {} as TestAdapter, }) // Send initial request to start background execute and wait for cache to be filled with results @@ -44,7 +47,7 @@ describe('websocket', () => { afterAll(async () => { setEnvVariables(oldEnv) mockWsServer?.close() - testAdapter.clock?.uninstall() + ;(testAdapter.clock as InstalledClock | undefined)?.uninstall() await testAdapter.api.close() }) <% for(var i=0; i diff --git a/scripts/generator-adapter/generators/app/templates/test/integration/adapter.test.ts.ejs b/scripts/generator-adapter/generators/app/templates/test/integration/adapter.test.ts.ejs index 55e294e3..f210c183 100644 --- a/scripts/generator-adapter/generators/app/templates/test/integration/adapter.test.ts.ejs +++ b/scripts/generator-adapter/generators/app/templates/test/integration/adapter.test.ts.ejs @@ -1,13 +1,17 @@ +import { SettingsDefinitionFromConfig } from '@chainlink/external-adapter-framework/config' import { TestAdapter, setEnvVariables, } from '@chainlink/external-adapter-framework/util/testing-utils' import * as nock from 'nock' +import { config } from '../../src/config' import { <% if (mockPostResponse) { %>mockPostResponseSuccess<% } else { %>mockResponseSuccess<% } %> } from './fixtures' +type SettingsDefinition = SettingsDefinitionFromConfig + describe('execute', () => { let spy: jest.SpyInstance - let testAdapter: TestAdapter + let testAdapter: TestAdapter let oldEnv: NodeJS.ProcessEnv beforeAll(async () => { @@ -20,7 +24,7 @@ describe('execute', () => { const adapter = (await import('./../../src')).adapter adapter.rateLimiting = undefined testAdapter = await TestAdapter.startWithMockedCache(adapter, { - testAdapter: {} as TestAdapter, + testAdapter: {} as TestAdapter, }) }) diff --git a/scripts/generator-adapter/generators/app/templates/test/integration/fixtures.ts.ejs b/scripts/generator-adapter/generators/app/templates/test/integration/fixtures.ts.ejs index 4daef21b..341ff933 100644 --- a/scripts/generator-adapter/generators/app/templates/test/integration/fixtures.ts.ejs +++ b/scripts/generator-adapter/generators/app/templates/test/integration/fixtures.ts.ejs @@ -47,7 +47,7 @@ export const mockPostResponseSuccess = (): nock.Scope => export const mockWebsocketServer = (URL: string): MockWebsocketServer => { const mockWsServer = new MockWebsocketServer(URL, { mock: false }) mockWsServer.on('connection', (socket) => { - socket.on('message', (message) => { + socket.on('message', (_message) => { return socket.send( JSON.stringify({ success: true, diff --git a/scripts/generator-adapter/generators/app/templates/test/unit/ws.test.ts.ejs b/scripts/generator-adapter/generators/app/templates/test/unit/ws.test.ts.ejs index 00f29cda..7f495081 100644 --- a/scripts/generator-adapter/generators/app/templates/test/unit/ws.test.ts.ejs +++ b/scripts/generator-adapter/generators/app/templates/test/unit/ws.test.ts.ejs @@ -9,7 +9,6 @@ import { makeStub, mockWebSocketProvider, MockWebsocketServer, - runAllUntil, runAllUntilSettled, } from '@chainlink/external-adapter-framework/util/testing-utils' import FakeTimers from '@sinonjs/fake-timers'