merge conflict fixes

nearform · Apr 12, 2018 · a05f38f · a05f38f
1 parent 29ffec5
commit a05f38f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -65,8 +65,7 @@
   "pre-commit": [
     "test:commit-check"
   ],
-  "dependencies": {
-  },
+  "dependencies": {},
   "devDependencies": {
     "depcheck": "^0.6.9",
     "joi": "^13.1.2",

diff --git a/packages/udaru-core/lib/ops/organizationOps.js b/packages/udaru-core/lib/ops/organizationOps.js
@@ -708,7 +708,7 @@ function buildOrganizationOps (db, config) {
      */
     listOrganizationPolicies: function listOrganizationPolicies ({ id, organizationId, page = 1, limit }, cb) {
       let promise = null
-      if (typeof cb !== 'function') [promise, cb] = asyncify('data', 'total')
+      if (typeof cb !== 'function') [promise, cb] = asyncify()
 
       Joi.validate({ id, organizationId, page, limit }, validationRules.listOrganizationPolicies, function (err) {
         if (err) return cb(Boom.badRequest(err))

diff --git a/packages/udaru-core/lib/ops/userOps.js b/packages/udaru-core/lib/ops/userOps.js
@@ -789,7 +789,7 @@ function buildUserOps (db, config) {
      */
     listUserPolicies: function listUserPolicies ({ id, organizationId, page = 1, limit }, cb) {
       let promise = null
-      if (typeof cb !== 'function') [promise, cb] = asyncify('data', 'total')
+      if (typeof cb !== 'function') [promise, cb] = asyncify()
 
       Joi.validate({ id, organizationId, page, limit }, validationRules.listUserPolicies, function (err) {
         if (err) return cb(Boom.badRequest(err))

diff --git a/packages/udaru-hapi-plugin/test/endToEnd/organizations.test.js b/packages/udaru-hapi-plugin/test/endToEnd/organizations.test.js
@@ -621,7 +621,7 @@ lab.experiment('Organizations', () => {
     })
 
     response = await server.inject(options)
-    result = response.result.data
+    result = response.result
 
     expect(response.statusCode).to.equal(200)
     expect(result.total).to.equal(3)
@@ -639,7 +639,7 @@ lab.experiment('Organizations', () => {
     })
 
     response = await server.inject(options)
-    result = response.result.data
+    result = response.result
 
     expect(response.statusCode).to.equal(200)
     expect(result.total).to.equal(3)

diff --git a/packages/udaru-hapi-plugin/test/endToEnd/users.test.js b/packages/udaru-hapi-plugin/test/endToEnd/users.test.js
@@ -631,7 +631,7 @@ lab.experiment('Users - manage policies', () => {
     })
 
     response = await server.inject(options)
-    result = response.result.data
+    result = response.result
 
     expect(response.statusCode).to.equal(200)
     expect(result.total).to.equal(3)
@@ -648,7 +648,7 @@ lab.experiment('Users - manage policies', () => {
     })
 
     response = await server.inject(options)
-    result = response.result.data
+    result = response.result
 
     expect(response.statusCode).to.equal(200)
     expect(result.total).to.equal(3)