Bug 1240958 - Don't test showModalDialog in test_bug414291.html if it isn't defined. r=mrbkap

This commit is contained in:
Andrew McCreight 2016-01-21 09:57:29 -08:00
Родитель e8d1a957e9
Коммит 5ed098eee8
2 изменённых файлов: 6 добавлений и 5 удалений

Просмотреть файл

@ -76,7 +76,6 @@ skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug))
skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s
[test_bug411103.html]
[test_bug414291.html]
skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
[test_bug427744.html]
skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android'
[test_bug42976.html]

Просмотреть файл

@ -19,13 +19,15 @@ var result2 = 0;
var result3 = 0;
window.open("data:text/html,<html><body onload='close(); opener.result1 = 1;'>", "w1");
is(result1, 0, "window either opened as modal or loaded synchronously.");
is(result1, 0, "window should not be opened either as modal or loaded synchronously.");
window.open("data:text/html,<html><body onload='close(); opener.result2 = 2;'>", "w2", "modal=yes");
is(result2, 0, "window either opened as modal or data loaded synchronously.");
is(result2, 0, "window should not be opened either as modal or data loaded synchronously.");
result3 = window.showModalDialog("data:text/html,<html><body onload='close(); returnValue = 3;'>");
is(result3, 3, "window didn't open as modal.");
if (window.showModalDialog) {
result3 = window.showModalDialog("data:text/html,<html><body onload='close(); returnValue = 3;'>");
is(result3, 3, "window should be opened as modal.");
}
</script>
</pre>