Merge branch 'master' of github.com:spotify/backstage into migrate-to-msw

* 'master' of github.com:spotify/backstage: (139 commits)
  Cleanup
  Update PinButton.test.tsx
  feat: update github insights plugin version (#2973)
  Ignore IntelliJ *.iml files (#2971)
  chore(deps): bump rollup-plugin-dts from 1.4.11 to 1.4.13
  fix the plugin card on plugins page
  align 'Add to Marketplace' button on plugins page
  fix the PluginGrid on mobiles sizes
  use getBy query instead of queryBy when asserting for elements present in document (#2951)
  Update PinButton.tsx
  Add test case for Progress component (#2953)
  fix the styling of footer copy on mobile
  add changeset
  handle the case where no entities are available to show
  core-api: work around issue with ApiRef export const declarations
  core-api: move utility api system implementation into apis/system
  Update docs regarding npm config ignore-scripts flag
  Another try
  Fix Core Features configuration id (#2948)
  Fix test?
  ...

packages/e2e-test/src/commands/run.ts

@@ -56,7 +56,7 @@ export async function run() {
   const pluginName = await createPlugin('test-plugin', appDir);
 
   print('Creating a Backstage Backend Plugin');
-  await createPlugin('test-backend-plugin', appDir, ['--backend']);
+  await createPlugin('test-plugin', appDir, ['--backend']);
 
   print('Starting the app');
   await testAppServe(pluginName, appDir);
@@ -265,13 +265,18 @@ async function createPlugin(
     print('Waiting for plugin create script to be done');
     await waitForExit(child);
 
-    const pluginDir = resolvePath(appDir, 'plugins', pluginName);
+    const canonicalName = options.includes('--backend')
+      ? `${pluginName}-backend`
+      : pluginName;
+
+    const pluginDir = resolvePath(appDir, 'plugins', canonicalName);
+
     for (const cmd of [['tsc'], ['lint'], ['test', '--no-watch']]) {
       print(`Running 'yarn ${cmd.join(' ')}' in newly created plugin`);
       await runPlain(['yarn', ...cmd], { cwd: pluginDir });
     }
 
-    return pluginName;
+    return canonicalName;
   } finally {
     child.kill();
   }
@@ -296,7 +301,7 @@ async function testAppServe(pluginName: string, appDir: string) {
       try {
         const browser = new Browser();
 
-        await waitForPageWithText(browser, '/', 'Backstage Service Catalog');
+        await waitForPageWithText(browser, '/', 'My Company Service Catalog');
         await waitForPageWithText(
           browser,
           `/${pluginName}`,