Loader used by the tests updated.

Author: jisoldi

dist/scripts/api-console.js

@@ -1167,8 +1167,8 @@
           $scope.vm.error = {buffer : 'RAML origin check failed. Raml does not reside underneath the path:' + RAML.LoaderUtils.allowedRamlOrigin($scope.options)};
         } else {
           return ramlParser.loadPath($window.resolveUrl(url), null, $scope.options)
-            .then(function (raml) {
-              $scope.vm.raml = raml;
+            .then(function (api) {
+              $scope.vm.raml = api.specification;
             })
             .catch(function (error) {
               $scope.vm.error = angular.extend(error, {
@@ -1671,11 +1671,12 @@
 
         return promise
           .then(function (api) {
-            $scope.vm.raml = api.specification;
-          })
-          .catch(function (error) {
-            $scope.vm.error           = error;
-            $scope.vm.codeMirror.lint = lintFromError(error.parseErrors);
+            if (api.errors.length <= 0) {
+              $scope.vm.raml = api.specification;
+            } else {
+              $scope.vm.error           = { message: 'Api contains errors.'};
+              $scope.vm.codeMirror.lint = lintFromError(api.errors);
+            }
           })
           .finally(function () {
             $scope.vm.isLoading       = false;
@@ -2957,7 +2958,7 @@
         options = options || {};
         return RAML.Parser.loadApi(path, {
           attributeDefaults: true,
-          rejectOnErrors:    true,
+          rejectOnErrors:    false,
           fsResolver:        {
             contentAsync: contentAsyncFn,
             content:      content

src/app/directives/raml-console-loader.js

@@ -44,15 +44,12 @@
           $scope.vm.error = {buffer : 'RAML origin check failed. Raml does not reside underneath the path:' + RAML.LoaderUtils.allowedRamlOrigin($scope.options)};
         } else {
           return ramlParser.loadPath($window.resolveUrl(url), null, $scope.options)
-            .then(function (raml) {
-              $scope.vm.raml = raml;
-            })
-            .catch(function (error) {
-              $scope.vm.error = angular.extend(error, {
-                /*jshint camelcase: false */
-                buffer: (error.context_mark || error.problem_mark).buffer
-                /*jshint camelcase: true */
-              });
+            .then(function (api) {
+              if (api.errors.length <= 0) {
+                $scope.vm.raml = api.specification;
+              } else {
+                $scope.vm.error = { message: 'Api contains errors.'};
+              }
             })
             .finally(function () {
               $scope.vm.loaded = true;

src/app/directives/raml-initializer.js

@@ -77,11 +77,12 @@
 
         return promise
           .then(function (api) {
-            $scope.vm.raml = api.specification;
-          })
-          .catch(function (error) {
-            $scope.vm.error           = error;
-            $scope.vm.codeMirror.lint = lintFromError(error.parseErrors);
+            if (api.errors.length <= 0) {
+              $scope.vm.raml = api.specification;
+            } else {
+              $scope.vm.error           = { message: 'Api contains errors.'};
+              $scope.vm.codeMirror.lint = lintFromError(api.errors);
+            }
           })
           .finally(function () {
             $scope.vm.isLoading       = false;

src/app/factories/ramlParser.js

@@ -52,7 +52,7 @@
         options = options || {};
         return RAML.Parser.loadApi(path, {
           attributeDefaults: true,
-          rejectOnErrors:    true,
+          rejectOnErrors:    false,
           fsResolver:        {
             contentAsync: contentAsyncFn,
             content:      content