test update

Author: KlonD90

lib/connection.js

@@ -456,7 +456,7 @@ TarantoolConnection.prototype.update = function(spaceId, indexId, key, ops){
 
 TarantoolConnection.prototype.upsert = function(spaceId, ops, tuple){
     return new Promise(function (resolve, reject) {
-        if (Array.isArray(ops) && Array.isArray(key)){
+        if (Array.isArray(ops)){
             if (typeof(spaceId)=='string')
             {
                 return this._getMetadata(spaceId, 0)
@@ -482,7 +482,7 @@ TarantoolConnection.prototype.upsert = function(spaceId, ops, tuple){
             this.commandsQueue.push([tarantoolConstants.RequestCode.rqUpsert, reqId, {resolve: resolve, reject: reject}]);
         }
         else
-            reject(new Error('need array'));
+            reject(new Error('need ops array'));
     }.bind(this));
 };
 

test/app.js

@@ -272,7 +272,7 @@ describe('Tarantool Connection tests', function(){
 			}
 		});
 		it('insert', function(done){
-			conn.upsert('upstest', 1, [['+', 3, 3]], [1, 2, 3])
+			conn.upsert('upstest', [['+', 3, 3]], [1, 2, 3])
 				.then(function() {
 					return conn.select('upstest', 'primary', 1, 0, 'eq', 1);
 				})
@@ -287,9 +287,9 @@ describe('Tarantool Connection tests', function(){
 				});
 		});
 		it('update', function(done){
-			conn.upsert('upstest', 2, [['+', 2, 2]], [2, 4, 3])
+			conn.upsert('upstest', [['+', 2, 2]], [2, 4, 3])
 				.then(function(){
-					return conn.upsert('upstest', 2, [['+', 2, 2]], [2, 4, 3]);
+					return conn.upsert('upstest', [['+', 2, 2]], [2, 4, 3]);
 				})
 				.then(function() {
 					return conn.select('upstest', 'primary', 1, 0, 'eq', 2)	;

test/box.lua

@@ -83,3 +83,25 @@ function clearaddmore()
         end
     end
 end
+
+if not box.schema.func.exists('clearaddmore') then
+  box.schema.func.create('clearaddmore')
+  box.schema.user.grant('test', 'execute', 'function', 'clearaddmore')
+end
+if not box.schema.func.exists('myget') then
+  box.schema.func.create('myget')
+  box.schema.user.grant('test', 'execute', 'function', 'myget')
+end
+if not box.schema.func.exists('batch') then
+  box.schema.func.create('batch')
+  box.schema.user.grant('test', 'execute', 'function', 'batch')
+end
+if not box.schema.func.exists('myprint') then
+  box.schema.func.create('myprint')
+  box.schema.user.grant('test', 'execute', 'function', 'myprint')
+end
+if not box.schema.func.exists('test_delete') then
+  box.schema.func.create('test_delete')
+  box.schema.user.grant('test', 'execute', 'function', 'test_delete')
+end
+