From c7b3e002b5acde077a8541c4e2e431fdb9593b69 Mon Sep 17 00:00:00 2001
From: jsteemann <jan@arangodb.com>
Date: Mon, 30 Jan 2017 14:05:54 +0100
Subject: [PATCH 1/2] fixed tests

---
 js/client/tests/shell/shell-vpack.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/client/tests/shell/shell-vpack.js b/js/client/tests/shell/shell-vpack.js
index 5f2988cf56..967ca1708d 100644
--- a/js/client/tests/shell/shell-vpack.js
+++ b/js/client/tests/shell/shell-vpack.js
@@ -83,7 +83,7 @@ function versionJsonJson() {
   expect(obj).to.have.property('license');
 
   expect(obj.server).to.be('arango');
-  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.+devel/);
+  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.([0-9]+|devel)/);
   expect(obj.license).to.match(/enterprise|community/g);
 };
 
@@ -108,7 +108,7 @@ function versionVpackJson() {
   expect(obj).to.have.property('license');
 
   expect(obj.server).to.be('arango');
-  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.+devel/);
+  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.([0-9]+|devel)/);
   expect(obj.license).to.match(/enterprise|community/g);
 };
 
@@ -133,7 +133,7 @@ function versionJsonVpack () {
   expect(obj).to.have.property('license');
 
   expect(obj.server).to.be('arango');
-  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.+devel/);
+  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.([0-9]+|devel)/);
   expect(obj.license).to.match(/enterprise|community/g);
 };
 
@@ -158,7 +158,7 @@ function versionVpackVpack () {
   expect(obj).to.have.property('license');
 
   expect(obj.server).to.be('arango');
-  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.+devel/);
+  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.([0-9]+|devel)/);
   expect(obj.license).to.match(/enterprise|community/g);
 };
 

From 7f88bcaf33ae2010ff8d5e77d10b6436574c4849 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Wed, 22 Mar 2017 13:21:02 +0100
Subject: [PATCH 2/2] make this test work for milestone/alpha/beta/ releases

---
 js/client/tests/shell/shell-vpack.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/js/client/tests/shell/shell-vpack.js b/js/client/tests/shell/shell-vpack.js
index 967ca1708d..979072bedb 100644
--- a/js/client/tests/shell/shell-vpack.js
+++ b/js/client/tests/shell/shell-vpack.js
@@ -83,7 +83,8 @@ function versionJsonJson() {
   expect(obj).to.have.property('license');
 
   expect(obj.server).to.be('arango');
-  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.([0-9]+|devel)/);
+  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.([0-9]+|(milestone|alpha|beta|devel|rc)[0-9]*)/);
+  
   expect(obj.license).to.match(/enterprise|community/g);
 };
 
@@ -108,7 +109,7 @@ function versionVpackJson() {
   expect(obj).to.have.property('license');
 
   expect(obj.server).to.be('arango');
-  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.([0-9]+|devel)/);
+  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.([0-9]+|(milestone|alpha|beta|devel|rc)[0-9]*)/);
   expect(obj.license).to.match(/enterprise|community/g);
 };
 
@@ -133,7 +134,7 @@ function versionJsonVpack () {
   expect(obj).to.have.property('license');
 
   expect(obj.server).to.be('arango');
-  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.([0-9]+|devel)/);
+  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.([0-9]+|(milestone|alpha|beta|devel|rc)[0-9]*)/);
   expect(obj.license).to.match(/enterprise|community/g);
 };
 
@@ -158,7 +159,7 @@ function versionVpackVpack () {
   expect(obj).to.have.property('license');
 
   expect(obj.server).to.be('arango');
-  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.([0-9]+|devel)/);
+  expect(obj.version).to.match(/[0-9]+\.[0-9]+\.([0-9]+|(milestone|alpha|beta|devel|rc)[0-9]*)/);
   expect(obj.license).to.match(/enterprise|community/g);
 };