Bug 664158 - move content/base/test/chrome/test_bug574596.html to mochitest-chrome. r=mats, a=test-only
authorJoel Maher <jmaher@mozilla.com>
Sun, 19 Jun 2011 11:57:09 -0400
changeset 71572 058a584ea7d36ac40d6f93ed5a0cbb1f18f9b3ee
parent 71571 d8b8e75bc4ab7a5bb88a226e530d16df5fb03dc7
child 71574 1bc7e99950842908f127e7dc603b84492fc6107b
push id209
push userbzbarsky@mozilla.com
push dateTue, 05 Jul 2011 17:42:16 +0000
treeherdermozilla-aurora@cc6e30cce8af [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmats, test-only
bugs664158, 574596
milestone7.0a1
Bug 664158 - move content/base/test/chrome/test_bug574596.html to mochitest-chrome. r=mats, a=test-only
content/base/test/Makefile.in
content/base/test/chrome/Makefile.in
content/base/test/chrome/test_bug574596.html
content/base/test/test_bug574596.html
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -422,17 +422,16 @@ include $(topsrcdir)/config/rules.mk
 		file_x-frame-options_main.html \
 		file_x-frame-options_page.sjs \
 		test_createHTMLDocument.html \
 		test_bug622088.html \
 		file_bug622088_inner.html \
 		file_bug622088.sjs \
 		test_bug564047.html \
 		test_bug567350.html \
-		test_bug574596.html \
 		test_bug578096.html \
 		test_bug585978.html \
 		test_bug592366.html \
 		test_bug597345.html \
 		script-1_bug597345.sjs \
 		script-2_bug597345.js \
 		test_bug598877.html \
 		test_bug599588.html \
--- a/content/base/test/chrome/Makefile.in
+++ b/content/base/test/chrome/Makefile.in
@@ -60,15 +60,16 @@ include $(topsrcdir)/config/rules.mk
     test_bug616841.xul \
     file_bug616841.xul \
     test_bug635835.xul \
     test_fileconstructor.xul \
     fileconstructor_file.png \
     test_bug339494.xul \
     test_bug357450.xul \
     test_bug571390.xul \
+    test_bug574596.html \
     $(NULL)
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 
 libs:: $(_CHROME_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
rename from content/base/test/test_bug574596.html
rename to content/base/test/chrome/test_bug574596.html
--- a/content/base/test/test_bug574596.html
+++ b/content/base/test/chrome/test_bug574596.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=574596
 -->
 <head>
   <title>Test for Bug 574596</title>
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <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"/>
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <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"/>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=574596">Mozilla Bug 574596</a>
 <style type="text/css">
 #link1 a { -moz-user-select:none; }
 </style>
 <div id="link1"><a href="http://www.mozilla.org/">link1</a></div>
 <div id="link2"><a href="http://www.mozilla.org/">link2</a></div>
@@ -56,18 +56,16 @@ function dumpTransfer(dataTransfer,expec
       }
       dtData += "["+i+"]" + "["+j+"]: " + '"' + dtTypes[j] + '"  "' + actualData + '"\n';
     }
   }
   alert(dtData);
 }
 
 function runTest() {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
   var result = synthesizeDragStart($('link1'), dragLinkText, window);
   is(result, null, "Drag -moz-user-select:none link (#link1)");
   // if (result) dumpTransfer(result,dragLinkText);
 
   dragLinkText[0][2].data = "link2";
   dragLinkText[0][6].data = '<div id="link2"><a href="http://www.mozilla.org/">link2</a></div>'
   var result = synthesizeDragStart($('link2'), dragLinkText, window);
   is(result, null, "Drag link (#link2)");