OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 /** @fileoverview Suite of tests for site-details. */ | 5 /** @fileoverview Suite of tests for site-details. */ |
6 suite('SiteDetailsPermission', function() { | 6 suite('SiteDetailsPermission', function() { |
7 /** | 7 /** |
8 * A site list element created before each test. | 8 * A site list element created before each test. |
9 * @type {SiteDetailsPermission} | 9 * @type {SiteDetailsPermission} |
10 */ | 10 */ |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
85 test('camera category', function() { | 85 test('camera category', function() { |
86 var origin = 'https://www.example.com'; | 86 var origin = 'https://www.example.com'; |
87 browserProxy.setPrefs(prefs); | 87 browserProxy.setPrefs(prefs); |
88 testElement.category = settings.ContentSettingsTypes.CAMERA; | 88 testElement.category = settings.ContentSettingsTypes.CAMERA; |
89 testElement.label = 'Camera'; | 89 testElement.label = 'Camera'; |
90 testElement.site = { | 90 testElement.site = { |
91 origin: origin, | 91 origin: origin, |
92 embeddingOrigin: '', | 92 embeddingOrigin: '', |
93 }; | 93 }; |
94 | 94 |
95 return browserProxy.whenCalled('getExceptionList') | 95 assertFalse(testElement.$.details.hidden); |
96 .then(function() { | |
97 assertFalse(testElement.$.details.hidden); | |
98 | 96 |
99 var header = testElement.$.details.querySelector('#permissionHeader'); | 97 var header = testElement.$.details.querySelector('#permissionHeader'); |
100 assertEquals( | 98 assertEquals( |
101 'Camera', header.innerText.trim(), | 99 'Camera', header.innerText.trim(), |
102 'Widget should be labelled correctly'); | 100 'Widget should be labelled correctly'); |
103 | 101 |
104 // Flip the permission and validate that prefs stay in sync. | 102 // Flip the permission and validate that prefs stay in sync. |
tsergeant
2017/06/21 01:49:56
As in old version of the test, you need promises h
Patti Lor
2017/06/21 06:36:37
Thanks Tim! Fixed.
| |
105 return validatePermissionFlipWorks( | 103 validatePermissionFlipWorks(origin, settings.PermissionValues.ALLOW); |
106 origin, settings.PermissionValues.ALLOW); | 104 validatePermissionFlipWorks(origin, settings.PermissionValues.BLOCK); |
107 }) | 105 validatePermissionFlipWorks(origin, settings.PermissionValues.ALLOW); |
108 .then(function() { | |
109 return validatePermissionFlipWorks( | |
110 origin, settings.PermissionValues.BLOCK); | |
111 }) | |
112 .then(function() { | |
113 return validatePermissionFlipWorks( | |
114 origin, settings.PermissionValues.ALLOW); | |
115 }); | |
116 }); | 106 }); |
117 | 107 |
118 test('cookies category', function() { | 108 test('cookies category', function() { |
119 var origin = 'https://www.example.com'; | 109 var origin = 'https://www.example.com'; |
120 browserProxy.setPrefs(prefsCookies); | 110 browserProxy.setPrefs(prefsCookies); |
121 testElement.category = settings.ContentSettingsTypes.COOKIES; | 111 testElement.category = settings.ContentSettingsTypes.COOKIES; |
122 testElement.label = 'Cookies'; | 112 testElement.label = 'Cookies'; |
123 testElement.site = { | 113 testElement.site = { |
124 origin: origin, | 114 origin: origin, |
125 embeddingOrigin: '', | 115 embeddingOrigin: '', |
126 }; | 116 }; |
127 | 117 |
128 return browserProxy.whenCalled('getExceptionList') | 118 assertFalse(testElement.$.details.hidden); |
129 .then(function() { | |
130 assertFalse(testElement.$.details.hidden); | |
131 | 119 |
132 var header = testElement.$.details.querySelector('#permissionHeader'); | 120 var header = testElement.$.details.querySelector('#permissionHeader'); |
133 assertEquals( | 121 assertEquals( |
134 'Cookies', header.innerText.trim(), | 122 'Cookies', header.innerText.trim(), |
135 'Widget should be labelled correctly'); | 123 'Widget should be labelled correctly'); |
136 | 124 |
137 return validatePermissionFlipWorks( | 125 // Flip the permission and validate that prefs stay in sync. |
tsergeant
2017/06/21 01:49:56
As above, use promises here too.
Patti Lor
2017/06/21 06:36:37
Done.
| |
138 origin, settings.PermissionValues.SESSION_ONLY); | 126 validatePermissionFlipWorks(origin, settings.PermissionValues.SESSION_ONLY); |
139 }) | 127 validatePermissionFlipWorks(origin, settings.PermissionValues.ALLOW); |
140 .then(function() { | 128 validatePermissionFlipWorks(origin, settings.PermissionValues.BLOCK); |
141 // Flip the permission and validate that prefs stay in sync. | |
142 return validatePermissionFlipWorks( | |
143 origin, settings.PermissionValues.ALLOW); | |
144 }) | |
145 .then(function() { | |
146 return validatePermissionFlipWorks( | |
147 origin, settings.PermissionValues.BLOCK); | |
148 }); | |
149 }); | 129 }); |
150 }); | 130 }); |
OLD | NEW |