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

Unified Diff: chrome/browser/ui/webui/extensions/extension_settings_browsertest.js

Issue 1060973004: Enable tests related to the extensions web ui that were flaky. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Testing Created 5 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
« no previous file with comments | « no previous file | chrome/test/data/webui/print_preview.js » ('j') | chrome/test/data/webui/test_api.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/extensions/extension_settings_browsertest.js
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.js b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.js
index 8183dc84cac804e3b2b14191ee045603b73a5346..a1b40e9ae3fe0f08b12ff589c49980a90f071a0b 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.js
+++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.js
@@ -49,14 +49,7 @@ ExtensionSettingsWebUITest.prototype = {
/** @override */
setUp: function() {
- // Make all transitions take 0ms for testing purposes.
- var noTransitionStyle = document.createElement('style');
- noTransitionStyle.textContent =
- '* {' +
- ' -webkit-transition-duration: 0ms !important;' +
- ' -webkit-transition-delay: 0ms !important;' +
- '}';
- document.querySelector('head').appendChild(noTransitionStyle);
+ this.disableAnimationsAndTransitions();
},
/**
@@ -114,7 +107,7 @@ ExtensionSettingsWebUITest.prototype = {
this.verifyDeveloperModeWorks,
testDone];
this.nextStep();
- }
+ },
};
// Verify that developer mode doesn't change behavior when the number of
@@ -251,8 +244,7 @@ AsyncExtensionSettingsWebUITest.prototype = {
};
// Often times out on all platforms: http://crbug.com/467528
-TEST_F('AsyncExtensionSettingsWebUITest',
- 'DISABLED_testErrorListButtonVisibility',
+TEST_F('AsyncExtensionSettingsWebUITest', 'testErrorListButtonVisibility',
function() {
var testButtonVisibility = function() {
// 2 extensions are loaded:
@@ -262,15 +254,17 @@ TEST_F('AsyncExtensionSettingsWebUITest',
// This means 2 buttons: 1 visible and 1 hidden.
var visibleButtons = document.querySelectorAll(
'.extension-error-list-show-more > a:not([hidden])');
- assertEquals(1, visibleButtons.length);
+ expectEquals(1, visibleButtons.length);
// Visible buttons must be part of the focusRow.
- assertTrue(visibleButtons[0].hasAttribute('column-type'));
+ expectTrue(visibleButtons[0] &&
+ visibleButtons[0].hasAttribute('column-type'));
var hiddenButtons = document.querySelectorAll(
'.extension-error-list-show-more > a[hidden]');
- assertEquals(1, hiddenButtons.length);
+ expectEquals(1, hiddenButtons.length);
// Hidden buttons must NOT be part of the focusRow.
- assertFalse(hiddenButtons[0].hasAttribute('column-type'));
+ expectFalse(hiddenButtons[0] &&
+ hiddenButtons[0].hasAttribute('column-type'));
this.nextStep();
};
« no previous file with comments | « no previous file | chrome/test/data/webui/print_preview.js » ('j') | chrome/test/data/webui/test_api.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698