From 283d26538e2107b471feef7e7da89a3806c9975b Mon Sep 17 00:00:00 2001 From: Lichun Zhan Date: Fri, 20 Dec 2013 10:08:08 -0800 Subject: [PATCH] issue #1306: update tests to verify the view path works for both ac.done and ac.partial.render --- .../frameworkapp/common/mojits/ACMojit/controller.common.js | 2 +- .../mojits/ACMojit/views/{ => testdir}/mytemplate1.mu.html | 0 .../common/mojits/PartialMojit/controller.common.js | 2 +- .../common/mojits/PartialMojit/views/{ => testdir}/sub.mu.html | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename tests/func/applications/frameworkapp/common/mojits/ACMojit/views/{ => testdir}/mytemplate1.mu.html (100%) rename tests/func/applications/frameworkapp/common/mojits/PartialMojit/views/{ => testdir}/sub.mu.html (100%) diff --git a/tests/func/applications/frameworkapp/common/mojits/ACMojit/controller.common.js b/tests/func/applications/frameworkapp/common/mojits/ACMojit/controller.common.js index 339d40faa..eb4fde0a2 100644 --- a/tests/func/applications/frameworkapp/common/mojits/ACMojit/controller.common.js +++ b/tests/func/applications/frameworkapp/common/mojits/ACMojit/controller.common.js @@ -63,7 +63,7 @@ YUI.add('ActionContextMojit', function(Y, NAME) { }else if(test=="done9"){ ac.done({ foo: null }, {view: {name: "mytemplate1"}}); }else if(test=="done10"){ - ac.done({ foo: [ 1, 2, null, 4 ]}, {view: {name: "mytemplate1"}} ); + ac.done({ foo: [ 1, 2, null, 4 ]}, {view: {name: "testdir/mytemplate1"}} ); }else if(test=="flush8"){ ac.flush({data:"Hello, world!--from flush"}, {view: {name: "mytemplate"}}); ac.done(); diff --git a/tests/func/applications/frameworkapp/common/mojits/ACMojit/views/mytemplate1.mu.html b/tests/func/applications/frameworkapp/common/mojits/ACMojit/views/testdir/mytemplate1.mu.html similarity index 100% rename from tests/func/applications/frameworkapp/common/mojits/ACMojit/views/mytemplate1.mu.html rename to tests/func/applications/frameworkapp/common/mojits/ACMojit/views/testdir/mytemplate1.mu.html diff --git a/tests/func/applications/frameworkapp/common/mojits/PartialMojit/controller.common.js b/tests/func/applications/frameworkapp/common/mojits/PartialMojit/controller.common.js index 90a5acf1d..ddbace524 100644 --- a/tests/func/applications/frameworkapp/common/mojits/PartialMojit/controller.common.js +++ b/tests/func/applications/frameworkapp/common/mojits/PartialMojit/controller.common.js @@ -43,7 +43,7 @@ YUI.add('PartialMojit', function(Y, NAME) { ac.done(mymarkup); });*/ //ac.done(data); - ac.partial.render(data, "sub", function(error, mymarkup){ + ac.partial.render(data, "testdir/sub", function(error, mymarkup){ Y.log("HereController....."+mymarkup); ac.done(mymarkup); }) diff --git a/tests/func/applications/frameworkapp/common/mojits/PartialMojit/views/sub.mu.html b/tests/func/applications/frameworkapp/common/mojits/PartialMojit/views/testdir/sub.mu.html similarity index 100% rename from tests/func/applications/frameworkapp/common/mojits/PartialMojit/views/sub.mu.html rename to tests/func/applications/frameworkapp/common/mojits/PartialMojit/views/testdir/sub.mu.html