Merge pull request #97 from aselvaraj/more-promise-test

More promise test

package.json

@@ -47,6 +47,7 @@
         "sax": "^0.6.0"
     },
     "devDependencies": {
+        "bluebird": "^2.9.30",
         "chai": "~1.8.1",
         "dustjs-linkedin": "^2.3.4",
         "jshint": "^2.5.0",

test/fixtures/async-templates/async-fragment-error/expected.html

@@ -1 +0,0 @@
-1-An error has occurred!2-An error has occurred!

test/fixtures/async-templates/async-fragment-error/template.marko

@@ -1,9 +0,0 @@
-<async-fragment data-provider="data.userInfo" var="user">
-    <async-fragment-error>
-        1-An error has occurred!
-    </async-fragment-error>
-    1
-</async-fragment>
-<async-fragment data-provider="data.userInfo" var="user" error-message="2-An error has occurred!">
-    2
-</async-fragment>

test/fixtures/async-templates/async-fragment-error/test.js

@@ -1,20 +0,0 @@
-exports.tests = [
-    {
-        templateData: {
-            userInfo: function(done) {
-                done(new Error('Invalid user'));
-            }
-        },
-        expectedFile: require.resolve('./expected.html')
-    },
-    {
-        templateData: {
-            userInfo: function(done) {
-                setTimeout(function() {
-                    done(new Error('Invalid user'));
-                }, 200);
-            }
-        },
-        expectedFile: require.resolve('./expected.html')
-    }
-];

test/fixtures/async-templates/async-fragment-promise-error-bluebird/test.js

@@ -0,0 +1,9 @@
+var deferred = require('bluebird').defer();
+
+setTimeout(function() {
+    deferred.resolve({});
+}, 200);
+
+exports.templateData = {
+    promiseData: deferred.promise
+};

test/fixtures/async-templates/async-fragment-promise-error-q/expected.html

@@ -0,0 +1 @@
+BEFORE something went wrong!

test/fixtures/async-templates/async-fragment-promise-error-q/template.marko

@@ -0,0 +1,10 @@
+<async-fragment data-provider="data.promiseData" var="promiseData">
+    BEFORE
+    <if test="true">
+        $promiseData.noprop.value
+    </if>
+    AFTER
+    <async-fragment-error>
+        something went wrong!
+    </async-fragment-error>
+</async-fragment>

test/fixtures/async-templates/async-fragment-promise-error-q/test.js

@@ -1,4 +1,5 @@
 var deferred = require('raptor-promises').defer();
+
 setTimeout(function() {
     deferred.resolve({});
 }, 200);