Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix search height #18

Merged
merged 5 commits into from
Dec 24, 2020
Merged

Fix search height #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b2316a
Remove a space that is the problem
kevinashworth Dec 23, 2020
630a090
Move search box outside of dropdown
kevinashworth Dec 23, 2020
2e74916
unrelated - make tags and releases format as before
kevinashworth Dec 23, 2020
2162cee
Run and pass tests
kevinashworth Dec 24, 2020
3d4a438
standard
kevinashworth Dec 24, 2020
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
4 changes: 4 additions & 0 deletions .release-it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"git": {
"commitMessage": "${version}"
},
"github": {
"release": true,
"releaseName": "${version}",
"tokenRef": "RELEASE_IT_GITHUB_TOKEN"
},
"npm": {
Expand Down
6 changes: 3 additions & 3 deletions packages/octave/lib/components/common/Search.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { Configure, connectHits, connectPoweredBy, connectSearchBox, connectStat
// eslint-disable-next-line react/display-name
const CustomToggle = forwardRef(({ children }, ref) => (
<span ref={ref}>
{children} &nbsp;
{children}
</span>
))

Expand Down Expand Up @@ -124,8 +124,8 @@ const Algolia = () => {
</>
)}
</Media>
<Dropdown show={show} drop='right' onToggle={toggle}>
<CustomSearchBox />
<CustomSearchBox />
<Dropdown show={true} drop='right' onToggle={toggle}>
<CustomSearchResults />
</Dropdown>
</InstantSearch>
Expand Down
4 changes: 2 additions & 2 deletions tests/cypress/fixtures/Triad.gz
View file
Open in desktop
Git LFS file not shown
4 changes: 3 additions & 1 deletion tests/cypress/integration/1-ui/5-markdown.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand Down
2 changes: 0 additions & 2 deletions tests/cypress/integration/2-callback-testing/projects-create.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@ describe('Projects Create', () => {
cy.getTestingCollection('contacts')
cy.getTestingCollection('offices')
cy.getTestingCollection('projects')
cy.getTestingCollection('pastprojects')
})

beforeEach(() => {
Cypress.Cookies.preserveOnce('meteor_login_token')
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')
})

Expand Down
4 changes: 1 addition & 3 deletions tests/cypress/integration/2-callback-testing/projects-delete.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,17 @@ 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(() => {
Cypress.Cookies.preserveOnce('meteor_login_token')
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 () {
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions tests/cypress/integration/2-callback-testing/projects-update.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@ describe('Projects Update', () => {
cy.getTestingCollection('contacts')
cy.getTestingCollection('offices')
cy.getTestingCollection('projects')
cy.getTestingCollection('pastprojects')
})

beforeEach(() => {
Cypress.Cookies.preserveOnce('meteor_login_token')
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 () {
Expand Down