Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ios/web/web_state/ui/crw_web_controller_unittest.mm

Issue 2752013002: Removed webControllerDidUpdateSSLStatusForCurrentNavigationItem:. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/web/web_state/ui/crw_web_controller.mm ('k') | ios/web/web_state/web_state_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/web_state/ui/crw_web_controller_unittest.mm
diff --git a/ios/web/web_state/ui/crw_web_controller_unittest.mm b/ios/web/web_state/ui/crw_web_controller_unittest.mm
index ebc5dd14106cd0a4701881b42ee7f00a7ef30b1f..8e78518b1bf310308d9177879cdc7f7d3e280661 100644
--- a/ios/web/web_state/ui/crw_web_controller_unittest.mm
+++ b/ios/web/web_state/ui/crw_web_controller_unittest.mm
@@ -239,6 +239,9 @@ TEST_F(CRWWebControllerTest, UrlForHistoryNavigation) {
// Tests that AllowCertificateError is called with correct arguments if
// WKWebView fails to load a page with bad SSL cert.
TEST_F(CRWWebControllerTest, SslCertError) {
+ web::TestWebStateObserver observer(web_state());
+ ASSERT_FALSE(observer.did_change_visible_security_state_info());
+
// Last arguments passed to AllowCertificateError must be in default state.
ASSERT_FALSE(GetWebClient()->last_cert_error_code());
ASSERT_FALSE(GetWebClient()->last_cert_error_ssl_info().is_valid());
@@ -274,6 +277,11 @@ TEST_F(CRWWebControllerTest, SslCertError) {
GetWebClient()->last_cert_error_ssl_info().cert_status);
EXPECT_EQ(url, GetWebClient()->last_cert_error_request_url());
EXPECT_FALSE(GetWebClient()->last_cert_error_overridable());
+
+ // Verify that |DidChangeVisibleSecurityState| was called.
+ ASSERT_TRUE(observer.did_change_visible_security_state_info());
+ EXPECT_EQ(web_state(),
+ observer.did_change_visible_security_state_info()->web_state);
}
// Test fixture to test |setPageDialogOpenPolicy:|.
@@ -572,30 +580,54 @@ TEST_F(CRWWebControllerNavigationTest, GoToItemWithoutDocumentChange) {
session_controller.currentItem);
}
-// Tests that didShowPasswordInputOnHTTP updates the SSLStatus to indicate that
+// Test fixture for testing visible security state.
+typedef web::WebTestWithWebState CRWWebStateSecurityStateTest;
+
+// Tests that OnPasswordInputShownOnHttp updates the SSLStatus to indicate that
// a password field has been displayed on an HTTP page.
-TEST_F(CRWWebControllerNavigationTest, HTTPPassword) {
+TEST_F(CRWWebStateSecurityStateTest, HttpPassword) {
LoadHtml(@"<html><body></body></html>", GURL("http://chromium.test"));
- NavigationManagerImpl& nav_manager =
- web_controller().webStateImpl->GetNavigationManagerImpl();
- EXPECT_FALSE(nav_manager.GetLastCommittedItem()->GetSSL().content_status &
+ web::NavigationManager* nav_manager = web_state()->GetNavigationManager();
+ EXPECT_FALSE(nav_manager->GetLastCommittedItem()->GetSSL().content_status &
web::SSLStatus::DISPLAYED_PASSWORD_FIELD_ON_HTTP);
- [web_controller() didShowPasswordInputOnHTTP];
- EXPECT_TRUE(nav_manager.GetLastCommittedItem()->GetSSL().content_status &
+ web::TestWebStateObserver observer(web_state());
+ ASSERT_FALSE(observer.did_change_visible_security_state_info());
+ web_state()->OnPasswordInputShownOnHttp();
+ EXPECT_TRUE(nav_manager->GetLastCommittedItem()->GetSSL().content_status &
web::SSLStatus::DISPLAYED_PASSWORD_FIELD_ON_HTTP);
+ ASSERT_TRUE(observer.did_change_visible_security_state_info());
+ EXPECT_EQ(web_state(),
+ observer.did_change_visible_security_state_info()->web_state);
}
-// Tests that didShowCreditCardInputOnHTTP updates the SSLStatus to indicate
+// Tests that OnCreditCardInputShownOnHttp updates the SSLStatus to indicate
// that a credit card field has been displayed on an HTTP page.
-TEST_F(CRWWebControllerNavigationTest, HTTPCreditCard) {
+TEST_F(CRWWebStateSecurityStateTest, HttpCreditCard) {
LoadHtml(@"<html><body></body></html>", GURL("http://chromium.test"));
- NavigationManagerImpl& nav_manager =
- web_controller().webStateImpl->GetNavigationManagerImpl();
- EXPECT_FALSE(nav_manager.GetLastCommittedItem()->GetSSL().content_status &
+ web::NavigationManager* nav_manager = web_state()->GetNavigationManager();
+ EXPECT_FALSE(nav_manager->GetLastCommittedItem()->GetSSL().content_status &
web::SSLStatus::DISPLAYED_CREDIT_CARD_FIELD_ON_HTTP);
- [web_controller() didShowCreditCardInputOnHTTP];
- EXPECT_TRUE(nav_manager.GetLastCommittedItem()->GetSSL().content_status &
+ web::TestWebStateObserver observer(web_state());
+ ASSERT_FALSE(observer.did_change_visible_security_state_info());
+ web_state()->OnCreditCardInputShownOnHttp();
+ EXPECT_TRUE(nav_manager->GetLastCommittedItem()->GetSSL().content_status &
web::SSLStatus::DISPLAYED_CREDIT_CARD_FIELD_ON_HTTP);
+ ASSERT_TRUE(observer.did_change_visible_security_state_info());
+ EXPECT_EQ(web_state(),
+ observer.did_change_visible_security_state_info()->web_state);
+}
+
+// Tests that loading HTTP page updates the SSLStatus.
+TEST_F(CRWWebStateSecurityStateTest, LoadHttpPage) {
+ web::TestWebStateObserver observer(web_state());
+ ASSERT_FALSE(observer.did_change_visible_security_state_info());
+ LoadHtml(@"<html><body></body></html>", GURL("http://chromium.test"));
+ web::NavigationManager* nav_manager = web_state()->GetNavigationManager();
+ web::NavigationItem* item = nav_manager->GetLastCommittedItem();
+ EXPECT_EQ(web::SECURITY_STYLE_UNAUTHENTICATED, item->GetSSL().security_style);
+ ASSERT_TRUE(observer.did_change_visible_security_state_info());
+ EXPECT_EQ(web_state(),
+ observer.did_change_visible_security_state_info()->web_state);
}
// Real WKWebView is required for CRWWebControllerInvalidUrlTest.
« no previous file with comments | « ios/web/web_state/ui/crw_web_controller.mm ('k') | ios/web/web_state/web_state_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698