DESIGNER-1881 fix travis build

Author: Cristian Traverso

.travis.yml

@@ -6,7 +6,6 @@ before_script:
   - npm install -g grunt-cli
   - npm install -g bower
   - bower update
-  - node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"

dist/scripts/api-designer-parser.js

@@ -51021,10 +51021,6 @@ block.list = replace(block.list)
   ('def', '\\n+(?=' + block.def.source + ')')
   ();
 
-block.blockquote = replace(block.blockquote)
-  ('def', block.def)
-  ();
-
 block._tag = '(?!(?:'
   + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code'
   + '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo'
@@ -51439,7 +51435,7 @@ var inline = {
   nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,
   strong: /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,
   em: /^\b_((?:[^_]|__)+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,
-  code: /^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,
+  code: /^(`+)([\s\S]*?[^`])\1(?!`)/,
   br: /^ {2,}\n(?!\s*$)/,
   del: noop,
   text: /^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/
@@ -51560,9 +51556,11 @@ InlineLexer.prototype.output = function(src) {
     if (cap = this.rules.autolink.exec(src)) {
       src = src.substring(cap[0].length);
       if (cap[2] === '@') {
-        text = cap[1].charAt(6) === ':'
+        text = escape(
+          cap[1].charAt(6) === ':'
           ? this.mangle(cap[1].substring(7))
-          : this.mangle(cap[1]);
+          : this.mangle(cap[1])
+        );
         href = this.mangle('mailto:') + text;
       } else {
         text = escape(cap[1]);
@@ -51643,7 +51641,7 @@ InlineLexer.prototype.output = function(src) {
     // code
     if (cap = this.rules.code.exec(src)) {
       src = src.substring(cap[0].length);
-      out += this.renderer.codespan(escape(cap[2], true));
+      out += this.renderer.codespan(escape(cap[2].trim(), true));
       continue;
     }
 
@@ -51861,6 +51859,9 @@ Renderer.prototype.link = function(href, title, text) {
       return '';
     }
   }
+  if (this.options.baseUrl && !originIndependentUrl.test(href)) {
+    href = resolveUrl(this.options.baseUrl, href);
+  }
   var out = '<a href="' + href + '"';
   if (title) {
     out += ' title="' + title + '"';
@@ -51870,6 +51871,9 @@ Renderer.prototype.link = function(href, title, text) {
 };
 
 Renderer.prototype.image = function(href, title, text) {
+  if (this.options.baseUrl && !originIndependentUrl.test(href)) {
+    href = resolveUrl(this.options.baseUrl, href);
+  }
   var out = '<img src="' + href + '" alt="' + text + '"';
   if (title) {
     out += ' title="' + title + '"';
@@ -52076,8 +52080,8 @@ function escape(html, encode) {
 }
 
 function unescape(html) {
-	// explicitly match decimal, hex, and named HTML entities 
-  return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/g, function(_, n) {
+	// explicitly match decimal, hex, and named HTML entities
+  return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig, function(_, n) {
     n = n.toLowerCase();
     if (n === 'colon') return ':';
     if (n.charAt(0) === '#') {
@@ -52101,6 +52105,30 @@ function replace(regex, opt) {
   };
 }
 
+function resolveUrl(base, href) {
+  if (!baseUrls[' ' + base]) {
+    // we can ignore everything in base after the last slash of its path component,
+    // but we might need to add _that_
+    // https://tools.ietf.org/html/rfc3986#section-3
+    if (/^[^:]+:\/*[^/]*$/.test(base)) {
+      baseUrls[' ' + base] = base + '/';
+    } else {
+      baseUrls[' ' + base] = base.replace(/[^/]*$/, '');
+    }
+  }
+  base = baseUrls[' ' + base];
+
+  if (href.slice(0, 2) === '//') {
+    return base.replace(/:[^]*/, ':') + href;
+  } else if (href.charAt(0) === '/') {
+    return base.replace(/(:\/*[^/]*)[^]*/, '$1') + href;
+  } else {
+    return base + href;
+  }
+}
+baseUrls = {};
+originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;
+
 function noop() {}
 noop.exec = noop;
 
@@ -52235,7 +52263,8 @@ marked.defaults = {
   smartypants: false,
   headerPrefix: '',
   renderer: new Renderer,
-  xhtml: false
+  xhtml: false,
+  baseUrl: null
 };
 
 /**
@@ -84015,10 +84044,6 @@ exports.javascript = require('./javascript');
         };
 
         function getRequest($event) {
-          if (!validateForm($scope.form)) {
-            return;
-          }
-
           var url;
           var context         = $scope.context;
           var segmentContexts = resolveSegmentContexts($scope.resource.pathSegments, $scope.context.uriParameters.data());
@@ -84132,7 +84157,7 @@ exports.javascript = require('./javascript');
               authStrategy.authenticate().then(function(token) {
                 token.sign(request);
                 $scope.requestOptions = request.toOptions();
-                jQuery.ajax(request.toOptions()).then(
+                jQuery.ajax(Object.assign(request.toOptions(),{timeout:10000})).then(
                   function(data, textStatus, jqXhr) { handleResponse(jqXhr); },
                   function(jqXhr) { handleResponse(jqXhr); }
                 );

dist/scripts/api-designer-parser.min.js

@@ -73216,7 +73216,7 @@ if (!String.prototype.endsWith) {
         return file.path.slice(-5) !== '.meta';
       }
       function metaFile(file) {
-        return file.path.slice(-5) === '.meta';
+        return !notMetaFile(file);
       }
       function handleErrorFor(file) {
         return function markFileWithError(error) {
@@ -73337,29 +73337,23 @@ if (!String.prototype.endsWith) {
           return !t.isDirectory;
         });
       };
-      RamlDirectory.prototype.forEachChildDo = function forEachChildDo(action) {
+      RamlDirectory.prototype.forEachItemDo = function forEachItemDo(action, isMetaChildren) {
         // BFS
-        var queue = this.children.slice();
+        var queue = isMetaChildren ? this.metaChildren.slice() : this.children.slice();
         var current;
         while (queue.length > 0) {
           current = queue.shift();
           if (current.isDirectory) {
-            queue = queue.concat(current.children);
+            queue = queue.concat(isMetaChildren ? current.metaChildren : current.children);
           }
           action.call(current, current);
         }
       };
-      RamlDirectory.prototype.forEachMetaChildDo = function forEachMetaChildDo(action) {
-        // BFS
-        var queue = this.metaChildren.slice();
-        var current;
-        while (queue.length > 0) {
-          current = queue.shift();
-          if (current.isDirectory) {
-            queue = queue.concat(current.metaChildren);
-          }
-          action.call(current, current);
-        }
+      RamlDirectory.prototype.forEachChildDo = function forEachChildDo(action) {
+        this.forEachItemDo(action, false);
+      };
+      RamlDirectory.prototype.forEachMetaChildDo = function forEachChildDo(action) {
+        this.forEachItemDo(action, true);
       };
       RamlDirectory.prototype.sortChildren = function sortChildren() {
         this.children.sort(sortingFunction);
@@ -73414,10 +73408,7 @@ if (!String.prototype.endsWith) {
         directory.getDirectories().forEach(function (dir) {
           promises.push(service.removeDirectory(dir));
         });
-        directory.getFiles().forEach(function (file) {
-          promises.push(service.removeFile(file));
-        });
-        directory.getMetaFiles().forEach(function (file) {
+        directory.getFiles().concat(directory.getMetaFiles()).forEach(function (file) {
           promises.push(service.removeFile(file));
         });
         // remove this directory object from parent's children list
@@ -74359,7 +74350,7 @@ angular.module('ramlEditorApp').factory('ramlSuggest', [
           // }
           //move all child items
           localStorageHelper.forEach(function (entry) {
-            if (entry.path.toLowerCase() !== source.toLowerCase() && entry.path.indexOf(source) === 0) {
+            if (entry.path.toLowerCase() !== destination.toLowerCase() && entry.path.indexOf(source + '/') === 0) {
               var newPath = destination + entry.path.substring(source.length);
               localStorageHelper.remove(entry.path);
               entry.path = newPath;