[Pkg-javascript-commits] [dojo] 50/149: Clean up parseOnLoadDeclarativeRequire test so it can be run standalone, independent of Intern. Refs #18427.

Sat Feb 27 03:13:46 UTC 2016

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository dojo.

commit 87b41acd0a70b8cd2593ba69261ec56ca07dd438
Author: Bill Keese <bill at dojotoolkit.org>
Date:   Wed Mar 18 09:57:54 2015 +0900

    Clean up parseOnLoadDeclarativeRequire test so it can be run standalone,
    independent of Intern.  Refs #18427.
---
 .../parser/parseOnLoadDeclarativeRequire.html      | 12 +++++-----
 .../parser/parseOnLoadDeclarativeRequire.js        | 28 +++++++++-------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/tests/functional/parser/parseOnLoadDeclarativeRequire.html b/tests/functional/parser/parseOnLoadDeclarativeRequire.html
index 02d8540..406365b 100644
--- a/tests/functional/parser/parseOnLoadDeclarativeRequire.html
+++ b/tests/functional/parser/parseOnLoadDeclarativeRequire.html
@@ -16,13 +16,15 @@
 				baseUrl: '.',
 				packages: [
 					{ name: 'dojo', location: '../../../' }
-				],
-				callback: function () {
-					ready = true;
-				}
+				]
 			};
 		</script>
 		<script src="../../../dojo.js"></script>
+		<script>
+			dojo.ready(function(){
+				ready = true;
+			});
+		</script>
 	</head>
 	<body>
 		<h1>parseOnLoad:true, async:false unit test</h1>
@@ -55,7 +57,5 @@
 				return [amdmodule(value)];
 			</script>
 		</div>
-
-
 	</body>
 </html>
diff --git a/tests/functional/parser/parseOnLoadDeclarativeRequire.js b/tests/functional/parser/parseOnLoadDeclarativeRequire.js
index b4f846b..dd15f77 100644
--- a/tests/functional/parser/parseOnLoadDeclarativeRequire.js
+++ b/tests/functional/parser/parseOnLoadDeclarativeRequire.js
@@ -9,23 +9,17 @@ define([
 
 		test: function () {
 			return ready(this.get('remote'), require.toUrl('./parseOnLoadDeclarativeRequire.html'))
-				.setExecuteAsyncTimeout(5000)
-				.executeAsync(function (done) {
-					require([ 'dojo/ready' ], function (dojoReady) {
-						dojoReady(function () {
-							/* global dr1, dr2, dr3, dr4, dr5 */
-							done({
-								typeofDr1: typeof dr1,
-								dr1Foo: dr1.params.foo,
-								typeofDr2: typeof dr2,
-								dr2Foo: dr2.params.foo,
-								typeofDr3: typeof dr3,
-								dr3Foo: dr3.params.foo,
-								dr4Foo: dr4.params.foo,
-								dr5Method1: dr5.method1(1)
-							});
-						});
-					});
+				.execute(function () {
+					return {
+						typeofDr1: typeof dr1,
+						dr1Foo: dr1.params.foo,
+						typeofDr2: typeof dr2,
+						dr2Foo: dr2.params.foo,
+						typeofDr3: typeof dr3,
+						dr3Foo: dr3.params.foo,
+						dr4Foo: dr4.params.foo,
+						dr5Method1: dr5.method1(1)
+					};
 				})
 				.then(function (results) {
 					assert.deepEqual(results, {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git

