Skip to content

Commit

Permalink
Merge branch 'main' into feat/ci-fulltest-triggers
Browse files Browse the repository at this point in the history
  • Loading branch information
zharinov committed Jun 14, 2023
2 parents 25fdc52 + 96ca7a3 commit 5debfc8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
9 changes: 0 additions & 9 deletions test/setup.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable no-console */
import type { Jest } from '@jest/environment';
// Check for missing or pending http mocks
import './http-mock';
Expand Down Expand Up @@ -30,14 +29,6 @@ jest.mock('../lib/modules/platform/scm', () => ({

jest.mock('../lib/logger', () => jest.createMockFromModule('../lib/logger'));

const consoleError = console.error.bind(console);
console.error = (...args) => {
const [first] = args;
if (first !== 'reusing global emitter') {
consoleError(...args);
}
};

//------------------------------------------------
// Required global jest types
//------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9510,9 +9510,9 @@ signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==

signal-exit@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.1.tgz#96a61033896120ec9335d96851d902cc98f0ba2a"
integrity sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw==
version "4.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz#ff55bb1d9ff2114c13b400688fa544ac63c36967"
integrity sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==

signale@^1.2.1:
version "1.4.0"
Expand Down

0 comments on commit 5debfc8

Please sign in to comment.