publicdata/j40-cejst-2
1
0
Fork 0
mirror of https://github.com/DOI-DO/j40-cejst-2.git synced 2025-08-19 16:01:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing merge conflicts

Browse source
This commit is contained in:
lucasmbrown-usds 2022-09-30 13:43:31 -04:00
commit 07c4c030d3
266 changed files with 1868 additions and 1811 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/cypress/integration/About.feature
View file

@ -1,17 +1,17 @@
Feature: The About page will open from all other pages
Scenario: About page open when navigating from Methodology page
Given I am on the "Methodology" page
# When I click on the "About" dropdown in the navigation
When I click on the "About" page in the navigation
Then I see "About" in the title
Scenario: About page open when navigating from Explore the map page
Given I am on the "Explore" page
# When I click on the "About" dropdown in the navigation
When I click on the "About" page in the navigation
Then I see "About" in the title
Scenario: About page open when navigating from Contact page
Given I am on the "Contact" page
# When I click on the "About" dropdown in the navigation

6
client/cypress/integration/Contact.feature
View file

@ -1,5 +1,5 @@
Feature: The Contact page will open from all other pages
Scenario: Contact page open when navigating from About page
Given I am on the "About" page
When I click on the "Contact" page in the navigation
@ -9,8 +9,8 @@ Feature: The Contact page will open from all other pages
Given I am on the "Explore" page
When I click on the "Contact" page in the navigation
Then I see "Contact" in the title
Scenario: Contact page open when navigating from Methodology page
Given I am on the "Methodology" page
When I click on the "Contact" page in the navigation
Then I see "Contact" in the title
Then I see "Contact" in the title

6
client/cypress/integration/Explore.feature
View file

@ -1,5 +1,5 @@
Feature: The Explore the map page will open from all other pages
Scenario: Explore the map page open when navigating from About page
Given I am on the "About" page
When I click on the "Explore the map" page in the navigation
@ -9,8 +9,8 @@ Feature: The Explore the map page will open from all other pages
Given I am on the "Methodology" page
When I click on the "Explore the map" page in the navigation
Then I see "Explore the map" in the title
Scenario: Explore the map page open when navigating from Contact page
Given I am on the "Contact" page
When I click on the "Explore the map" page in the navigation
Then I see "Explore the map" in the title
Then I see "Explore the map" in the title

2
client/cypress/integration/FooterLinks.feature
View file

@ -22,4 +22,4 @@ Feature: All links in the Footer are functional
Given I am on the "About" page
When I look for the "footer"
And I click on the "Find a contact at USA.gov" footer link
Then the link should respond successfully
Then the link should respond successfully

1
client/cypress/integration/LegacyTests/mapZoomLatLong.spec.js
View file

@ -62,4 +62,3 @@ describe('Does the map zoom and adjust to lat/long correctly?', () => {
// });
// });
});

6
client/cypress/integration/Methodology.feature
View file

@ -1,5 +1,5 @@
Feature: The Methodology page will open from all other pages
Scenario: Methodology page open when navigating from About page
Given I am on the "About" page
# When I click on the "Methodology" dropdown in the navigation
@ -11,9 +11,9 @@ Feature: The Methodology page will open from all other pages
# When I click on the "Methodology" dropdown in the navigation
When I click on the "Methodology" page in the navigation
Then I see "Methodology" in the title
Scenario: Methodology page open when navigating from Contact page
Given I am on the "Contact" page
# When I click on the "Methodology" dropdown in the navigation
When I click on the "Methodology" page in the navigation
Then I see "Methodology" in the title
Then I see "Methodology" in the title

1
client/cypress/integration/PublicEngLinks.feature
View file

@ -11,4 +11,3 @@ Feature: All links on Public Eng page are functional
# When I look for the "Apr 15 Reg Link" CTA
# And I click on the "Apr 15 Reg Link" event
# Then the link should respond successfully

1
client/cypress/integration/common/helpers.js
View file

@ -13,4 +13,3 @@
export const hyphenizeString = (string) => {
return string.split(/\.| /).join('-').toLowerCase();
};