Check for canexit prior to running finish, update tests to pass

general-adhoc · general-adhoc · commit a77da7fecea2 · 2018-01-31T03:54:55.000-05:00
diff --git a/src/wizard.js b/src/wizard.js
@@ -335,9 +335,17 @@ angular.module('mgo-angular-wizard').directive('wizard', function() {
 
             //calls finish() which calls onFinish() which is declared on an attribute and linked to controller via wizard directive.
             this.finish = function() {
-                if ($scope.onFinish) {
-                    $scope.onFinish();
-                }
+                var thisStepNumber = $scope.currentStepNumber() - 1;
+                thisStepNumber = thisStepNumber < 0 ? 0 : thisStepNumber;
+                var thisStep = $scope.getEnabledSteps()[thisStepNumber];
+
+                $q.when(canExitStep(thisStep, thisStep)).then(function(result) {
+                    if ($scope.onFinish) {
+                        $scope.onFinish();
+                    }
+                }, function(error){
+                    $scope.$emit('wizard:finishFailed', {step: thisStep, index: _.indexOf($scope.getEnabledSteps(), thisStep)});                    
+                });                
             };
 
             this.previous = function() {
diff --git a/test/angularWizardSpec.js b/test/angularWizardSpec.js
@@ -320,6 +320,7 @@ describe( 'AngularWizard', function() {
         var view = createGenericView(scope);
         expect(scope.referenceCurrentStep).toEqual('Starting');
         WizardHandler.wizard().finish();
+        $timeout.flush();
         expect(flag).toBeTruthy();
         $rootScope.$digest();
     });
