message: feat(catalog/msw): fixed merge conflicts and fixed some comments
diff: import { rest } from 'msw';
  import { setupServer } from 'msw/node';
  import { CatalogClient } from './CatalogClient';
  +import { Entity } from '@backstage/catalog-model';
  const server = setupServer();
  describe('CatalogClient', () => {
  @@ -36,13 +37,52 @@ describe('CatalogClient', () => {
  basePath: mockBasePath,
  });
  });
  +
  + describe('getEntiies', () => {
  + const defaultResponse: Entity[] = [
  + {
  + apiVersion: '1',
  + kind: 'Component',
  + metadata: {
  + name: 'Test1',
  + namespace: 'test1',
  + },
  + },
  + {
  + apiVersion: '1',
  + kind: 'Component',
  + metadata: {
  + name: 'Test2',
  + namespace: 'test1',
  + },
  + },
  + ];
  +
  + beforeEach(() => {
  + server.use(
  + rest.get(`${mockApiOrigin}${mockBasePath}/entities`, (_, res, ctx) => {
  + return res(ctx.json(defaultResponse));
  + }),
  + );
  + });
  +
  + it('should entities from correct endpoint', async () => {
  + const entities = await client.getEntities();
  + expect(entities).toEqual(defaultResponse);
  + });
  +
  it('builds entity search filters properly', async () => {
  expect.assertions(2);
  server.use(
  - rest.get(`${mockApiOrigin}${mockBasePath}/entities`, (req, res, ctx) => {
  - expect(req.url.searchParams.toString()).toBe('a=1&b=2&b=3&%C3%B6=%3D');
  + rest.get(
  + `${mockApiOrigin}${mockBasePath}/entities`,
  + (req, res, ctx) => {
  + expect(req.url.searchParams.toString()).toBe(
  + 'a=1&b=2&b=3&%C3%B6=%3D',
  + );
  return res(ctx.json([]));
  - }),
  + },
  + ),
  );
  const entities = await client.getEntities({
  @@ -54,3 +94,4 @@ describe('CatalogClient', () => {
  expect(entities).toEqual([]);
  });
  });
  +});
  