Fixup for multi-request packet and tests

Author: sergos

README.md

@@ -299,6 +299,11 @@ It's ok you can do whatever you need. I add log options for some technical infor
 
 ## Changelog
 
+### 3.0.7
+
+Fix in header decoding to support latest Tarantool versions.
+Update to tests to support latest Tarantool versions.
+
 ### 3.0.6
 
 Remove let for support old nodejs version

lib/parser.js

@@ -8,10 +8,11 @@ var decoder = new Decoder();
 exports._processResponse =  function(buffer, offset){
   offset=offset||0;
   decoder.buffer = buffer;
-  var size = decoder.fetch();
+  decoder.offset = offset;
   var header = decoder.fetch();
   var schemaId = header[tarantoolConstants.KeysCode.schema_version];
-  var reqId = header[tarantoolConstants.KeysCode.code];
+  var reqId = header[tarantoolConstants.KeysCode.sync];
+  var code = header[tarantoolConstants.KeysCode.code];
   var obj = decoder.fetch();
   if (this.schemaId)
   {
@@ -35,7 +36,7 @@ exports._processResponse =  function(buffer, offset){
     }
   }
 	var dfd = task[2];
-	var success = reqId == 0 ? true : false;
+	var success = code == 0 ? true : false;
   if (success)
     dfd.resolve(_returnBool(task[0], obj));
 	else

test/app.js

@@ -230,7 +230,7 @@ describe('multihost', function () {
 					conn.eval('return box.cfg')
 					.then(function(res){
 						t++;
-						expect(res[0].listen).to.eql('33014');
+						expect(res[0].listen.toString()).to.eql('33014');
 						exec('docker kill reserve', function(error, stdout, stderr){
 							if(error){
 								done(error);
@@ -246,7 +246,7 @@ describe('multihost', function () {
 					conn.eval('return box.cfg')
 					.then(function(res){
 						t++;
-						expect(res[0].listen).to.eql('33015');
+						expect(res[0].listen.toString()).to.eql('33015');
 						exec('docker kill reserve_2', function(error, stdout, stderr){
 							if(error){
 								done(error);
@@ -261,7 +261,7 @@ describe('multihost', function () {
 					conn.eval('return box.cfg')
 					.then(function(res){
 						t++;
-						expect(res[0].listen).to.eql('33013');
+						expect(res[0].listen.toString()).to.eql('33013');
 						done();
 					})
 					.catch(function(e){
@@ -355,7 +355,7 @@ describe('instant connection', function(){
 		conn = new TarantoolConnection({port: 33013, username: 'userloser', password: 'test'});
 		conn.eval('return func_foo()')
 			.catch(function (err) {
-				expect(err.message).to.match(/User 'userloser' is not found/);
+				expect(err.message).to.include("not found");
 				conn.disconnect();
 				done();
 			});
@@ -743,4 +743,4 @@ describe('connection test with custom msgpack implementation', function(){
 	});
 });
 describe('slider buffer', function(){
-})
+})

test/box.lua

@@ -21,7 +21,7 @@ if not box.space.test then
    local test = box.schema.space.create('test')
    test:create_index('primary',   {type = 'TREE', unique = true, parts = {1, 'NUM'}})
    test:create_index('secondary', {type = 'TREE', unique = false, parts = {2, 'NUM', 3, 'STR'}})
-   box.schema.user.grant('test', 'read,write,execute', 'space', 'test')
+   box.schema.user.grant('test', 'read,write', 'space', 'test')
 end
 
 function test_delete(num)
@@ -47,7 +47,7 @@ end
 if not box.space.batched then
     local batched = box.schema.space.create('batched')
     batched:create_index('primary', {type = 'TREE', unique = true, parts = {1, 'NUM'}})
-    box.schema.user.grant('test', 'read,write,execute', 'space', 'batched')
+    box.schema.user.grant('test', 'read,write', 'space', 'batched')
 end
 
 function batch (data)
@@ -65,14 +65,14 @@ end
 if not box.space.toaddmore then
     local toaddmore = box.schema.space.create('toaddmore')
     toaddmore:create_index('primary', {type = 'TREE', unique = true, parts = {1, 'STR'}})
-    box.schema.user.grant('test', 'read,write,execute', 'space', 'toaddmore')
-    box.schema.user.grant('test', 'read,write,execute', 'space', '_index')
+    box.schema.user.grant('test', 'read,write', 'space', 'toaddmore')
+    box.schema.user.grant('test', 'read,write', 'space', '_index')
 end
 
 if not box.space.upstest then
     local s = box.schema.space.create('upstest')
     s:create_index('primary', {type = 'TREE', unique = true, parts = {1, 'NUM'}})
-    box.schema.user.grant('test', 'read,write,execute', 'space', 'upstest')
+    box.schema.user.grant('test', 'read,write', 'space', 'upstest')
 end
 
 function clearaddmore()
@@ -115,4 +115,4 @@ end
 
 function func_arg(arg)
     return arg
-end
+end