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

Unified Diff: ios/web/shell/test/navigation_egtest.mm

Issue 2624263004: Re-enable NavigationTestCase on device. (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/shell/test/navigation_egtest.mm
diff --git a/ios/web/shell/test/navigation_egtest.mm b/ios/web/shell/test/navigation_egtest.mm
index 00839f661bdc7bda73055c23340280e9a34712a1..8f7f818d2c5291ddaf06d662978fff218ba99d7d 100644
--- a/ios/web/shell/test/navigation_egtest.mm
+++ b/ios/web/shell/test/navigation_egtest.mm
@@ -44,14 +44,8 @@
assertWithMatcher:grey_notNil()];
}
-// TODO(crbug.com/675015): Re-enable this test on device.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testNavigationBackAndForward testNavigationBackAndForward
-#else
-#define MAYBE_testNavigationBackAndForward FLAKY_testNavigationBackAndForward
-#endif
// Tests the back and forward button after entering two URLs.
-- (void)MAYBE_testNavigationBackAndForward {
+- (void)testNavigationBackAndForward {
// Create map of canned responses and set up the test HTML server.
std::map<GURL, std::string> responses;
const GURL URL1 = web::test::HttpServer::MakeUrl("http://firstURL");
@@ -91,16 +85,8 @@
assertWithMatcher:grey_notNil()];
}
-// TODO(crbug.com/675015): Re-enable this test on device.
-#if TARGET_IPHONE_SIMULATOR
-#define MAYBE_testNavigationBackAndForwardAfterFragmentLink \
- testNavigationBackAndForwardAfterFragmentLink
-#else
-#define MAYBE_testNavigationBackAndForwardAfterFragmentLink \
- FLAKY_testNavigationBackAndForwardAfterFragmentLink
-#endif
// Tests back and forward navigation where a fragment link is tapped.
-- (void)MAYBE_testNavigationBackAndForwardAfterFragmentLink {
+- (void)testNavigationBackAndForwardAfterFragmentLink {
// Create map of canned responses and set up the test HTML server.
std::map<GURL, std::string> responses;
const GURL URL1 = web::test::HttpServer::MakeUrl("http://fragmentLink");
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698