Skip to content

Commit

Permalink
Remove server routes
Browse files Browse the repository at this point in the history
  • Loading branch information
scottybollinger committed Jun 14, 2021
1 parent cc97d98 commit d61e4bd
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 162 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@

import { MockRouter, mockRequestHandler, mockDependencies } from '../../__mocks__';

import {
registerRoleMappingsRoute,
registerRoleMappingRoute,
registerNewRoleMappingRoute,
} from './role_mappings';
import { registerRoleMappingsRoute, registerRoleMappingRoute } from './role_mappings';

const roleMappingBaseSchema = {
rules: { username: 'user' },
Expand Down Expand Up @@ -80,29 +76,6 @@ describe('role mappings routes', () => {
});
});

describe('GET /api/app_search/role_mappings/{id}', () => {
let mockRouter: MockRouter;

beforeEach(() => {
jest.clearAllMocks();
mockRouter = new MockRouter({
method: 'get',
path: '/api/app_search/role_mappings/{id}',
});

registerRoleMappingRoute({
...mockDependencies,
router: mockRouter.router,
});
});

it('creates a request handler', () => {
expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
path: '/role_mappings/:id',
});
});
});

describe('PUT /api/app_search/role_mappings/{id}', () => {
let mockRouter: MockRouter;

Expand Down Expand Up @@ -160,27 +133,4 @@ describe('role mappings routes', () => {
});
});
});

describe('GET /api/app_search/role_mappings/new', () => {
let mockRouter: MockRouter;

beforeEach(() => {
jest.clearAllMocks();
mockRouter = new MockRouter({
method: 'get',
path: '/api/app_search/role_mappings/new',
});

registerNewRoleMappingRoute({
...mockDependencies,
router: mockRouter.router,
});
});

it('creates a request handler', () => {
expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
path: '/role_mappings/new',
});
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,6 @@ export function registerRoleMappingRoute({
router,
enterpriseSearchRequestHandler,
}: RouteDependencies) {
router.get(
{
path: '/api/app_search/role_mappings/{id}',
validate: {
params: schema.object({
id: schema.string(),
}),
},
},
enterpriseSearchRequestHandler.createRequest({
path: '/role_mappings/:id',
})
);

router.put(
{
path: '/api/app_search/role_mappings/{id}',
Expand Down Expand Up @@ -92,23 +78,7 @@ export function registerRoleMappingRoute({
);
}

export function registerNewRoleMappingRoute({
router,
enterpriseSearchRequestHandler,
}: RouteDependencies) {
router.get(
{
path: '/api/app_search/role_mappings/new',
validate: false,
},
enterpriseSearchRequestHandler.createRequest({
path: '/role_mappings/new',
})
);
}

export const registerRoleMappingsRoutes = (dependencies: RouteDependencies) => {
registerRoleMappingsRoute(dependencies);
registerRoleMappingRoute(dependencies);
registerNewRoleMappingRoute(dependencies);
};
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@

import { MockRouter, mockRequestHandler, mockDependencies } from '../../__mocks__';

import {
registerOrgRoleMappingsRoute,
registerOrgRoleMappingRoute,
registerOrgNewRoleMappingRoute,
} from './role_mappings';
import { registerOrgRoleMappingsRoute, registerOrgRoleMappingRoute } from './role_mappings';

describe('role mappings routes', () => {
describe('GET /api/workplace_search/org/role_mappings', () => {
Expand Down Expand Up @@ -60,29 +56,6 @@ describe('role mappings routes', () => {
});
});

describe('GET /api/workplace_search/org/role_mappings/{id}', () => {
let mockRouter: MockRouter;

beforeEach(() => {
jest.clearAllMocks();
mockRouter = new MockRouter({
method: 'get',
path: '/api/workplace_search/org/role_mappings/{id}',
});

registerOrgRoleMappingRoute({
...mockDependencies,
router: mockRouter.router,
});
});

it('creates a request handler', () => {
expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
path: '/ws/org/role_mappings/:id',
});
});
});

describe('PUT /api/workplace_search/org/role_mappings/{id}', () => {
let mockRouter: MockRouter;

Expand Down Expand Up @@ -128,27 +101,4 @@ describe('role mappings routes', () => {
});
});
});

describe('GET /api/workplace_search/org/role_mappings/new', () => {
let mockRouter: MockRouter;

beforeEach(() => {
jest.clearAllMocks();
mockRouter = new MockRouter({
method: 'get',
path: '/api/workplace_search/org/role_mappings/new',
});

registerOrgNewRoleMappingRoute({
...mockDependencies,
router: mockRouter.router,
});
});

it('creates a request handler', () => {
expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
path: '/ws/org/role_mappings/new',
});
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,6 @@ export function registerOrgRoleMappingRoute({
router,
enterpriseSearchRequestHandler,
}: RouteDependencies) {
router.get(
{
path: '/api/workplace_search/org/role_mappings/{id}',
validate: {
params: schema.object({
id: schema.string(),
}),
},
},
enterpriseSearchRequestHandler.createRequest({
path: '/ws/org/role_mappings/:id',
})
);

router.put(
{
path: '/api/workplace_search/org/role_mappings/{id}',
Expand Down Expand Up @@ -92,23 +78,7 @@ export function registerOrgRoleMappingRoute({
);
}

export function registerOrgNewRoleMappingRoute({
router,
enterpriseSearchRequestHandler,
}: RouteDependencies) {
router.get(
{
path: '/api/workplace_search/org/role_mappings/new',
validate: false,
},
enterpriseSearchRequestHandler.createRequest({
path: '/ws/org/role_mappings/new',
})
);
}

export const registerRoleMappingsRoutes = (dependencies: RouteDependencies) => {
registerOrgRoleMappingsRoute(dependencies);
registerOrgRoleMappingRoute(dependencies);
registerOrgNewRoleMappingRoute(dependencies);
};

0 comments on commit d61e4bd

Please sign in to comment.