Skip to content

Commit

Permalink
chore: merge from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelcr committed Jul 3, 2023
2 parents 75e75c1 + 2b53ff4 commit a254152
Show file tree
Hide file tree
Showing 15 changed files with 222 additions and 400 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ jobs:
npm run testenv:logs -- --no-color &> docker-compose-logs.txt &
- name: Run tests
run: npm run test
run: npm run test -- --coverage

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3

- name: Print integration environment logs
run: cat docker-compose-logs.txt
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.dev.postgres.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.7'
services:
postgres:
image: "postgres:14"
image: "postgres:15"
ports:
- "5432:5432"
environment:
Expand Down
24 changes: 15 additions & 9 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,19 @@ module.exports = {
// collectCoverage: false,

// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: undefined,
collectCoverageFrom: [
"src/**/*.ts",
"migrations/*.ts",
],

// The directory where Jest should output its coverage files
// coverageDirectory: undefined,

// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
// "/node_modules/"
// ],
coveragePathIgnorePatterns: [
"/node_modules/",
"/src/@types/"
],

// Indicates which provider should be used to instrument code for coverage
coverageProvider: "v8",
Expand Down Expand Up @@ -59,7 +63,7 @@ module.exports = {
// forceCoverageMatch: [],

// A path to a module which exports an async function that is triggered once before all test suites
globalSetup: './setup.ts',
globalSetup: './tests/setup.ts',

// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: undefined,
Expand Down Expand Up @@ -121,7 +125,7 @@ module.exports = {
// restoreMocks: false,

// The root directory that Jest should scan for tests and modules within
rootDir: 'tests',
rootDir: '',

// A list of paths to directories that Jest should use to search for files in
// roots: [
Expand Down Expand Up @@ -159,9 +163,11 @@ module.exports = {
// ],

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "/node_modules/"
// ],
testPathIgnorePatterns: [
"/node_modules/",
"/client/",
"/dist/"
],

// The regexp pattern or array of patterns that Jest uses to detect test files
// testRegex: [],
Expand Down
146 changes: 117 additions & 29 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@
"@fastify/formbody": "^7.0.1",
"@fastify/multipart": "^7.1.0",
"@fastify/swagger": "^8.3.1",
"@fastify/type-provider-typebox": "^2.1.0",
"@sinclair/typebox": "^0.24.20",
"@fastify/type-provider-typebox": "^3.2.0",
"@hirosystems/chainhook-client": "^1.0.3",
"@sinclair/typebox": "^0.28.17",
"@types/node": "^18.13.0",
"bignumber.js": "^9.1.1",
"bitcoinjs-lib": "^6.1.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fastify from 'fastify';
import { PgStore } from '../../../pg/pg-store';
import { PgStore } from '../../pg/pg-store';

declare module 'fastify' {
export interface FastifyInstance<
Expand Down
17 changes: 0 additions & 17 deletions src/chainhook/helpers.ts

This file was deleted.

Loading

0 comments on commit a254152

Please sign in to comment.