Merge branch 'node-16' into 'next'
Upgrade to Node.js 16.x See merge request soapbox-pub/soapbox-fe!1205
This commit is contained in:
commit
b2a67820ab
4 changed files with 5 additions and 4 deletions
|
@ -1,4 +1,4 @@
|
||||||
image: node:14
|
image: node:16
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
NODE_ENV: test
|
NODE_ENV: test
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
nodejs 14.17.6
|
nodejs 16.14.2
|
||||||
|
|
|
@ -9,7 +9,7 @@ export const __stub = (func: Function) => mocks.push(func);
|
||||||
export const __clear = (): Function[] => mocks = [];
|
export const __clear = (): Function[] => mocks = [];
|
||||||
|
|
||||||
const setupMock = (axios: AxiosInstance) => {
|
const setupMock = (axios: AxiosInstance) => {
|
||||||
const mock = new MockAdapter(axios);
|
const mock = new MockAdapter(axios, { onNoMatch: 'throwException' });
|
||||||
mocks.map(func => func(mock));
|
mocks.map(func => func(mock));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,8 @@ import { Map as ImmutableMap } from 'immutable';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { Route, Switch } from 'react-router-dom';
|
import { Route, Switch } from 'react-router-dom';
|
||||||
|
|
||||||
import { __stub } from '../../../__mocks__/api';
|
import { __stub } from 'soapbox/api';
|
||||||
|
|
||||||
import { render, screen } from '../../../jest/test-helpers';
|
import { render, screen } from '../../../jest/test-helpers';
|
||||||
import Verification from '../index';
|
import Verification from '../index';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue