Skip to content

Commit 253d091

Browse files
SRCH-6171 Update login and signup page. (#1861)
* SRCH-6171 Update login and signup page. --------- Co-authored-by: Luis Metzger <luismetzger@me.com>
1 parent ee8b2de commit 253d091

File tree

6 files changed

+2421
-22
lines changed

6 files changed

+2421
-22
lines changed

app/views/sites/shared/_header.html.haml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
= link_to new_site_path do
1616
%i.fa.fa-plus-inactive{'data-grunticon-embed' => 'toggle_me'}
1717
Add Site
18-
%li
19-
= link_to 'https://search.gov/feedback/feedback.html' do
20-
%i.fa.fa-lightbulb-o-inactive{'data-grunticon-embed' => 'toggle_me'}
21-
Send an Idea
2218
%ul#auth-and-help.nav
2319
%li
2420
%ul.nav.help
@@ -27,10 +23,9 @@
2723
Need Help?
2824
%i.fa.fa-caret-down-inactive{'data-grunticon-embed' => 'toggle_me'}
2925
%ul.dropdown-menu(data-no-turbolink)
30-
%li= mail_to SUPPORT_EMAIL_ADDRESS, 'Contact us by email'
31-
%li= link_to 'Call us: 202-969-7426', 'tel:202-969-7426'
32-
%li= link_to 'Read the Help Manual', 'https://search.gov/manual'
33-
%li= link_to 'Training Sessions', 'https://search.gov/manual/training.html'
26+
%li= mail_to 'search@gsa.gov', 'Email the Search.gov team'
27+
%li= link_to 'Read the Search.gov guide', 'https://digital.gov/guides/search'
28+
3429
%li
3530
%ul.nav.auth
3631
%li#nav-auth-menu.dropdown

app/views/user_sessions/security_notification.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
= form_tag '/auth/logindotgov', method: 'post', id: 'user-session-form' do
2626
= render_flash_message(false)
2727
= submit_tag 'Accept and proceed'
28-
= link_to 'Cancel and return to Search.gov', 'https://search.gov'
28+
= link_to 'Cancel and return to Search.gov guide', 'https://digital.gov/guides/search'
2929
<br/>
3030
= link_to 'Go to USA.gov', 'https://usa.gov'

features/admin_center_dashboard.feature

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,3 @@ Feature: Dashboard
267267
Then I should be on the new site page
268268
And I should see "Scheduled site 'USA.gov' for deletion. This could take several hours to complete."
269269

270-
@javascript
271-
Scenario: Sending an idea
272-
Given I am logged in with email "affiliate_manager@fixtures.org"
273-
When I go to the usagov's Dashboard page
274-
Then I should see a link to "https://search.gov/feedback/feedback.html" with text "Send an Idea"

features/search_elastic.feature

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ Feature: SearchElastic engine search
1111

1212
@javascript
1313
Scenario: Search on an affiliate using the SearchElastic search engine
14-
When I am on nasa's search page
15-
And I search for "hubble" in the redesigned search page
16-
Then I should see "NASA Extends Hubble Operations Contract"
14+
When I am on nasa's search page
15+
And I search for "hubble" in the redesigned search page
16+
Then I should see "NASA Extends Hubble Operations Contract"

features/vcr_cassettes/Search_-_redesign/Search_with_no_query_on_an_affiliate_page.yml

Lines changed: 2413 additions & 1 deletion
Large diffs are not rendered by default.

spec/lib/url_status_code_fetcher_spec.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
require 'spec_helper'
22

33
describe UrlStatusCodeFetcher do
4-
# UrlStatusCodeFetcher uses Curl::Multi, which does not play nicely with either
5-
# Webmock or VCR. We might consider swapping out Curb in favor of Faraday, which
6-
# has more dev support, is more easily stubbed, and is already used extensively
7-
# in our code.
84
let(:valid_url) { 'https://digital.gov/guides/search' }
95
let(:invalid_url) { 'https://www.google.com/404' }
106

@@ -20,6 +16,7 @@
2016

2117
expect(responses).to eq({ valid_url => '200',
2218
invalid_url => '404' })
19+
expect(responses[invalid_url]).to eq('404')
2320
end
2421
end
2522

0 commit comments

Comments
 (0)