From 9ff8e0eb8711af16a800f38077717fa6143f2373 Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Tue, 12 Nov 2013 16:43:35 -0800 Subject: [PATCH] Bug 840488 - Tests. r=bz --- caps/tests/mochitest/Makefile.in | 10 - caps/tests/mochitest/chrome.ini | 4 + caps/tests/mochitest/file_disableScript.html | 11 + caps/tests/mochitest/mochitest.ini | 2 + caps/tests/mochitest/moz.build | 1 + caps/tests/mochitest/test_disableScript.xul | 321 +++++++++++++++++++ 6 files changed, 339 insertions(+), 10 deletions(-) delete mode 100644 caps/tests/mochitest/Makefile.in create mode 100644 caps/tests/mochitest/chrome.ini create mode 100644 caps/tests/mochitest/file_disableScript.html create mode 100644 caps/tests/mochitest/test_disableScript.xul diff --git a/caps/tests/mochitest/Makefile.in b/caps/tests/mochitest/Makefile.in deleted file mode 100644 index a5b8059332f9c..0000000000000 --- a/caps/tests/mochitest/Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# jarPrefix test doesn't work on Windows, see bug 776296. -ifneq ($(OS_ARCH),WINNT) -MOCHITEST_CHROME_FILES = test_principal_jarprefix_origin_appid_appstatus.html \ - $(NULL) -endif diff --git a/caps/tests/mochitest/chrome.ini b/caps/tests/mochitest/chrome.ini new file mode 100644 index 0000000000000..a8d68586aee17 --- /dev/null +++ b/caps/tests/mochitest/chrome.ini @@ -0,0 +1,4 @@ +[test_disableScript.xul] +[test_principal_jarprefix_origin_appid_appstatus.html] +# jarPrefix test doesn't work on Windows, see bug 776296. +skip-if = os == "win" diff --git a/caps/tests/mochitest/file_disableScript.html b/caps/tests/mochitest/file_disableScript.html new file mode 100644 index 0000000000000..f4888cd586bdb --- /dev/null +++ b/caps/tests/mochitest/file_disableScript.html @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/caps/tests/mochitest/mochitest.ini b/caps/tests/mochitest/mochitest.ini index 71e0b8b281088..10b7df1c56552 100644 --- a/caps/tests/mochitest/mochitest.ini +++ b/caps/tests/mochitest/mochitest.ini @@ -1,4 +1,6 @@ [DEFAULT] +support-files = + file_disableScript.html [test_app_principal_equality.html] [test_bug246699.html] diff --git a/caps/tests/mochitest/moz.build b/caps/tests/mochitest/moz.build index 3cf16eb0cfe85..76deffb6d1f31 100644 --- a/caps/tests/mochitest/moz.build +++ b/caps/tests/mochitest/moz.build @@ -5,4 +5,5 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. MOCHITEST_MANIFESTS += ['mochitest.ini'] +MOCHITEST_CHROME_MANIFESTS += ['chrome.ini'] diff --git a/caps/tests/mochitest/test_disableScript.xul b/caps/tests/mochitest/test_disableScript.xul new file mode 100644 index 0000000000000..54e7f7f20eeaf --- /dev/null +++ b/caps/tests/mochitest/test_disableScript.xul @@ -0,0 +1,321 @@ + + + + + + +