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

dom/tests/mochitest/ajax/moz.build

@@ -6,7 +6,6 @@
 
 DIRS += [
     'lib',
-    'scriptaculous',
 ]
 
 MOCHITEST_MANIFESTS += [
@@ -15,5 +14,6 @@ MOCHITEST_MANIFESTS += [
     'mochikit/tests/mochitest.ini',
     'offline/mochitest.ini',
     'prototype/mochitest.ini',
+    'scriptaculous/mochitest.ini',
 ]
 

dom/tests/mochitest/ajax/scriptaculous/lib/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	= \
-	prototype.js \
-	$(NULL)

dom/tests/mochitest/ajax/scriptaculous/lib/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/scriptaculous/mochitest.ini

@@ -1,4 +1,33 @@
 [DEFAULT]
-support-files = manifest.json
+support-files =
+  manifest.json
+  lib/prototype.js
+  src/builder.js
+  src/controls.js
+  src/dragdrop.js
+  src/effects.js
+  src/scriptaculous.js
+  src/slider.js
+  src/sound.js
+  src/unittest.js
+  test/unit/_ajax_inplaceeditor_result.html
+  test/unit/_ajax_inplaceeditor_text.html
+  test/unit/_ajax_updater_result.html
+  test/unit/_autocomplete_result.html
+  test/unit/_autocomplete_result_nobr.html
+  test/unit/ajax_autocompleter_test.html
+  test/unit/ajax_inplaceeditor_test.html
+  test/unit/bdd_test.html
+  test/unit/builder_test.html
+  test/unit/dragdrop_test.html
+  test/unit/effects_test.html
+  test/unit/element_test.html
+  test/unit/icon.png
+  test/unit/loading_test.html
+  test/unit/position_clone_test.html
+  test/unit/slider_test.html
+  test/unit/sortable_test.html
+  test/unit/string_test.html
+  test/unit/unit_test.html
 
 [test_Scriptaculous.html]

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

@@ -1,14 +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/.
-
-TEST_DIRS += [
-    'lib',
-    'src',
-    'test/unit',
-]
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-

dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in

@@ -1,15 +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	= \
-	builder.js \
-	controls.js \
-	dragdrop.js \
-	effects.js \
-	scriptaculous.js \
-	slider.js \
-	sound.js \
-	unittest.js \
-	$(NULL)

dom/tests/mochitest/ajax/scriptaculous/src/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/scriptaculous/test/unit/Makefile.in

@@ -1,26 +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_inplaceeditor_result.html \
-	_ajax_inplaceeditor_text.html \
-	_ajax_updater_result.html \
-	_autocomplete_result.html \
-	_autocomplete_result_nobr.html \
-	ajax_autocompleter_test.html \
-	ajax_inplaceeditor_test.html \
-	bdd_test.html \
-	builder_test.html \
-	dragdrop_test.html \
-	effects_test.html \
-	element_test.html \
-	icon.png \
-	loading_test.html \
-	position_clone_test.html \
-	slider_test.html \
-	sortable_test.html \
-	string_test.html \
-	unit_test.html \
-	$(NULL)

dom/tests/mochitest/ajax/scriptaculous/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/.
-