From 1b2316acbd4bf01ad1957d1c5f468c8805e142fe Mon Sep 17 00:00:00 2001 From: Kevin Ashworth Date: Wed, 23 Dec 2020 15:34:50 -0800 Subject: [PATCH 1/5] Remove a space that is the problem --- packages/octave/lib/components/common/Search.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/octave/lib/components/common/Search.jsx b/packages/octave/lib/components/common/Search.jsx index 0e9edb6e..5258df63 100644 --- a/packages/octave/lib/components/common/Search.jsx +++ b/packages/octave/lib/components/common/Search.jsx @@ -12,7 +12,7 @@ import { Configure, connectHits, connectPoweredBy, connectSearchBox, connectStat // eslint-disable-next-line react/display-name const CustomToggle = forwardRef(({ children }, ref) => ( - {children}   + {children} )) From 630a090aa3e5b06743e5a07b679c90f18dd58d5f Mon Sep 17 00:00:00 2001 From: Kevin Ashworth Date: Wed, 23 Dec 2020 15:35:21 -0800 Subject: [PATCH 2/5] Move search box outside of dropdown --- packages/octave/lib/components/common/Search.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/octave/lib/components/common/Search.jsx b/packages/octave/lib/components/common/Search.jsx index 5258df63..8af8f95d 100644 --- a/packages/octave/lib/components/common/Search.jsx +++ b/packages/octave/lib/components/common/Search.jsx @@ -124,8 +124,8 @@ const Algolia = () => { )} - - + + From 2e749166bacde9bf9f988f1dc1d478ff74e5e1a9 Mon Sep 17 00:00:00 2001 From: Kevin Ashworth Date: Wed, 23 Dec 2020 15:35:53 -0800 Subject: [PATCH 3/5] unrelated - make tags and releases format as before --- .release-it.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.release-it.json b/.release-it.json index 24637f12..ba063f34 100644 --- a/.release-it.json +++ b/.release-it.json @@ -1,6 +1,10 @@ { + "git": { + "commitMessage": "${version}" + }, "github": { "release": true, + "releaseName": "${version}", "tokenRef": "RELEASE_IT_GITHUB_TOKEN" }, "npm": { From 2162ceec4e27320bff374d7b0ec25752d9dac418 Mon Sep 17 00:00:00 2001 From: Kevin Ashworth Date: Wed, 23 Dec 2020 18:56:41 -0800 Subject: [PATCH 4/5] Run and pass tests - Visual difference now in Percy - Remove dead code --- tests/cypress/fixtures/Triad.gz | 4 ++-- .../integration/2-callback-testing/projects-create.spec.js | 2 -- .../integration/2-callback-testing/projects-delete.spec.js | 4 +--- .../integration/2-callback-testing/projects-update.spec.js | 2 -- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tests/cypress/fixtures/Triad.gz b/tests/cypress/fixtures/Triad.gz index 6a26492b..2b3ca771 100644 --- a/tests/cypress/fixtures/Triad.gz +++ b/tests/cypress/fixtures/Triad.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e30b0bbbad86075ef0448351aac24f52fae41cd0d08894ae1e02cbe74ce50751 -size 581393 +oid sha256:755bb4e8b631bfa91882037653f753fbc87e66d3221aa8cb9ffb2eb7670443ac +size 580895 diff --git a/tests/cypress/integration/2-callback-testing/projects-create.spec.js b/tests/cypress/integration/2-callback-testing/projects-create.spec.js index 84ec79c6..3258ad19 100644 --- a/tests/cypress/integration/2-callback-testing/projects-create.spec.js +++ b/tests/cypress/integration/2-callback-testing/projects-create.spec.js @@ -18,7 +18,6 @@ describe('Projects Create', () => { cy.getTestingCollection('contacts') cy.getTestingCollection('offices') cy.getTestingCollection('projects') - cy.getTestingCollection('pastprojects') }) beforeEach(() => { @@ -26,7 +25,6 @@ describe('Projects Create', () => { cy.fixture('output/callback-testing/testing-contacts.json').as('testingContacts') cy.fixture('output/callback-testing/testing-offices.json').as('testingOffices') cy.fixture('output/callback-testing/testing-projects.json').as('testingProjects') - cy.fixture('output/callback-testing/testing-pastprojects.json').as('testingPastprojects') cy.fixture('callback-testing.json').as('items') }) diff --git a/tests/cypress/integration/2-callback-testing/projects-delete.spec.js b/tests/cypress/integration/2-callback-testing/projects-delete.spec.js index 4297bfea..136ed292 100644 --- a/tests/cypress/integration/2-callback-testing/projects-delete.spec.js +++ b/tests/cypress/integration/2-callback-testing/projects-delete.spec.js @@ -14,12 +14,10 @@ describe('Projects Delete', () => { Cypress.LocalStorage.clear = doNotClearLocalStorage cy.readyForCypress() cy.resetTriad() - // cy.stubAlgolia() cy.login() cy.getTestingCollection('contacts') cy.getTestingCollection('offices') cy.getTestingCollection('projects') - // cy.getTestingCollection('pastprojects') }) beforeEach(() => { @@ -27,7 +25,6 @@ describe('Projects Delete', () => { cy.fixture('output/callback-testing/testing-contacts.json').as('testingContacts') cy.fixture('output/callback-testing/testing-offices.json').as('testingOffices') cy.fixture('output/callback-testing/testing-projects.json').as('testingProjects') - // cy.fixture('output/callback-testing/testing-pastprojects.json').as('testingPastprojects') }) it('delete a project', function () { @@ -68,6 +65,7 @@ describe('Projects Delete', () => { cy.get('[data-cy=project-header]', { log: false }).contains(project.projectTitle) cy.toggleSidebar() cy.enterAlgoliaSearch(project.projectTitle) + cy.percySnapshot('Algolia Search Results') cy.get('[data-cy=search-result]').should('have.length', 1) // delete the project diff --git a/tests/cypress/integration/2-callback-testing/projects-update.spec.js b/tests/cypress/integration/2-callback-testing/projects-update.spec.js index 6a671347..de37a5ca 100644 --- a/tests/cypress/integration/2-callback-testing/projects-update.spec.js +++ b/tests/cypress/integration/2-callback-testing/projects-update.spec.js @@ -18,7 +18,6 @@ describe('Projects Update', () => { cy.getTestingCollection('contacts') cy.getTestingCollection('offices') cy.getTestingCollection('projects') - cy.getTestingCollection('pastprojects') }) beforeEach(() => { @@ -26,7 +25,6 @@ describe('Projects Update', () => { cy.fixture('output/callback-testing/testing-contacts.json').as('testingContacts') cy.fixture('output/callback-testing/testing-offices.json').as('testingOffices') cy.fixture('output/callback-testing/testing-projects.json').as('testingProjects') - cy.fixture('output/callback-testing/testing-pastprojects.json').as('testingPastprojects') }) it('reorder the contacts and offices on a 2-contact-2-office project', function () { From 3d4a438883e264dd020115fdb8c7a4c9b75165a0 Mon Sep 17 00:00:00 2001 From: Kevin Ashworth Date: Wed, 23 Dec 2020 18:59:30 -0800 Subject: [PATCH 5/5] standard --- tests/cypress/integration/1-ui/5-markdown.spec.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/cypress/integration/1-ui/5-markdown.spec.js b/tests/cypress/integration/1-ui/5-markdown.spec.js index 3a6e015b..d27d86cf 100644 --- a/tests/cypress/integration/1-ui/5-markdown.spec.js +++ b/tests/cypress/integration/1-ui/5-markdown.spec.js @@ -34,7 +34,9 @@ describe('Markdown', () => { cy.get('[data-cy=pastproject-header]', { log: false }).contains(pastproject.projectTitle) // set flag on the window for assertion below - cy.window().then(w => w.beforeReload = true) + cy.window().then((win) => { + win.beforeReload = true + }) // assert prepared links in "Production Notes:" cy.get('#past_projects_single_tabs-tabpane-main').within(() => {