paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

just some more use of setupRequestMockHandlers

Browse Source 
Signed-off-by: Fredrik Adelöw <freben@gmail.com>
This commit is contained in:
Fredrik Adelöw
2022-08-24 11:26:12 +02:00
parent 0e9785b260
commit 9212439d15
12 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/big-dolls-reflect.md
+6
View File
@@ -0,0 +1,6 @@
---
'@backstage/plugin-auth-node': patch
'@backstage/plugin-permission-node': patch
---
Minor update to tests
plugins/auth-node/package.json
+1
View File
@@ -31,6 +31,7 @@
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/backend-test-utils": "^0.1.28-next.0",
"@backstage/cli": "^0.18.2-next.0",
"lodash": "^4.17.21",
"msw": "^0.45.0",
plugins/auth-node/src/IdentityClient.test.ts
+3 -3
View File
@@ -13,7 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { PluginEndpointDiscovery } from '@backstage/backend-common';
import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
import {
decodeProtectedHeader,
exportJWK,
@@ -100,9 +102,7 @@ describe('IdentityClient', () => {
let factory: FakeTokenFactory;
const keyDurationSeconds = 5;
beforeAll(() => server.listen({ onUnhandledRequest: 'error' }));
afterAll(() => server.close());
afterEach(() => server.resetHandlers());
setupRequestMockHandlers(server);
beforeEach(() => {
client = IdentityClient.create({ discovery, issuer: mockBaseUrl });
plugins/catalog-backend-module-bitbucket-server/src/lib/BitbucketServerClient.test.ts
+2 -3
View File
@@ -14,6 +14,7 @@
* limitations under the License.
*/
import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
import { BitbucketServerIntegrationConfig } from '@backstage/integration';
import { rest } from 'msw';
import { setupServer } from 'msw/node';
@@ -49,9 +50,7 @@ describe('BitbucketServerClient', () => {
config: config,
});
beforeAll(() => server.listen({ onUnhandledRequest: 'error' }));
afterAll(() => server.close());
afterEach(() => server.resetHandlers());
setupRequestMockHandlers(server);
it('listProjects', async () => {
server.use(
plugins/catalog-backend-module-bitbucket/src/BitbucketDiscoveryProcessor.test.ts
+2 -3
View File
@@ -15,6 +15,7 @@
*/
import { getVoidLogger } from '@backstage/backend-common';
import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
import { ConfigReader } from '@backstage/config';
import { Models } from '@backstage/plugin-bitbucket-cloud-common';
import {
@@ -175,9 +176,7 @@ function setupBitbucketCloudSearchStubs(
}
describe('BitbucketDiscoveryProcessor', () => {
beforeAll(() => server.listen());
afterEach(() => server.resetHandlers());
afterAll(() => server.close());
setupRequestMockHandlers(server);
afterEach(() => jest.resetAllMocks());
plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.test.ts
+4 -3
View File
@@ -13,9 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { getVoidLogger } from '@backstage/backend-common';
import { ConfigReader } from '@backstage/config';
import { TaskInvocationDefinition, TaskRunner } from '@backstage/backend-tasks';
import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
import { EntityProviderConnection } from '@backstage/plugin-catalog-backend';
import { rest } from 'msw';
import fs from 'fs-extra';
@@ -49,12 +51,11 @@ class PersistingTaskRunner implements TaskRunner {
const logger = getVoidLogger();
describe('GerritEntityProvider', () => {
beforeAll(() => server.listen());
setupRequestMockHandlers(server);
afterEach(() => {
jest.resetAllMocks();
server.resetHandlers();
});
afterAll(() => server.close());
const config = new ConfigReader({
catalog: {
plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.test.ts
+4 -3
View File
@@ -15,6 +15,7 @@
*/
import { getVoidLogger } from '@backstage/backend-common';
import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
import { ConfigReader } from '@backstage/config';
import { LocationSpec } from '@backstage/plugin-catalog-backend';
import { rest, RestRequest } from 'msw';
@@ -149,14 +150,14 @@ function getProcessor({
}
describe('GitlabDiscoveryProcessor', () => {
setupRequestMockHandlers(server);
beforeAll(() => {
server.listen();
jest.useFakeTimers('modern');
jest.setSystemTime(new Date(SERVER_TIME));
});
afterEach(() => server.resetHandlers());
afterAll(() => {
server.close();
jest.useRealTimers();
});
plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
+2 -3
View File
@@ -18,6 +18,7 @@ import {
PluginEndpointDiscovery,
TokenManager,
} from '@backstage/backend-common';
import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
import { Entity } from '@backstage/catalog-model';
import { DefaultCatalogCollator } from './DefaultCatalogCollator';
import { setupServer } from 'msw/node';
@@ -61,6 +62,7 @@ describe('DefaultCatalogCollator', () => {
let mockTokenManager: jest.Mocked<TokenManager>;
let collator: DefaultCatalogCollator;
setupRequestMockHandlers(server);
beforeAll(() => {
mockDiscoveryApi = {
getBaseUrl: jest.fn().mockResolvedValue('http://localhost:7007'),
@@ -74,7 +76,6 @@ describe('DefaultCatalogCollator', () => {
discovery: mockDiscoveryApi,
tokenManager: mockTokenManager,
});
server.listen();
});
beforeEach(() => {
server.use(
@@ -91,9 +92,7 @@ describe('DefaultCatalogCollator', () => {
}),
);
});
afterEach(() => server.resetHandlers());
afterAll(() => {
server.close();
jest.useRealTimers();
});
plugins/catalog-backend/src/search/DefaultCatalogCollatorFactory.test.ts
+2 -9
View File
@@ -17,6 +17,7 @@ import {
PluginEndpointDiscovery,
TokenManager,
} from '@backstage/backend-common';
import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
import { Entity } from '@backstage/catalog-model';
import { ConfigReader } from '@backstage/config';
import { TestPipeline } from '@backstage/plugin-search-backend-node';
@@ -72,9 +73,7 @@ describe('DefaultCatalogCollatorFactory', () => {
tokenManager: mockTokenManager,
};
beforeAll(() => {
server.listen();
});
setupRequestMockHandlers(server);
beforeEach(() => {
server.use(
@@ -96,12 +95,6 @@ describe('DefaultCatalogCollatorFactory', () => {
);
});
afterAll(() => {
server.close();
});
afterEach(() => server.resetHandlers());
it('has expected type', () => {
const factory = DefaultCatalogCollatorFactory.fromConfig(config, options);
expect(factory.type).toBe('software-catalog');
plugins/github-deployments/src/components/GithubDeploymentsCard.test.tsx
-1
View File
@@ -130,7 +130,6 @@ describe('github-deployments', () => {
setupRequestMockHandlers(worker);
beforeEach(() => {
worker.resetHandlers();
jest.resetAllMocks();
});
plugins/permission-node/package.json
+1
View File
@@ -44,6 +44,7 @@
"zod": "^3.11.6"
},
"devDependencies": {
"@backstage/backend-test-utils": "^0.1.28-next.0",
"@backstage/cli": "^0.18.2-next.0",
"@types/supertest": "^2.0.8",
"msw": "^0.45.0",
plugins/permission-node/src/ServerPermissionClient.test.ts
+2 -4
View File
@@ -22,6 +22,7 @@ import {
DefinitivePolicyDecision,
ConditionalPolicyDecision,
} from '@backstage/plugin-permission-common';
import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
import { ConfigReader } from '@backstage/config';
import {
getVoidLogger,
@@ -60,8 +61,7 @@ const config = new ConfigReader({
const logger = getVoidLogger();
describe('ServerPermissionClient', () => {
beforeAll(() => server.listen({ onUnhandledRequest: 'error' }));
afterAll(() => server.close());
setupRequestMockHandlers(server);
it('should error if permissions are enabled but a no-op token manager is configured', async () => {
expect(() =>
@@ -91,7 +91,6 @@ describe('ServerPermissionClient', () => {
server.use(rest.post(`${mockBaseUrl}/authorize`, mockAuthorizeHandler));
});
afterEach(() => server.resetHandlers());
it('should bypass the permission backend if permissions are disabled', async () => {
const client = ServerPermissionClient.fromConfig(new ConfigReader({}), {
@@ -154,7 +153,6 @@ describe('ServerPermissionClient', () => {
server.use(rest.post(`${mockBaseUrl}/authorize`, mockAuthorizeHandler));
});
afterEach(() => server.resetHandlers());
it('should bypass the permission backend if permissions are disabled', async () => {
const client = ServerPermissionClient.fromConfig(new ConfigReader({}), {