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

Unified Diff: chrome/test/data/webui/settings/site_details_permission_tests.js

Issue 1863623002: Convert Site Details to settings-subpage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge Created 4 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
Index: chrome/test/data/webui/settings/site_details_permission_tests.js
diff --git a/chrome/test/data/webui/settings/site_details_permission_tests.js b/chrome/test/data/webui/settings/site_details_permission_tests.js
index 0e5bb8825a6a795b085a4570c5f5062014f428f3..a3c4fe6486c63cb613aa88ed9c0aa2b5c50abaae 100644
--- a/chrome/test/data/webui/settings/site_details_permission_tests.js
+++ b/chrome/test/data/webui/settings/site_details_permission_tests.js
@@ -80,7 +80,7 @@ cr.define('site_details_permission', function() {
}.bind(this));
});
- test('camera category', function() {
+ test('camera category', function(done) {
var origin = "https://foo-allow.com:443";
browserProxy.setPrefs(prefs);
testElement.category = settings.ContentSettingsTypes.CAMERA;
@@ -89,27 +89,30 @@ cr.define('site_details_permission', function() {
embeddingOrigin: '',
};
- return browserProxy.whenCalled('getExceptionList').then(function() {
- assertFalse(testElement.$.details.hidden);
+ browserProxy.whenCalled('getExceptionList').then(function() {
+ testElement.async(function() {
+ assertFalse(testElement.$.details.hidden);
- var header = testElement.$.details.querySelector(
- '.permission-header');
- assertEquals('Camera', header.innerText.trim(),
- 'Widget should be labelled correctly');
+ var header = testElement.$.details.querySelector(
+ '.permission-header');
+ assertEquals('Camera', header.innerText.trim(),
+ 'Widget should be labelled correctly');
- // Flip the permission and validate that prefs stay in sync.
- return validatePermissionFlipWorks(origin, true).then(function() {
- browserProxy.resetResolver('setCategoryPermissionForOrigin');
- return validatePermissionFlipWorks(origin, false).then(function() {
+ // Flip the permission and validate that prefs stay in sync.
+ validatePermissionFlipWorks(origin, true).then(function() {
browserProxy.resetResolver('setCategoryPermissionForOrigin');
- return validatePermissionFlipWorks(origin, true).then(function() {
+ validatePermissionFlipWorks(origin, false).then(function() {
+ browserProxy.resetResolver('setCategoryPermissionForOrigin');
+ validatePermissionFlipWorks(origin, true).then(function() {
+ done();
+ }.bind(this));
}.bind(this));
}.bind(this));
- }.bind(this));
+ });
}.bind(this));
});
- test('disappear on empty', function() {
+ test('disappear on empty', function(done) {
var origin = "https://foo-allow.com:443";
browserProxy.setPrefs(prefs);
testElement.category = settings.ContentSettingsTypes.CAMERA;
@@ -118,13 +121,16 @@ cr.define('site_details_permission', function() {
embeddingOrigin: '',
};
- return browserProxy.whenCalled('getExceptionList').then(function() {
- assertFalse(testElement.$.details.hidden);
+ browserProxy.whenCalled('getExceptionList').then(function() {
+ testElement.async(function() {
+ assertFalse(testElement.$.details.hidden);
- browserProxy.setPrefs(prefsEmpty);
- browserProxy.whenCalled('getExceptionList').then(function() {
- assertTrue(testElement.$.details.hidden);
- }.bind(this));
+ browserProxy.setPrefs(prefsEmpty);
+ browserProxy.whenCalled('getExceptionList').then(function() {
+ assertTrue(testElement.$.details.hidden);
+ done();
+ }.bind(this));
+ });
}.bind(this));
});
});

Powered by Google App Engine
This is Rietveld 408576698