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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ios/web/navigation/navigation_manager_impl_unittest.mm

Issue 2794723002: Create new pending item if UserAgentOverrideOption is not INHERIT. (Closed)
Patch Set: Address comments Created 3 years, 8 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
« ios/web/navigation/crw_session_controller.mm ('K') | « ios/web/navigation/navigation_manager_impl.mm ('k') | ios/web/net/crw_ssl_status_updater_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/navigation/navigation_manager_impl_unittest.mm
diff --git a/ios/web/navigation/navigation_manager_impl_unittest.mm b/ios/web/navigation/navigation_manager_impl_unittest.mm
index e76db99192d2912aafecfb67b37ddda957f3c90b..47da72009740054403e2967eb16a6415852406c7 100644
--- a/ios/web/navigation/navigation_manager_impl_unittest.mm
+++ b/ios/web/navigation/navigation_manager_impl_unittest.mm
@@ -515,13 +515,339 @@ TestNavigationManagerDelegate navigation_manager_delegate() {
EXPECT_EQ(0, navigation_manager()->GetIndexForOffset(-1));
}
+// Tests that when given a pending item, adding a new pending item replaces the
+// existing pending item if their URLs are different.
+TEST_F(NavigationManagerTest, ReplacePendingItemIfDiffernetURL) {
+ GURL existing_url = GURL("http://www.existing.com");
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_EQ(existing_url, navigation_manager()->GetPendingItem()->GetURL());
+
+ GURL new_url = GURL("http://www.new.com");
+ navigation_manager()->AddPendingItem(
+ new_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_EQ(new_url, navigation_manager()->GetPendingItem()->GetURL());
+}
+
+// Tests that when given a pending item, adding a new pending item with the same
+// URL doesn't replace the existing pending item if new pending item is not a
+// form submission.
+TEST_F(NavigationManagerTest, NotReplaceSameUrlPendingItemIfNotFormSubmission) {
+ GURL existing_url = GURL("http://www.existing.com");
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_TYPED));
+
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_LINK,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_TYPED));
+}
+
+// Tests that when given a pending item, adding a new pending item with the same
+// URL replaces the existing pending item if new pending item is a form
+// submission while existing pending item is not.
+TEST_F(NavigationManagerTest, ReplaceSameUrlPendingItemIfFormSubmission) {
+ GURL existing_url = GURL("http://www.existing.com");
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_TYPED));
+
+ // Doesn't replace if new transition is not a form submission.
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_LINK,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_TYPED));
+
+ // Replace if new transition is a form submission.
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_FORM_SUBMIT,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_FORM_SUBMIT));
+}
+
+// Tests that when given a pending item, adding a new pending item with the same
+// URL doesn't replace the existing pending item if the user agent override
+// option is INHERIT.
+TEST_F(NavigationManagerTest, NotReplaceSameUrlPendingItemIfOverrideInherit) {
+ GURL existing_url = GURL("http://www.existing.com");
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_TYPED));
+
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_LINK,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_TYPED));
+}
+
+// Tests that when given a pending item, adding a new pending item with the same
+// URL replaces the existing pending item if the user agent override option is
+// DESKTOP.
+TEST_F(NavigationManagerTest, ReplaceSameUrlPendingItemIfOverrideDesktop) {
+ GURL existing_url = GURL("http://www.existing.com");
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::MOBILE);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_TYPED));
+ EXPECT_EQ(web::UserAgentType::MOBILE,
+ navigation_manager()->GetPendingItem()->GetUserAgentType());
+
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_LINK,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::DESKTOP);
+
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_LINK));
+}
+
+// Tests that when given a pending item, adding a new pending item with the same
+// URL replaces the existing pending item if the user agent override option is
+// MOBILE.
+TEST_F(NavigationManagerTest, ReplaceSameUrlPendingItemIfOverrideMobile) {
+ GURL existing_url = GURL("http://www.existing.com");
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::DESKTOP);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_TYPED));
+ EXPECT_EQ(web::UserAgentType::DESKTOP,
+ navigation_manager()->GetPendingItem()->GetUserAgentType());
+
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_LINK,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::MOBILE);
+
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_LINK));
+}
+
+// Tests that when the last committed item exists, adding a pending item
+// succeeds if the new item's URL is different from the last committed item.
+TEST_F(NavigationManagerTest, AddPendingItemIfDiffernetURL) {
+ GURL existing_url = GURL("http://www.existing.com");
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ [session_controller() commitPendingItem];
+ ASSERT_TRUE(navigation_manager()->GetLastCommittedItem());
+ EXPECT_EQ(existing_url,
+ navigation_manager()->GetLastCommittedItem()->GetURL());
+
+ GURL new_url = GURL("http://www.new.com");
+ navigation_manager()->AddPendingItem(
+ new_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_EQ(new_url, navigation_manager()->GetPendingItem()->GetURL());
+}
+
+// Tests that when the last committed item exists, adding a pending item with
+// the same URL fails if the new item is not form submission.
+TEST_F(NavigationManagerTest, NotAddSameUrlPendingItemIfNotFormSubmission) {
+ GURL existing_url = GURL("http://www.existing.com");
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ [session_controller() commitPendingItem];
+ ASSERT_TRUE(navigation_manager()->GetLastCommittedItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetLastCommittedItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_TYPED));
+ EXPECT_FALSE(navigation_manager()->GetPendingItem());
+
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_LINK,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ EXPECT_FALSE(navigation_manager()->GetPendingItem());
+}
+
+// Tests that when the last committed item exists, adding a pending item with
+// the same URL succeeds if the new item is a form submission while the last
+// committed item is not.
+TEST_F(NavigationManagerTest, AddSameUrlPendingItemIfFormSubmission) {
+ GURL existing_url = GURL("http://www.existing.com");
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ [session_controller() commitPendingItem];
+ ASSERT_TRUE(navigation_manager()->GetLastCommittedItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetLastCommittedItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_TYPED));
+ EXPECT_FALSE(navigation_manager()->GetPendingItem());
+
+ // Add if new transition is a form submission.
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_FORM_SUBMIT,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_FORM_SUBMIT));
+}
+
+// Tests that when the last committed item exists, adding a pending item with
+// the same URL fails if both the new item and the last committed item are form
+// submissions.
+TEST_F(NavigationManagerTest,
+ NotAddSameUrlPendingItemIfDuplicateFormSubmission) {
+ GURL existing_url = GURL("http://www.existing.com");
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_FORM_SUBMIT,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ [session_controller() commitPendingItem];
+ ASSERT_TRUE(navigation_manager()->GetLastCommittedItem());
+ EXPECT_FALSE(navigation_manager()->GetPendingItem());
+
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_FORM_SUBMIT,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ EXPECT_FALSE(navigation_manager()->GetPendingItem());
+}
+
+// Tests that when the last committed item exists, adding a pending item with
+// the same URL fails if the user agent override option is INHERIT.
+TEST_F(NavigationManagerTest, NotAddSameUrlPendingItemIfOverrideInherit) {
+ GURL existing_url = GURL("http://www.existing.com");
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ [session_controller() commitPendingItem];
+ ASSERT_TRUE(navigation_manager()->GetLastCommittedItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetLastCommittedItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_TYPED));
+
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_LINK,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::INHERIT);
+
+ EXPECT_FALSE(navigation_manager()->GetPendingItem());
+}
+
+// Tests that when the last committed item exists, adding a pending item with
+// the same URL succeeds if the user agent override option is DESKTOP.
+TEST_F(NavigationManagerTest, AddSameUrlPendingItemIfOverrideDesktop) {
+ GURL existing_url = GURL("http://www.existing.com");
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::MOBILE);
+ [session_controller() commitPendingItem];
+ ASSERT_TRUE(navigation_manager()->GetLastCommittedItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetLastCommittedItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_TYPED));
+ EXPECT_EQ(web::UserAgentType::MOBILE,
+ navigation_manager()->GetLastCommittedItem()->GetUserAgentType());
+
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_LINK,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::DESKTOP);
+
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_LINK));
+}
+
+// Tests that when the last committed item exists, adding a pending item with
+// the same URL succeeds if the user agent override option is MOBILE.
+TEST_F(NavigationManagerTest, AddSameUrlPendingItemIfOverrideMobile) {
+ GURL existing_url = GURL("http://www.existing.com");
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_TYPED,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::DESKTOP);
+ [session_controller() commitPendingItem];
+ ASSERT_TRUE(navigation_manager()->GetLastCommittedItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetLastCommittedItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_TYPED));
+ EXPECT_EQ(web::UserAgentType::DESKTOP,
+ navigation_manager()->GetLastCommittedItem()->GetUserAgentType());
+
+ navigation_manager()->AddPendingItem(
+ existing_url, Referrer(), ui::PAGE_TRANSITION_LINK,
+ web::NavigationInitiationType::USER_INITIATED,
+ web::NavigationManager::UserAgentOverrideOption::MOBILE);
+
+ ASSERT_TRUE(navigation_manager()->GetPendingItem());
+ EXPECT_TRUE(ui::PageTransitionCoreTypeIs(
+ navigation_manager()->GetPendingItem()->GetTransitionType(),
+ ui::PAGE_TRANSITION_LINK));
+}
+
// Tests that desktop user agent can be enforced to use for next pending item
// when UserAgentOverrideOption is DESKTOP.
TEST_F(NavigationManagerTest, OverrideUserAgentWithDesktop) {
navigation_manager()->AddPendingItem(
GURL("http://www.1.com"), Referrer(), ui::PAGE_TRANSITION_TYPED,
web::NavigationInitiationType::USER_INITIATED,
- web::NavigationManager::UserAgentOverrideOption::INHERIT);
+ web::NavigationManager::UserAgentOverrideOption::MOBILE);
[session_controller() commitPendingItem];
NavigationItem* last_committed_item =
navigation_manager()->GetLastCommittedItem();
« ios/web/navigation/crw_session_controller.mm ('K') | « ios/web/navigation/navigation_manager_impl.mm ('k') | ios/web/net/crw_ssl_status_updater_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698