m

Author: mareklibra

workspaces/x2a/plugins/x2a-backend/src/router.test.ts

@@ -29,6 +29,7 @@ import { X2ADatabaseService } from './services/X2ADatabaseService';
 import { ProjectsPostRequest } from '@red-hat-developer-hub/backstage-plugin-x2a-common';
 import { migrate } from './services/dbMigrate';
 import { Knex } from 'knex';
+import { nonExistentId } from './utils';
 
 const databases = TestDatabases.create({
   ids: ['SQLITE_3', 'POSTGRES_18'],
@@ -240,7 +241,6 @@ describe('createRouter', () => {
       const { client } = await createDatabase(databaseId);
       const app = await createApp(client);
 
-      const nonExistentId = '00000000-0000-0000-0000-000000000000';
       const response = await request(app)
         .get(`/projects/${nonExistentId}`)
         .send();
@@ -294,7 +294,6 @@ describe('createRouter', () => {
       const { client } = await createDatabase(databaseId);
       const app = await createApp(client);
 
-      const nonExistentId = '00000000-0000-0000-0000-000000000000';
       const response = await request(app)
         .delete(`/projects/${nonExistentId}`)
         .send();
@@ -469,7 +468,6 @@ describe('createRouter', () => {
         AuthorizeResult.ALLOW,
       );
 
-      const nonExistentId = '00000000-0000-0000-0000-000000000000';
       const response = await request(app)
         .delete(`/projects/${nonExistentId}`)
         .send();

workspaces/x2a/plugins/x2a-backend/src/services/X2ADatabaseService.test.ts

@@ -23,7 +23,7 @@ import {
 import { Knex } from 'knex';
 import { X2ADatabaseService } from './X2ADatabaseService';
 import { migrate } from './dbMigrate';
-import { delay, toSorted } from '../utils';
+import { delay, nonExistentId, toSorted } from '../utils';
 
 const databases = TestDatabases.create({
   ids: ['SQLITE_3', 'POSTGRES_18'],
@@ -639,7 +639,7 @@ describe('X2ADatabaseService', () => {
         const credentials = mockCredentials.user();
         const project = await service.getProject(
           {
-            projectId: 'non-existent-id',
+            projectId: nonExistentId,
           },
           { credentials },
         );
@@ -860,7 +860,7 @@ describe('X2ADatabaseService', () => {
         const credentials = mockCredentials.user();
         const deletedCount = await service.deleteProject(
           {
-            projectId: 'non-existent-id',
+            projectId: nonExistentId,
           },
           { credentials },
         );
@@ -1307,7 +1307,7 @@ describe('X2ADatabaseService', () => {
         const { client } = await createDatabase(databaseId);
         const service = createService(client);
 
-        const module = await service.getModule({ id: 'non-existent-id' });
+        const module = await service.getModule({ id: nonExistentId });
 
         expect(module).toBeUndefined();
       },
@@ -1515,7 +1515,7 @@ describe('X2ADatabaseService', () => {
         const service = createService(client);
 
         const deletedCount = await service.deleteModule({
-          id: 'non-existent-id',
+          id: nonExistentId,
         });
 
         expect(deletedCount).toBe(0);
@@ -2002,7 +2002,7 @@ describe('X2ADatabaseService', () => {
         const { client } = await createDatabase(databaseId);
         const service = createService(client);
 
-        const job = await service.getJob({ id: 'non-existent-id' });
+        const job = await service.getJob({ id: nonExistentId });
 
         expect(job).toBeUndefined();
       },
@@ -2296,7 +2296,7 @@ describe('X2ADatabaseService', () => {
         const service = createService(client);
 
         const updated = await service.updateJob({
-          id: 'non-existent-id',
+          id: nonExistentId,
           status: 'running',
         });
 
@@ -2563,7 +2563,7 @@ describe('X2ADatabaseService', () => {
         const service = createService(client);
 
         const deletedCount = await service.deleteJob({
-          id: 'non-existent-id',
+          id: nonExistentId,
         });
 
         expect(deletedCount).toBe(0);

workspaces/x2a/plugins/x2a-backend/src/utils/index.ts

@@ -15,3 +15,4 @@
  */
 export * from './toSorted';
 export * from './delay';
+export * from './tests';

workspaces/x2a/plugins/x2a-backend/src/utils/tests.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export const nonExistentId = '00000000-0000-0000-0000-000000000000';