Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
jsteemann 2017-03-22 13:27:58 +01:00
parent 82ba9a3538 7f88bcaf33
commit 54a3b1fe5c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/client/tests/shell/shell-vpack.js
View File

@ -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]+\.+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]+\.+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]+\.+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,11 +159,10 @@ function versionVpackVpack () {
expect(obj).to.have.property('license');
expect(obj.server).to.be('arango');
expect(obj.version).to.match(/^[a-z0-9\.\-]+/);
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);
};
///////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////
function echoVpackVpack () {