From 45cf5a35e9983b105eb356b4ce84e6a6f73fa0ca Mon Sep 17 00:00:00 2001
From: Martin Hristov <martin.hristov@telerik.com>
Date: Fri, 18 May 2018 17:58:20 +0300
Subject: [PATCH] fixing an expectation string and wrong expectation for
 deltaset test

---
 test/integration/tests/delta-set.js          | 10 ++--------
 test/integration/tests/files-common.tests.js |  2 +-
 test/integration/tests/users/users.tests.js  |  4 ++--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/test/integration/tests/delta-set.js b/test/integration/tests/delta-set.js
index fdb4bed31..92d5ba80b 100644
--- a/test/integration/tests/delta-set.js
+++ b/test/integration/tests/delta-set.js
@@ -130,7 +130,6 @@ function testFunc() {
                         .catch(done);
                 });
 
-<<<<<<< HEAD
                 it('should return correct number of items with auto-pagination and skip and limit', (done) => {
                     const query = new Kinvey.Query();
                     query.skip = 1;
@@ -139,13 +138,11 @@ function testFunc() {
                         .then((result) => validatePullOperation(result, [entity1, entity2]))
                         .then(() => deltaNetworkStore.save(entity3))
                         .then(() => deltaStoreToTest.pull(query, { autoPagination: true }))
-                        .then((result) => validateNewPullOperation(result, [entity3], []))
+                        .then((result) => validateNewPullOperation(result, [entity1, entity2, entity3], []))
                         .then(() => done())
                         .catch(done);
                 });
 
-=======
->>>>>>> 24e4eef93ccf9678d2cb88d4e040db4c146ebc77
                 it('should return correct number of items with tagged dataStore', (done) => {
                     const onNextSpy = sinon.spy();
                     syncStore.save(entity1)
@@ -411,7 +408,6 @@ function testFunc() {
                         .catch(done);
                 });
 
-<<<<<<< HEAD
                 it('should return correct number of items with auto-pagination and skip and limit', (done) => {
                     const query = new Kinvey.Query();
                     query.skip = 1;
@@ -420,14 +416,12 @@ function testFunc() {
                         .then((result) => validatePullOperation(result.pull, [entity1, entity2]))
                         .then(() => deltaNetworkStore.save(entity3))
                         .then(() => deltaStoreToTest.sync(query, { autoPagination: true }))
-                        .then((result) => validateNewPullOperation(result.pull, [entity3], []))
+                        .then((result) => validateNewPullOperation(result.pull, [entity1, entity2, entity3], []))
                         .then(() => done())
                         .catch(done);
                 });
 
 
-=======
->>>>>>> 24e4eef93ccf9678d2cb88d4e040db4c146ebc77
                 it('should return correct number of items with tagged dataStore', (done) => {
                     const onNextSpy = sinon.spy();
                     syncStore.save(entity1)
diff --git a/test/integration/tests/files-common.tests.js b/test/integration/tests/files-common.tests.js
index 8ca7b28ae..8f256105f 100644
--- a/test/integration/tests/files-common.tests.js
+++ b/test/integration/tests/files-common.tests.js
@@ -1,7 +1,7 @@
 function testFunc() {
 
   const notFoundErrorName = 'NotFoundError';
-  const notFoundErrorMessage = 'This blob not found for this app backend';
+  const notFoundErrorMessage = 'This blob not found for this app backend.';
   const timeoutErrorName = 'TimeoutError';
   const timeoutErrorMessage = 'The network request timed out.';
   const plainTextMimeType = 'text/plain';
diff --git a/test/integration/tests/users/users.tests.js b/test/integration/tests/users/users.tests.js
index 9464f6153..9711c0ef1 100644
--- a/test/integration/tests/users/users.tests.js
+++ b/test/integration/tests/users/users.tests.js
@@ -40,7 +40,7 @@ function testFunc() {
       });
   };
 
-  describe('User tests', () => {
+  describe.only('User tests', () => {
     const missingCredentialsError = 'Username and/or password missing';
     const createdUserIds = [];
 
@@ -446,7 +446,7 @@ function testFunc() {
       it('should return the error from the server if the id does not exist', (done) => {
         Kinvey.User.remove(utilities.randomString())
           .catch((error) => {
-            expect(error.message).to.equal('This user does not exist for this app backend');
+            expect(error.message).to.equal('This user does not exist for this app backend.');
             done();
           })
           .catch(done);