Merge pull request #1935 from alphagov/fix-upgrade-kit-error

Fix upgrade prototype kit error
alphagov · Jan 26, 2023 · 801eee8 · 801eee8
2 parents 69814ec + 62276a0
commit 801eee8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@
   The Task list template has been moved to the new
   [Task list plugin](https://github.com/alphagov/govuk-prototype-kit-task-list)
 
+### Fixes
+
+- [#1935: Fix upgrade prototype kit error](https://github.com/alphagov/govuk-prototype-kit/pull/1935)
+
 ## 13.2.2
 
 ### Fixes

diff --git a/lib/manage-prototype-handlers.js b/lib/manage-prototype-handlers.js
@@ -525,8 +525,8 @@ async function postPluginsStatusHandler (req, res) {
   let status = 'processing'
   try {
     const chosenPlugin = await getPluginForRequest(req)
-    if (!chosenPlugin && mode !== 'uninstall') {
-      status = 'error'
+    if (chosenPlugin && modeIsComplete(mode, chosenPlugin)) {
+      status = 'completed'
     }
   } catch (e) {
     if (mode !== 'uninstall') {

diff --git a/lib/manage-prototype-handlers.test.js b/lib/manage-prototype-handlers.test.js
@@ -42,6 +42,7 @@ jest.mock('fs-extra', () => {
     exists: jest.fn().mockResolvedValue(true),
     existsSync: jest.fn().mockReturnValue(true),
     pathExistsSync: jest.fn().mockReturnValue(true),
+    readJson: jest.fn().mockResolvedValue({}),
     readJsonSync: jest.fn().mockReturnValue({})
   }
 })
@@ -401,10 +402,17 @@ describe('manage-prototype-handlers', () => {
     describe('postPluginsStatusHandler', () => {
       beforeEach(() => {
         req.params.mode = 'install'
+        req.query.package = packageName
+        const pkg = {
+          name: packageName,
+          version: latestVersion,
+          dependencies: { [packageName]: latestVersion }
+        }
+        fse.readJson.mockResolvedValue(pkg)
+        fse.readJsonSync.mockReturnValue(pkg)
       })
 
       it('is processing', async () => {
-        req.query.package = packageName
         await postPluginsStatusHandler(req, res)
         expect(res.json).toHaveBeenCalledWith(
           expect.objectContaining({
@@ -413,12 +421,12 @@ describe('manage-prototype-handlers', () => {
         )
       })
 
-      it('is in error', async () => {
-        req.query.package = 'invalid-package'
+      it('is complete', async () => {
+        plugins.listInstalledPlugins.mockReturnValue([packageName])
         await postPluginsStatusHandler(req, res)
         expect(res.json).toHaveBeenCalledWith(
           expect.objectContaining({
-            status: 'error'
+            status: 'completed'
           })
         )
       })