promises support in steps

closes #6
allure-framework · Sep 15, 2015 · 8d91900 · 8d91900
1 parent d7686d0
commit 8d91900
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 9 deletions.
diff --git a/runtime.js b/runtime.js
@@ -3,21 +3,33 @@ var Allure = function(allure) {
     this._allure = allure;
 };
 
+Allure.prototype.isPromise = function(obj) {
+    return !!obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
+};
+
 Allure.prototype.createStep = function(name, stepFunc) {
     var that = this;
     return function() {
         var stepName = that._format(name, Array.prototype.slice.call(arguments, 0)),
-            status = 'passed';
+            status = 'passed',
+            result;
         that._allure.startStep(stepName);
         try {
-            var result = stepFunc.apply(this, arguments);
+            result = stepFunc.apply(this, arguments);
         }
         catch(error) {
             status = 'broken';
             throw error;
         }
         finally {
-            that._allure.endStep(status);
+            if(that.isPromise(result)) {
+                result.then(
+                    that._allure.endStep.bind(that._allure, 'passed'),
+                    that._allure.endStep.bind(that._allure, 'broken')
+                 );
+            } else {
+                that._allure.endStep(status);
+            }
         }
         return result;
     };

diff --git a/test/runtime.spec.js b/test/runtime.spec.js
@@ -7,6 +7,8 @@ var AllureRuntime = require('../runtime');
 var Allure = require('../index');
 mockery.disable();
 
+var joc = jasmine.objectContaining.bind(jasmine);
+
 describe('allure-runtime', function() {
     var runtime, allure;
     beforeEach(function() {
@@ -21,7 +23,7 @@ describe('allure-runtime', function() {
         var stepFn = runtime.createStep('demo step [{0}]', stepSpy);
         stepFn('param');
         expect(allure.getCurrentSuite().currentTest.steps).toEqual([
-            jasmine.objectContaining({
+            joc({
                 name: 'demo step [param]',
                 status: 'passed',
                 stop: jasmine.any(Number)
@@ -36,7 +38,7 @@ describe('allure-runtime', function() {
         var brokenStep = runtime.createStep('step 1', brokenSpy);
         expect(brokenStep).toThrow();
         expect(allure.getCurrentSuite().currentTest.steps).toEqual([
-            jasmine.objectContaining({
+            joc({
                 name: 'step 1',
                 status: 'broken',
                 stop: jasmine.any(Number)
@@ -50,7 +52,7 @@ describe('allure-runtime', function() {
         });
         attachmentFunction('test');
         expect(allure.getCurrentSuite().currentTest.attachments).toEqual([
-            jasmine.objectContaining({
+            joc({
                 title: 'file [test]',
                 type: 'text/plain'
             })
@@ -60,7 +62,7 @@ describe('allure-runtime', function() {
     it('should create arbitrary attachements', function() {
         runtime.createAttachment('note', 'I want to save it');
         expect(allure.getCurrentSuite().currentTest.attachments).toEqual([
-            jasmine.objectContaining({
+            joc({
                 title: 'note'
             })
         ]);
@@ -72,8 +74,8 @@ describe('allure-runtime', function() {
         });
         stepFn('test', 'test content');
         expect(allure.getCurrentSuite().currentTest.attachments).toEqual([]);
-        expect(allure.getCurrentSuite().currentTest.steps).toEqual([jasmine.objectContaining({
-            attachments: [jasmine.objectContaining({title: 'test', type: 'text/plain'})]
+        expect(allure.getCurrentSuite().currentTest.steps).toEqual([joc({
+            attachments: [joc({title: 'test', type: 'text/plain'})]
         })]);
     });
 
@@ -85,4 +87,38 @@ describe('allure-runtime', function() {
             {name: 'story', value: 'add from runtime'}
         ]);
     });
+
+    it('should await promises and can create asynchronous step tree', function(done) {
+        var rootStep = runtime.createStep('root', function() {
+                return firstNested().then(function(result) {
+                    expect(result).toBe('ok result');
+                    return secondNested();
+                });
+            }),
+            firstNested = runtime.createStep('passed', function() {
+                return Promise.resolve('ok result');
+            }),
+            secondNested = runtime.createStep('broken', function() {
+                return Promise.reject('bad result');
+            });
+        rootStep().then(done.fail, function(result) {
+            expect(result).toBe('bad result');
+            expect(allure.getCurrentSuite().currentTest.steps).toEqual([
+                joc({
+                    name: 'root',
+                    steps: [
+                        joc({
+                            name: 'passed',
+                            status: 'passed'
+                        }),
+                        joc({
+                            name: 'broken',
+                            status: 'broken'
+                        })
+                    ]
+                })
+            ]);
+            done();
+        });
+    });
 });