Bug 924523 - Part a: use mochitest manifests in dom/tests/mochitest/ajax/jquery; r=jst

dom/tests/mochitest/ajax/jquery/dist/Makefile.in

@@ -1,8 +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/.
-
-MOCHITEST_FILES	= \
-	jquery.js \
-	$(NULL)

dom/tests/mochitest/ajax/jquery/dist/moz.build

@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-

dom/tests/mochitest/ajax/jquery/mochitest.ini

@@ -1,4 +1,36 @@
 [DEFAULT]
-support-files = manifest.json
+support-files =
+  manifest.json
+  dist/jquery.js
+  test/index.html
+  test/offset.html
+  test/test.js
+  test/fix.html
+  test/data/cow.jpg
+  test/data/dashboard.xml
+  test/data/iframe.html
+  test/data/json_assigned_obj.js
+  test/data/json_obj.js
+  test/data/name.html
+  test/data/test.html
+  test/data/test.js
+  test/data/test2.html
+  test/data/test3.html
+  test/data/testrunner.js
+  test/data/testsuite.css
+  test/data/with_fries.xml
+  test/data/offset/absolute.html
+  test/data/offset/fixed.html
+  test/data/offset/relative.html
+  test/data/offset/scroll.html
+  test/data/offset/static.html
+  test/data/offset/table.html
+  test/unit/ajax.js
+  test/unit/core.js
+  test/unit/dimensions.js
+  test/unit/event.js
+  test/unit/fx.js
+  test/unit/offset.js
+  test/unit/selector.js
 
 [test_jQuery.html]

dom/tests/mochitest/ajax/jquery/moz.build

@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-DIRS += ['dist', 'test']
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-

dom/tests/mochitest/ajax/jquery/test/Makefile.in

@@ -1,11 +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/.
-
-MOCHITEST_FILES	= \
-	index.html \
-	offset.html \
-	test.js \
-	fix.html \
-	$(NULL)

dom/tests/mochitest/ajax/jquery/test/data/Makefile.in

@@ -1,20 +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/.
-
-MOCHITEST_FILES	= \
-	cow.jpg \
-	dashboard.xml \
-	iframe.html \
-	json_assigned_obj.js \
-	json_obj.js \
-	name.html \
-	test.html \
-	test.js \
-	test2.html \
-	test3.html \
-	testrunner.js \
-	testsuite.css \
-	with_fries.xml \
-	$(NULL)

dom/tests/mochitest/ajax/jquery/test/data/moz.build

@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-DIRS += ['offset']

dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in

@@ -1,13 +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/.
-
-MOCHITEST_FILES	= \
-	absolute.html \
-	fixed.html \
-	relative.html \
-	scroll.html \
-	static.html \
-	table.html \
-	$(NULL)

dom/tests/mochitest/ajax/jquery/test/data/offset/moz.build

@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-

dom/tests/mochitest/ajax/jquery/test/moz.build

@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-DIRS += ['data', 'unit']

dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in

@@ -1,14 +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/.
-
-MOCHITEST_FILES	= \
-	ajax.js \
-	core.js \
-	dimensions.js \
-	event.js \
-	fx.js \
-	offset.js \
-	selector.js \
-	$(NULL)

dom/tests/mochitest/ajax/jquery/test/unit/moz.build

@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-

dom/tests/mochitest/ajax/moz.build

@@ -10,5 +10,9 @@ DIRS += [
     'offline',
     'mochikit',
     'scriptaculous',
-    'jquery',
 ]
+
+MOCHITEST_MANIFESTS += [
+    'jquery/mochitest.ini',
+]
+