From 5619348c26823c91db54f849f71d9cd3ae453ce6 Mon Sep 17 00:00:00 2001
From: Sam Lord <hello@samlord.me>
Date: Wed, 16 Nov 2022 10:22:49 +0000
Subject: [PATCH] Replaced "Open Importer" button with one that works

no issue
---
 .../app/controllers/settings/labs/import.js    |  5 ++---
 ghost/admin/app/templates/settings/labs.hbs    |  3 +--
 ghost/core/test/e2e-browser/frontend.spec.js   | 18 +++++++++++++++---
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ghost/admin/app/controllers/settings/labs/import.js b/ghost/admin/app/controllers/settings/labs/import.js
index 6b7cfd33c4..51519f6511 100644
--- a/ghost/admin/app/controllers/settings/labs/import.js
+++ b/ghost/admin/app/controllers/settings/labs/import.js
@@ -1,13 +1,12 @@
-import Controller, {inject as controller} from '@ember/controller';
+import Controller from '@ember/controller';
 import {action} from '@ember/object';
 import {inject as service} from '@ember/service';
 
 export default class ImportController extends Controller {
     @service router;
-    @controller labs;
 
     @action
     close() {
-        this.router.transitionTo('labs');
+        this.router.transitionTo('settings.labs');
     }
 }
diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
index 5238190ef9..6f939e8cf0 100644
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ b/ghost/admin/app/templates/settings/labs.hbs
@@ -25,10 +25,9 @@
                             <h4 class="gh-expandable-title">Import content</h4>
                             <p class="gh-expandable-description">Import posts from a JSON or zip file</p>
                         </div>
-                        <LinkTo @route="settings.labs.import" class="mr2" data-test-link="import-content">
+                        <LinkTo @route="settings.labs.import" class="gh-btn" data-test-link="import-content">
                             <span>Open Importer</span>
                         </LinkTo>
-                        <button type="button" class="gh-btn" {{action "importContent"}}><span>Open Importer</span></button>
                     </div>
                 </div>
 
diff --git a/ghost/core/test/e2e-browser/frontend.spec.js b/ghost/core/test/e2e-browser/frontend.spec.js
index f6010a2115..0a6591ef38 100644
--- a/ghost/core/test/e2e-browser/frontend.spec.js
+++ b/ghost/core/test/e2e-browser/frontend.spec.js
@@ -1,8 +1,20 @@
 const {expect, test} = require('@playwright/test');
+const testUtils = require('../utils');
+const express = require('express');
 
 let siteUrl = process.env.TEST_URL || 'http://localhost:2368';
 
-test('Homepage is 200', async ({page}) => {
-    const response = await page.goto(siteUrl);
-    expect(response.status()).toEqual(200);
+test.describe('Ghost frontend', function () {
+    test.beforeAll(async function () {
+        const app = await testUtils.startGhost();
+    });
+
+    test.afterAll(async () => {
+        await testUtils.stopGhost();
+    });
+
+    test('Loads the homepage', async ({page}) => {
+        const response = await page.goto(siteUrl);
+        expect(response.status()).toEqual(200);
+    });
 });