Safe Browsing phishing interstitial redesign.

chrome/browser/safe_browsing/safe_browsing_blocking_page_v2_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This test creates a fake safebrowsing service, where we can inject
 // malware and phishing urls.  It then uses a real browser to go to
 // these urls, and sends "goback" or "proceed" commands and verifies
 // they work.
 //
 // TODO(mattm): remove / merge this file with
@@ skipping 484 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageV2Test, MalwareDontProceed) {
   GURL url = test_server()->GetURL(kEmptyPage);
   AddURLResult(url, SafeBrowsingService::URL_MALWARE);
 
   ui_test_utils::NavigateToURL(browser(), url);
   ASSERT_TRUE(WaitForReady());
 
   EXPECT_EQ(VISIBLE, GetVisibility("malware-icon"));
   EXPECT_EQ(HIDDEN, GetVisibility("subresource-icon"));
+  EXPECT_EQ(HIDDEN, GetVisibility("phishing-icon"));
   EXPECT_EQ(VISIBLE, GetVisibility("check-report"));
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);   // Assert the interstitial is gone
   EXPECT_EQ(
       GURL(chrome::kAboutBlankURL),   // Back to "about:blank"
       chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageV2Test, MalwareProceed) {
@@ skipping 29 matching lines @@
                        MalwareIframeDontProceed) {
   GURL url = test_server()->GetURL(kMalwarePage);
   GURL iframe_url = test_server()->GetURL(kMalwareIframe);
   AddURLResult(iframe_url, SafeBrowsingService::URL_MALWARE);
 
   ui_test_utils::NavigateToURL(browser(), url);
   ASSERT_TRUE(WaitForReady());
 
   EXPECT_EQ(HIDDEN, GetVisibility("malware-icon"));
   EXPECT_EQ(VISIBLE, GetVisibility("subresource-icon"));
+  EXPECT_EQ(HIDDEN, GetVisibility("phishing-icon"));
   EXPECT_EQ(VISIBLE, GetVisibility("check-report"));
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);  // Assert the interstitial is gone
 
   EXPECT_EQ(
       GURL(chrome::kAboutBlankURL),    // Back to "about:blank"
       chrome::GetActiveWebContents(browser())->GetURL());
 }
 
@@ skipping 89 matching lines @@
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);   // Assert the interstitial is gone
   EXPECT_EQ(
       GURL(chrome::kAboutBlankURL),   // Back to "about:blank"
       chrome::GetActiveWebContents(browser())->GetURL());
 }
+
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageV2Test, PhishingDontProceed) {
+  GURL url = test_server()->GetURL(kEmptyPage);
+  AddURLResult(url, SafeBrowsingService::URL_PHISHING);
+
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForReady());
+
+  EXPECT_EQ(HIDDEN, GetVisibility("malware-icon"));
+  EXPECT_EQ(HIDDEN, GetVisibility("subresource-icon"));
+  EXPECT_EQ(VISIBLE, GetVisibility("phishing-icon"));
+  EXPECT_EQ(HIDDEN, GetVisibility("check-report"));
+  EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
+  EXPECT_TRUE(Click("see-more-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
+  EXPECT_EQ(VISIBLE, GetVisibility("report-error-link"));
+  EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
+
+  EXPECT_TRUE(ClickAndWaitForDetach("back"));
+  AssertNoInterstitial(false);    // Assert the interstitial is gone
+  EXPECT_EQ(
+      GURL(chrome::kAboutBlankURL),  // We are back to "about:blank".
+      chrome::GetActiveWebContents(browser())->GetURL());
+}
+
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageV2Test, PhishingProceed) {
+  GURL url = test_server()->GetURL(kEmptyPage);
+  AddURLResult(url, SafeBrowsingService::URL_PHISHING);
+
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForReady());

[Dan Beam, 2012/09/13 04:54:26]

maybe make a setup method here? this is the same code everywhere it looks
like...

[mattm, 2012/09/13 20:12:07]

Done.

+
+  EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
+  AssertNoInterstitial(true);    // Assert the interstitial is gone

[Dan Beam, 2012/09/13 04:54:26]

nit: why 4 \s?

[mattm, 2012/09/13 20:12:07]

dunno, that's what all the other tests had. :p

fixed.

+  EXPECT_EQ(url, chrome::GetActiveWebContents(browser())->GetURL());
+}
+
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageV2Test, PhishingReportError) {
+  GURL url = test_server()->GetURL(kEmptyPage);
+  AddURLResult(url, SafeBrowsingService::URL_PHISHING);
+
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForReady());
+
+  EXPECT_TRUE(ClickAndWaitForDetach("report-error-link"));
+  AssertNoInterstitial(false);    // Assert the interstitial is gone
+
+  // We are in the error reporting page.
+  EXPECT_EQ(
+      "/safebrowsing/report_error/",
+      chrome::GetActiveWebContents(browser())->GetURL().path());
+}
+
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageV2Test, PhishingLearnMore) {
+  GURL url = test_server()->GetURL(kEmptyPage);
+  AddURLResult(url, SafeBrowsingService::URL_PHISHING);
+
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForReady());
+
+  EXPECT_TRUE(ClickAndWaitForDetach("learn-more-link"));
+  AssertNoInterstitial(false);    // Assert the interstitial is gone
+
+  // We are in the help page.
+  EXPECT_EQ(
+      "/goodtoknow/online-safety/phishing/",
+       chrome::GetActiveWebContents(browser())->GetURL().path());
+}