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

Side by Side Diff: chrome/browser/ui/webui/settings_browsertest.cc

Issue 6902019: Revert 82950 - Add a test for checking that refreshing a page does load the same WebUI page.BUG=5... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/test/data/webui/settings.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/browser/ui/webui/options/core_options_handler.h" 5 #include "chrome/browser/ui/webui/options/core_options_handler.h"
6 #include "chrome/common/url_constants.h" 6 #include "chrome/common/url_constants.h"
7 #include "chrome/test/ui_test_utils.h" 7 #include "chrome/test/ui_test_utils.h"
8 #include "content/browser/webui/web_ui_browsertest.h" 8 #include "content/browser/webui/web_ui_browsertest.h"
9 #include "googleurl/src/gurl.h" 9 #include "googleurl/src/gurl.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 // the message setBooleanPref. 90 // the message setBooleanPref.
91 // TODO(dtseng): add more EXPECT_CALL's when updating js test. 91 // TODO(dtseng): add more EXPECT_CALL's when updating js test.
92 92
93 // Crashes on Mac only. See http://crbug.com/79181 93 // Crashes on Mac only. See http://crbug.com/79181
94 #if defined(OS_MACOSX) 94 #if defined(OS_MACOSX)
95 #define MAYBE_TestSetBooleanPrefTriggers DISABLED_TestSetBooleanPrefTriggers 95 #define MAYBE_TestSetBooleanPrefTriggers DISABLED_TestSetBooleanPrefTriggers
96 #else 96 #else
97 #define MAYBE_TestSetBooleanPrefTriggers TestSetBooleanPrefTriggers 97 #define MAYBE_TestSetBooleanPrefTriggers TestSetBooleanPrefTriggers
98 #endif 98 #endif
99 IN_PROC_BROWSER_TEST_F(SettingsWebUITest, MAYBE_TestSetBooleanPrefTriggers) { 99 IN_PROC_BROWSER_TEST_F(SettingsWebUITest, MAYBE_TestSetBooleanPrefTriggers) {
100 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUISettingsURL));
101 // This serves as an example of a very constrained test. 100 // This serves as an example of a very constrained test.
102 ListValue true_list_value; 101 ListValue true_list_value;
103 true_list_value.Append(Value::CreateStringValue("browser.show_home_button")); 102 true_list_value.Append(Value::CreateStringValue("browser.show_home_button"));
104 true_list_value.Append(Value::CreateBooleanValue(true)); 103 true_list_value.Append(Value::CreateBooleanValue(true));
105 true_list_value.Append( 104 true_list_value.Append(
106 Value::CreateStringValue("Options_Homepage_HomeButton")); 105 Value::CreateStringValue("Options_Homepage_HomeButton"));
107 106 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUISettingsURL));
108 EXPECT_CALL(*mock_core_options_handler_, 107 EXPECT_CALL(*mock_core_options_handler_,
109 HandleSetBooleanPref(Eq_ListValue(&true_list_value))); 108 HandleSetBooleanPref(Eq_ListValue(&true_list_value)));
110 ASSERT_TRUE(RunJavascriptTest("testSetBooleanPrefTriggers")); 109 ASSERT_TRUE(RunJavascriptTest("testSetBooleanPrefTriggers"));
111 } 110 }
112
113 IN_PROC_BROWSER_TEST_F(SettingsWebUITest, testRefreshStaysOnCurrentPage) {
114 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUISettingsURL));
115 ASSERT_TRUE(RunJavascriptFunction("openUnderTheHood"));
116 ASSERT_TRUE(RunJavascriptFunction("refreshPage"));
117 ASSERT_TRUE(RunJavascriptTest("testPageIsUnderTheHood"));
118 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/webui/settings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698