| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import <EarlGrey/EarlGrey.h> | 5 #import <EarlGrey/EarlGrey.h> |
| 6 #import <UIKit/UIKit.h> | 6 #import <UIKit/UIKit.h> |
| 7 #import <XCTest/XCTest.h> | 7 #import <XCTest/XCTest.h> |
| 8 | 8 |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 assertWithMatcher:grey_notNil()]; | 266 assertWithMatcher:grey_notNil()]; |
| 267 | 267 |
| 268 // Tap a history entry and assert that navigation to that entry's URL occurs. | 268 // Tap a history entry and assert that navigation to that entry's URL occurs. |
| 269 [[EarlGrey selectElementWithMatcher:HistoryEntry(_URL1, kTitle1)] | 269 [[EarlGrey selectElementWithMatcher:HistoryEntry(_URL1, kTitle1)] |
| 270 performAction:grey_tap()]; | 270 performAction:grey_tap()]; |
| 271 [[EarlGrey selectElementWithMatcher:WebViewContainingText(kResponse1)] | 271 [[EarlGrey selectElementWithMatcher:WebViewContainingText(kResponse1)] |
| 272 assertWithMatcher:grey_notNil()]; | 272 assertWithMatcher:grey_notNil()]; |
| 273 } | 273 } |
| 274 | 274 |
| 275 // Tests that history is not changed after performing back navigation. | 275 // Tests that history is not changed after performing back navigation. |
| 276 // TODO(crbug.com/688047): Enable this test. | 276 - (void)testHistoryUpdateAfterBackNavigation { |
| 277 - (void)DISABLED_testHistoryUpdateAfterBackNavigation { | |
| 278 [ChromeEarlGrey loadURL:_URL1]; | 277 [ChromeEarlGrey loadURL:_URL1]; |
| 279 [ChromeEarlGrey loadURL:_URL2]; | 278 [ChromeEarlGrey loadURL:_URL2]; |
| 280 | 279 |
| 281 [[EarlGrey selectElementWithMatcher:chrome_test_util::BackButton()] | 280 [[EarlGrey selectElementWithMatcher:chrome_test_util::BackButton()] |
| 282 performAction:grey_tap()]; | 281 performAction:grey_tap()]; |
| 283 [[EarlGrey selectElementWithMatcher:WebViewContainingText(kResponse1)] | 282 [[EarlGrey selectElementWithMatcher:WebViewContainingText(kResponse1)] |
| 284 assertWithMatcher:grey_notNil()]; | 283 assertWithMatcher:grey_notNil()]; |
| 285 | 284 |
| 286 [self openHistoryPanel]; | 285 [self openHistoryPanel]; |
| 287 | 286 |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 - (void)resetBrowsingDataPrefs { | 537 - (void)resetBrowsingDataPrefs { |
| 539 PrefService* prefs = chrome_test_util::GetOriginalBrowserState()->GetPrefs(); | 538 PrefService* prefs = chrome_test_util::GetOriginalBrowserState()->GetPrefs(); |
| 540 prefs->ClearPref(browsing_data::prefs::kDeleteBrowsingHistory); | 539 prefs->ClearPref(browsing_data::prefs::kDeleteBrowsingHistory); |
| 541 prefs->ClearPref(browsing_data::prefs::kDeleteCookies); | 540 prefs->ClearPref(browsing_data::prefs::kDeleteCookies); |
| 542 prefs->ClearPref(browsing_data::prefs::kDeleteCache); | 541 prefs->ClearPref(browsing_data::prefs::kDeleteCache); |
| 543 prefs->ClearPref(browsing_data::prefs::kDeletePasswords); | 542 prefs->ClearPref(browsing_data::prefs::kDeletePasswords); |
| 544 prefs->ClearPref(browsing_data::prefs::kDeleteFormData); | 543 prefs->ClearPref(browsing_data::prefs::kDeleteFormData); |
| 545 } | 544 } |
| 546 | 545 |
| 547 @end | 546 @end |
| OLD | NEW |