Plugin tests passing.

alphagov · Sep 8, 2023 · 66e55bd · 66e55bd
1 parent d2e3886
commit 66e55bd
Show file tree

Hide file tree

Showing 11 changed files with 214 additions and 163 deletions.
diff --git a/cypress/e2e/plugins/0-mock-plugin-tests/install-plugin-via-ui-test.cypress.js b/cypress/e2e/plugins/0-mock-plugin-tests/install-plugin-via-ui-test.cypress.js
@@ -36,7 +36,6 @@ describe('Install and uninstall Local Plugin via UI Test', async () => {
 
     cy.get(panelCompleteQuery, { timeout: 20000 })
       .should('be.visible')
-    cy.get('a').contains('Back to plugin details')
 
     //   ------------------------
 
@@ -60,10 +59,12 @@ describe('Install and uninstall Local Plugin via UI Test', async () => {
 
     performPluginAction('uninstall', dependentPlugin, dependentPluginName)
 
+    waitForApplication()
+
     //   ------------------------
 
     log(`The ${dependentPlugin} plugin templates are not available`)
-    cy.get('a').contains('Templates').click()
+    cy.visit('http://localhost:3000/manage-prototype/templates', { retryOnNetworkFailure: true, timeout: 4000 })
     cy.get(`[data-plugin-package-name="${dependentPlugin}"]`).should('not.exist')
   })
 

diff --git a/...totype-kit-plugin-tests/handle-plugin-update-when-a-dependency-is-now-required.cypress.js b/...totype-kit-plugin-tests/handle-plugin-update-when-a-dependency-is-now-required.cypress.js
@@ -52,7 +52,7 @@ describe('Handle a plugin update', () => {
       .contains('Update')
       .click()
 
-    cy.get('#plugin-action-confirmation', { timeout: 4000 })
+    cy.get('#dependency-heading', { timeout: 4000 })
       .find('ul')
       .contains(dependencyPluginName)
 

diff --git a/cypress/e2e/plugins/plugin-utils.js b/cypress/e2e/plugins/plugin-utils.js
@@ -34,7 +34,7 @@ async function loadTemplatesPage () {
 
 function performPluginAction (action, plugin, pluginName) {
   cy.task('log', `The ${plugin} plugin should be displayed`)
-  cy.get('h2')
+  cy.get('h1')
     .contains(pluginName)
 
   const processingText = `${action === 'update' ? 'Updat' : action}ing ...`

diff --git a/known-plugins.json b/known-plugins.json
@@ -8,7 +8,6 @@
       "hmrc-frontend",
       "jquery",
       "notifications-node-client",
-      "@hmcts/frontend",
       "@ministryofjustice/frontend",
       "@x-govuk/edit-prototype-in-browser",
       "@x-govuk/govuk-prototype-components",

diff --git a/lib/assets/javascripts/manage-prototype/manage-plugins.js b/lib/assets/javascripts/manage-prototype/manage-plugins.js
@@ -187,7 +187,7 @@
 
     hide('panel-manual-instructions')
     const actionButton = document.getElementById('plugin-action-button')
-    const previousRun = window.localStorage.getItem(localStorageKey)
+    const previousRun = localStorageKey && window.localStorage.getItem(localStorageKey)
 
     if (previousRun) {
       console.log('previous state exists')

diff --git a/lib/manage-prototype-handlers.js b/lib/manage-prototype-handlers.js
@@ -735,7 +735,7 @@ async function getPluginsModeHandler (req, res, next) {
 
   if (relatedPlugins.length > 0) {
     const plural = relatedPlugins.length > 1
-    dependencyHeading = `To ${mode} this plugin, you'll also need to ${mode === 'update' ? 'install' : mode} ${(plural ? 'other plugins' : 'another plugin')}`
+    dependencyHeading = `To ${mode} this plugin, you also need to ${mode === 'update' ? 'install' : mode} ${(plural ? 'other plugins' : 'another plugin')}`
   }
 
   res.render(getManagementView('plugin-install-or-uninstall.njk'), {

diff --git a/lib/nunjucks/views/error-handling/server-error.njk b/lib/nunjucks/views/error-handling/server-error.njk
@@ -1,4 +1,4 @@
-{% extends "govuk-prototype-kit/layouts/govuk-branded.njk" %}
+{% extends "views/manage-prototype/layout.njk" %}
 
 {% block pageTitle %}
   Error {% if serviceName %}– {{ serviceName }}{% endif %} – GOV.UK Prototype Kit

diff --git a/lib/plugins/plugins.js b/lib/plugins/plugins.js
@@ -206,7 +206,8 @@ const knownWordsToFormat = {
   ons: 'ONS',
   jquery: 'jQuery',
   dwp: 'DWP',
-  tpr: 'TPR'
+  tpr: 'TPR',
+  ministryofjustice: 'Ministry of Justice'
 }
 
 function prepareWordForPackageNameDisplay (word) {