Bug 1261507 - Convert mochitest-chrome test_hover.html to mochitest-plain so it's runnable with e10s.
MozReview-Commit-ID: J6cUsAkWWJT
--- a/layout/style/test/chrome/chrome.ini
+++ b/layout/style/test/chrome/chrome.ini
@@ -1,22 +1,19 @@
[DEFAULT]
skip-if = buildapp == 'b2g' || os == 'android'
support-files =
bug418986-2.js
bug535806-css.css
bug535806-html.html
bug535806-xul.xul
- hover_helper.html
match.png
mismatch.png
[test_author_specified_style.html]
[test_bug418986-2.xul]
[test_bug1157097.html]
[test_bug1160724.xul]
[test_bug535806.xul]
[test_display_mode.html]
[test_display_mode_reflow.html]
tags = fullscreen
-[test_hover.html]
-skip-if = buildapp == 'mulet'
[test_moz_document_rules.html]
rename from layout/style/test/chrome/hover_empty.html
rename to layout/style/test/hover_empty.html
rename from layout/style/test/chrome/hover_helper.html
rename to layout/style/test/hover_helper.html
--- a/layout/style/test/chrome/hover_helper.html
+++ b/layout/style/test/hover_helper.html
@@ -1,13 +1,13 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test for :hover</title>
- <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
+ <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
<style type="text/css">
div#one { height: 10px; width: 10px; }
div#one:hover { background: #00f; }
div#one > div { height: 5px; width: 20px; }
div#one > div:hover { background: #f00; }
div#twoparent { overflow: hidden; height: 20px; }
@@ -32,17 +32,17 @@
</div>
</div>
<pre id="test">
<script type="application/javascript">
var imports = [ "SimpleTest", "is", "isnot", "ok" ];
for (var name of imports) {
- window[name] = window.opener.wrappedJSObject[name];
+ window[name] = window.opener[name];
}
var div = document.getElementById("display");
var divtwo = document.getElementById("two");
var iframe = document.getElementById("twoi");
var divtwoparent = document.getElementById("twoparent");
iframe.contentDocument.open();
--- a/layout/style/test/mochitest.ini
+++ b/layout/style/test/mochitest.ini
@@ -5,16 +5,18 @@ support-files =
ccd.sjs
ccd-standards.html
chrome/bug418986-2.js
chrome/match.png
chrome/mismatch.png
descriptor_database.js
display_mode_reflow_iframe.html
empty.html
+ hover_empty.html
+ hover_helper.html
media_queries_dynamic_xbl_binding.xml
media_queries_dynamic_xbl_iframe.html
media_queries_dynamic_xbl_style.css
media_queries_iframe.html
neverending_font_load.sjs
neverending_stylesheet_load.sjs
post-redirect-1.css
post-redirect-2.css
@@ -197,16 +199,18 @@ support-files =
file_font_loading_api_vframe.html
[test_garbage_at_end_of_declarations.html]
skip-if = (toolkit == 'gonk' && debug) # Bug 1186440
[test_grid_container_shorthands.html]
[test_grid_item_shorthands.html]
[test_grid_shorthand_serialization.html]
[test_grid_computed_values.html]
[test_group_insertRule.html]
+[test_hover.html]
+skip-if = buildapp == 'mulet'
[test_hover_quirk.html]
[test_html_attribute_computed_values.html]
[test_ident_escaping.html]
[test_inherit_computation.html]
skip-if = toolkit == 'android'
[test_inherit_storage.html]
[test_initial_computation.html]
skip-if = toolkit == 'android'
rename from layout/style/test/chrome/test_hover.html
rename to layout/style/test/test_hover.html
--- a/layout/style/test/chrome/test_hover.html
+++ b/layout/style/test/test_hover.html
@@ -1,15 +1,15 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test for :hover</title>
- <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
- <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
- <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+ <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+ <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+ <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body onload="startTest();">
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=">Mozilla Bug </a>
<div id="display">
</div>
<pre id="test">
<script type="application/javascript">