diff --git a/cypress/e2e/desktop/siteInfo.cy.js b/cypress/e2e/desktop/siteInfo.cy.js index 2ada395e..0b6e27fa 100644 --- a/cypress/e2e/desktop/siteInfo.cy.js +++ b/cypress/e2e/desktop/siteInfo.cy.js @@ -21,17 +21,21 @@ describe('site info', () => { // Switch to food view cy.get('[data-cy=button-resource-type-menu]').click() cy.get('[data-cy=button-FOOD-data-selector]').click() - cy.get('[data-cy=button-resource-type-menu]').click() // Load a sample food site // This is currently using live data, but should be updated to make use of test data. cy.get('[title=data-cy-1]').click(); - cy.get('[title=data-cy-2]').click(); - cy.get('[data-cy=tap-organization-name]').should( 'have.text', 'Test Organization' ); + // Confirm that the modal represents a half-modal + // Expand the modal to a full-modal + // Confirm that the correct description for the location is displayed + // Confirm that the modal represents a full-modal + + + // cy.get('[title=data-cy-2]').click(); }); it('should successfully display a foraging site', () => { diff --git a/cypress/e2e/mobile/modals.cy.js b/cypress/e2e/mobile/modals.cy.js index bae555c5..a4fa4a98 100644 --- a/cypress/e2e/mobile/modals.cy.js +++ b/cypress/e2e/mobile/modals.cy.js @@ -17,7 +17,28 @@ describe('modals', () => { }); it('should successfully display a food site', () => { - // TODO + // Switch to food view + cy.get('[data-cy=button-resource-type-menu]').click(); + cy.get('[data-cy=button-FOOD-data-selector]').click(); + + // Load a sample food site + // This is currently using live data, but should be updated to make use of test data. + cy.get('[title=data-cy-1]').click(); + + // Confirm that the modal that pops up shows the correct name for the location + cy.get('[data-cy=tap-organization-name]').should( + 'have.text', + 'Test Organization' + ); + + // Confirm that the modal represents a half-modal + + + // Expand the modal to a full-modal + // Confirm that the correct description for the location is displayed + // Confirm that the modal represents a full-modal + + }); it('should successfully display a foraging site', () => { diff --git a/src/components/ChooseResourceType/MobileChooseResourceType.js b/src/components/ChooseResourceType/MobileChooseResourceType.js index 1237f284..0dd3f00e 100644 --- a/src/components/ChooseResourceType/MobileChooseResourceType.js +++ b/src/components/ChooseResourceType/MobileChooseResourceType.js @@ -86,7 +86,10 @@ const MobileChooseResourceType = (props) => { > {props.resourceTypeInfo.map(entry => ( - + ))} diff --git a/src/components/SelectedTap/SelectedTap.css b/src/components/SelectedTap/SelectedTap.css index b45dc019..1f6cb67c 100644 --- a/src/components/SelectedTap/SelectedTap.css +++ b/src/components/SelectedTap/SelectedTap.css @@ -120,6 +120,7 @@ -webkit-line-clamp: 2; -webkit-box-orient: vertical; text-overflow: ellipsis; + color: greenyellow; /* debug! */ } #tap-info-address { text-align: start;