Bug 1172382 - Disable AccessibleCaret on some tests. r=roc

All the tests disabled for AccessibleCaret had already being disabled
for either TouchCaret or SelectionCarets.
This commit is contained in:
Ting-Yu Lin 2015-07-27 11:56:04 +08:00
parent ebed331afc
commit f40c4d3ca9
4 changed files with 12 additions and 8 deletions

View File

@ -52,7 +52,8 @@ function isEnabledMiddleClickPaste()
function isEnabledTouchCaret()
{
try {
return SpecialPowers.getBoolPref("touchcaret.enabled");
return SpecialPowers.getBoolPref("touchcaret.enabled") ||
SpecialPowers.getBoolPref("layout.accessiblecaret.enabled");
} catch (e) {
return false;
}

View File

@ -104,11 +104,11 @@ skip-if(Android||B2G||Mulet) needs-focus == 462758-grabbers-resizers.html 462758
== 388980-1.html 388980-1-ref.html
needs-focus == spellcheck-superscript-1.html spellcheck-superscript-1-ref.html
skip-if(B2G||Mulet) fails-if(Android) needs-focus != spellcheck-superscript-2.html spellcheck-superscript-2-ref.html # bug 783658 # Initial mulet triage: parity with B2G/B2G Desktop
needs-focus pref(selectioncaret.enabled,false) == 824080-1.html 824080-1-ref.html
needs-focus pref(selectioncaret.enabled,false) pref(layout.accessiblecaret.enabled,false) == 824080-1.html 824080-1-ref.html
needs-focus pref(selectioncaret.enabled,false) == 824080-2.html 824080-2-ref.html
needs-focus pref(selectioncaret.enabled,false) == 824080-3.html 824080-3-ref.html
needs-focus != 824080-2.html 824080-3.html
needs-focus pref(selectioncaret.enabled,false) == 824080-4.html 824080-4-ref.html
needs-focus pref(selectioncaret.enabled,false) pref(layout.accessiblecaret.enabled,false) == 824080-4.html 824080-4-ref.html
needs-focus pref(selectioncaret.enabled,false) == 824080-5.html 824080-5-ref.html
needs-focus != 824080-4.html 824080-5.html
needs-focus == 824080-6.html 824080-6-ref.html

View File

@ -28,7 +28,8 @@
SimpleTest.waitForExplicitFinish();
// Selection caret's pref is checked only when PresShell is initialized. To turn
// off the pref, we test bug 558663 in an iframe.
SpecialPowers.pushPrefEnv({"set": [['selectioncaret.enabled', false]]}, function() {
SpecialPowers.pushPrefEnv({"set": [['selectioncaret.enabled', false],
['layout.accessiblecaret.enabled', false]]}, function() {
var iframe = document.createElement("iframe");
iframe.src = "bug558663.html";
document.getElementById('container').appendChild(iframe);

View File

@ -109,8 +109,9 @@ var tests = [
// The following test cases are all involving with one sending
// synthesizeKey(), the other without. They fail when the touch
// or selection caret is enabled. Test them with these preferences off.
function() {SpecialPowers.pushPrefEnv({'set': [['touchcaret.enabled', false]]}, nextTest);} ,
function() {SpecialPowers.pushPrefEnv({'set': [['selectioncaret.enabled', false]]}, nextTest);} ,
function() {SpecialPowers.pushPrefEnv({'set': [['touchcaret.enabled', false],
['selectioncaret.enabled', false],
['layout.accessiblecaret.enabled', false]]}, nextTest);} ,
[ 'bug240933-1.html' , 'bug240933-1-ref.html' ] ,
[ 'bug240933-2.html' , 'bug240933-1-ref.html' ] ,
[ 'bug389321-1.html' , 'bug389321-1-ref.html' ] ,
@ -156,8 +157,9 @@ var tests = [
[ 'bug1123067-2.html' , 'bug1123067-ref.html' ] ,
[ 'bug1123067-3.html' , 'bug1123067-ref.html' ] ,
[ 'bug1132768-1.html' , 'bug1132768-1-ref.html'] ,
function() {SpecialPowers.pushPrefEnv({'clear': [['touchcaret.enabled']]}, nextTest);} ,
function() {SpecialPowers.pushPrefEnv({'clear': [['selectioncaret.enabled']]}, nextTest);} ,
function() {SpecialPowers.pushPrefEnv({'clear': [['touchcaret.enabled'],
['selectioncaret.enabled'],
['layout.accessiblecaret.enabled']]}, nextTest);} ,
];
if (navigator.appVersion.indexOf("Android") == -1 &&