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

Merge pull request #24801 from adamdmharvey/adamdmharvey-tidy-up

Browse Source 
chore: Tidy up tests and logging typos
This commit is contained in:
Patrik Oldsberg
2024-05-16 11:18:11 +02:00
committed by GitHub
parent 389ae5ae14 cfa0afb307
commit 6ae2fab273
5 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend-common/src/database/connectors/mysql.ts
+1 -1
View File
@@ -304,7 +304,7 @@ export class MysqlConnector implements Connector {
const pluginDivisionMode = this.getPluginDivisionModeConfig();
if (pluginDivisionMode !== 'database') {
throw new Error(
`The MySQL driver does not suppoert plugin division mode '${pluginDivisionMode}'`,
`The MySQL driver does not support plugin division mode '${pluginDivisionMode}'`,
);
}
packages/backend-common/src/reading/FetchUrlReader.test.ts
+1 -1
View File
@@ -77,7 +77,7 @@ describe('FetchUrlReader', () => {
worker.use(
rest.get('https://backstage.io/error', (_req, res, ctx) => {
return res(ctx.status(500), ctx.body('An internal error occured'));
return res(ctx.status(500), ctx.body('An internal error occurred'));
}),
);
});
packages/backend-dynamic-feature-service/src/manager/plugin-manager.test.ts
+12 -12
View File
@@ -59,7 +59,7 @@ describe('backend-dynamic-feature-service', () => {
name: string;
packageManifest: ScannedPluginManifest;
indexFile?: {
retativePath: string[];
relativePath: string[];
content: string;
};
expectedLogs?(location: URL): {
@@ -83,7 +83,7 @@ describe('backend-dynamic-feature-service', () => {
main: 'dist/index.cjs.js',
},
indexFile: {
retativePath: ['dist', 'index.cjs.js'],
relativePath: ['dist', 'index.cjs.js'],
content:
'exports.dynamicPluginInstaller={ kind: "new", install: () => [] }',
},
@@ -127,7 +127,7 @@ describe('backend-dynamic-feature-service', () => {
main: 'dist/index.cjs.js',
},
indexFile: {
retativePath: ['dist', 'index.cjs.js'],
relativePath: ['dist', 'index.cjs.js'],
content: `const alpha = { $$type: '@backstage/BackendFeature' }; exports["default"] = alpha;`,
},
expectedLogs(location) {
@@ -170,7 +170,7 @@ describe('backend-dynamic-feature-service', () => {
main: 'dist/index.cjs.js',
},
indexFile: {
retativePath: ['dist', 'index.cjs.js'],
relativePath: ['dist', 'index.cjs.js'],
content: `const alpha = () => { return { $$type: '@backstage/BackendFeature' } };
alpha.$$type = '@backstage/BackendFeatureFactory';
exports["default"] = alpha;`,
@@ -215,7 +215,7 @@ describe('backend-dynamic-feature-service', () => {
main: 'dist/index.cjs.js',
},
indexFile: {
retativePath: ['dist', 'index.cjs.js'],
relativePath: ['dist', 'index.cjs.js'],
content:
'exports.dynamicPluginInstaller={ kind: "new", install: () => [] }',
},
@@ -262,7 +262,7 @@ describe('backend-dynamic-feature-service', () => {
return {
errors: [
{
message: `an error occured while loading dynamic backend plugin 'backend-dynamic-plugin-test' from '${location}'`,
message: `an error occurred while loading dynamic backend plugin 'backend-dynamic-plugin-test' from '${location}'`,
meta: {
name: 'Error',
message: expect.stringContaining(
@@ -305,7 +305,7 @@ describe('backend-dynamic-feature-service', () => {
main: 'dist/index.cjs.js',
},
indexFile: {
retativePath: ['dist', 'index.cjs.js'],
relativePath: ['dist', 'index.cjs.js'],
content: '',
},
expectedLogs(location) {
@@ -332,7 +332,7 @@ describe('backend-dynamic-feature-service', () => {
main: 'dist/index.cjs.js',
},
indexFile: {
retativePath: ['dist', 'index.cjs.js'],
relativePath: ['dist', 'index.cjs.js'],
content:
'exports.dynamicPluginInstaller={ something: "else", unexpectedMethod() {} }',
},
@@ -360,14 +360,14 @@ describe('backend-dynamic-feature-service', () => {
main: 'dist/index.cjs.js',
},
indexFile: {
retativePath: ['dist', 'index.cjs.js'],
relativePath: ['dist', 'index.cjs.js'],
content: 'strange text with syntax error',
},
expectedLogs(location) {
return {
errors: [
{
message: `an error occured while loading dynamic backend plugin 'backend-dynamic-plugin-test' from '${location}'`,
message: `an error occurred while loading dynamic backend plugin 'backend-dynamic-plugin-test' from '${location}'`,
meta: {
message: expect.stringContaining('Unexpected identifier'),
name: 'SyntaxError',
@@ -391,7 +391,7 @@ describe('backend-dynamic-feature-service', () => {
main: 'dist/index.cjs.js',
},
indexFile: {
retativePath: ['dist', 'index.cjs.js'],
relativePath: ['dist', 'index.cjs.js'],
content:
'exports.dynamicPluginInstaller={ kind: "legacy", scaffolder: (env)=>[] }',
},
@@ -458,7 +458,7 @@ describe('backend-dynamic-feature-service', () => {
mockedFiles[
path.join(
url.fileURLToPath(plugin.location),
...tc.indexFile.retativePath,
...tc.indexFile.relativePath,
)
] = tc.indexFile.content;
}
packages/backend-dynamic-feature-service/src/manager/plugin-manager.ts
+1 -1
View File
@@ -188,7 +188,7 @@ export class DynamicPluginManager implements DynamicPluginProvider {
};
} catch (error) {
this.logger.error(
`an error occured while loading dynamic backend plugin '${plugin.manifest.name}' from '${plugin.location}'`,
`an error occurred while loading dynamic backend plugin '${plugin.manifest.name}' from '${plugin.location}'`,
error,
);
return undefined;
packages/catalog-model/src/entity/policies/FieldFormatEntityPolicy.test.ts
-5
View File
@@ -65,11 +65,6 @@ describe('FieldFormatEntityPolicy', () => {
await expect(policy.enforce(data)).rejects.toThrow(/kind/);
});
it('handles missing metadata gracefully', async () => {
delete data.medatata;
await expect(policy.enforce(data)).resolves.toBe(data);
});
it('handles missing spec gracefully', async () => {
delete data.spec;
await expect(policy.enforce(data)).resolves.toBe(data);