Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ stepByStepTestData.forEach(({ name, heading, title1, title2 }) => {
const stepByStepView = path.join(appViews, `${name}.html`)
const stepByStepPath = `/${name}`

describe(`${name} journey`, async () => {
// The templates in the test fixtures match the v1.0.0 of the plugin
// however, the JavaScript has been updated in v2.0.0
// and only v3.0.0 supports GOV.UK Frontend v6.0.0
// installed by default when creating a prototype
describe.skip(`${name} journey`, async () => {
before(() => {
copyFile(stepByStepTemplateView, stepByStepView)
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const questionTestMarkUp = `
`

function clearData () {
cy.get('footer a[href*="/manage-prototype/clear-data"]').click()
cy.get('.govuk-footer a[href*="/manage-prototype/clear-data"]').click()
cy.get('h1').should('contain.text', 'Clear session data')
cy.get('button').should('contain.text', 'Clear the data').click()
cy.get('main h1').should('contain.text', 'Data cleared')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ describe('management available', () => {
it('manage prototype link should exist in the footer', () => {
waitForApplication()
cy.visit('/')
cy.get('footer a[href="/manage-prototype"]').should('contain.text', 'Manage your prototype')
cy.get('.govuk-footer a[href="/manage-prototype"]').should('contain.text', 'Manage your prototype')
})

it('clear data link should exist in the footer and work correctly', () => {
waitForApplication()
cy.visit('/')
cy.get('footer a[href="/manage-prototype/clear-data"]').should('contain.text', 'Clear data').click()
cy.get('.govuk-footer a[href="/manage-prototype/clear-data"]').should('contain.text', 'Clear data').click()
cy.get('h1').should('contain.text', 'Clear session data')
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const dataOutputNjk = `
const answer = 'Standing on my head'

function clearData () {
cy.get('footer a[href*="/manage-prototype/clear-data"]').click()
cy.get('.govuk-footer a[href*="/manage-prototype/clear-data"]').click()
cy.get('h1').should('contain.text', 'Clear session data')
cy.get('button').should('contain.text', 'Clear the data').click()
cy.get('main h1').should('contain.text', 'Data cleared')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ describe('Management plugins: ', () => {
})
})

it(`Update the ${plugin} plugin`, () => {
// Step by step v1 is not compatible with GOV.UK Frontend v6.0.0
// which is the version installed in new prototypes by default
it.skip(`Update the ${plugin} plugin`, () => {
log(`Install ${plugin}@${version1} directly`)
uninstallPlugin(plugin)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ describe('management not available', () => {
cy.task('waitUntilAppRestarts')
cy.visit('/')
authenticate()
cy.get('footer a[href="/manage-prototype"]').should('not.exist')
cy.get('.govuk-footer a[href="/manage-prototype"]').should('not.exist')
})

it('clear data link should exist in the footer and work correctly', () => {
cy.task('waitUntilAppRestarts')
cy.visit('/')
authenticate()
cy.get('footer a[href="/manage-prototype/clear-data"]').should('contain.text', 'Clear data').click()
cy.get('.govuk-footer a[href="/manage-prototype/clear-data"]').should('contain.text', 'Clear data').click()
cy.get('h1').should('contain.text', 'Clear session data')
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ const settingsStyle = path.join(appStylesFolder, 'settings.scss')
const RED = 'rgb(255, 0, 0)'
const GREEN = 'rgb(0, 255, 0)'

const settingsContent = `$govuk-brand-colour: ${RED}`
const changedSettingsContent = `$govuk-brand-colour: ${GREEN}`
const settingsContent = `$govuk-functional-colours: (brand: ${RED});`
const changedSettingsContent = `$govuk-functional-colours: (brand: ${GREEN});`

describe('watching settings.scss', () => {
afterEach(restoreStarterFiles)
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/styles/1-watch-styles/watch-styles.cypress.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const BLUE = 'rgb(29, 112, 184)'
describe('watch sass files', () => {
describe(`sass file ${cypressTestStylePattern} should be created and included within the ${appStylesheet} and accessible from the browser as /${publicStylesheet}`, () => {
const cssStatement = `
.govuk-template--rebranded .govuk-header { background: red; }
.govuk-header { background: red; }
`

afterEach(restoreStarterFiles)
Expand Down