expressa 2.0.20 → 2.0.22

package/test/db.updating.js

@@ -1,144 +1,186 @@
-const chai = require('chai')
-const expect = chai.expect
-const request = require('supertest')
-const testutils = require('./testutils')
-const { app, api } = testutils
-
-const collectionNames = ['memorytest', 'filetest']
-if (process.env.TEST_MONGO) {
-  collectionNames.push('mongotest')
-}
-if (process.env.TEST_POSTGRES) {
-  collectionNames.push('postgrestest')
-}
-
-collectionNames.forEach(function (collection) {
-  describe(`${collection} updating`, function () {
-    let db
-    let id
-    const collectionName = collection + '3'
-
-    before(async function () {
-      const coll = {
-        _id: collectionName,
-        schema: {
-          type: 'object',
-          additionalProperties: false,
-          properties: {
-            _id: {
-              type: 'string'
-            },
-            title: {
-              type: 'string'
-            },
-            data: {
-              type: 'object',
-              additionalProperties: true,
-              properties: {
-                nestedArr: {
-                  type: 'array',
-                  items: {
-                    type: 'string'
-                  }
-                },
-              }
-            },
-            arr: {
-              type: 'array',
-              items: {
-                type: 'object',
-                properties: {
-                  color: {
-                    type: 'string'
-                  },
-                  num: {
-                    type: 'number'
-                  },
-                  subarray: {
-                    type: 'array',
-                    items: {
-                      type: 'object',
-                      properties: {
-                        v: {
-                          type: 'string'
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            meta: {
-              type: 'object',
-              propertyOrder: 2000,
-              properties: {
-                created: {
-                  type: 'string'
-                },
-                updated: {
-                  type: 'string'
-                },
-              }
-            }
-          },
-          required: [
-            'title'
-          ]
-        },
-        storage: collection.replace('test', ''),
-        documentsHaveOwners: false,
-      }
-
-      const token = await testutils.getUserWithPermissions(api, 'collection: create')
-      await request(app)
-        .post('/collection')
-        .set('x-access-token', token)
-        .send(coll)
-        .expect(200)
-
-      db = api.db[collection]
-
-      id = await db.create({
-        title: 'first',
-        data: { field: '123' },
-        arr: [{ color: 'red', subarray: [{ v: 'abc' }] }],
-      })
-
-      await db.create({
-        title: 'second',
-        data: { field: '123' },
-        arr: [{ color: 'red', subarray: [{ v: 'abc' }] }],
-      })
-
-      await db.create({
-        title: 'third',
-        data: { field: '12345' },
-        arr: [{ color: 'red', subarray: [{ v: 'abc' }] }],
-      })
-    })
-
-    it('update by query with id', async function () {
-      const res = await db.updateWithQuery({ _id: id }, { $set: { title: 'first22' } })
-      expect(res.matchedCount).to.equal(1)
-
-      const doc = await db.get(id)
-      expect(doc.title).to.equal('first22')
-    })
-
-    it('update by query with sub field', async function () {
-      let docs = await db.find({})
-      expect(docs).to.have.length(3)
-
-      const res1 = await db.updateWithQuery({ 'data.field': '123' }, { $set: { test: true } })
-      docs = await db.find({test: true })
-      expect(docs).to.have.length(2)
-      expect(res1.matchedCount).to.equal(2)
-
-      const res2 = await db.updateWithQuery({ 'data.field': { $in: ['123', '12345'] } }, { $set: { test: true } })
-      docs = await db.find({ test: true })
-      expect(docs).to.have.length(3)
-      expect(res2.matchedCount).to.equal(3)
-    })
-  })
-})
-
+const chai = require('chai')
+const expect = chai.expect
+const request = require('supertest')
+const testutils = require('./testutils')
+const { app, api } = testutils
+
+const collectionNames = ['memorytest', 'filetest']
+if (process.env.TEST_MONGO) {
+  collectionNames.push('mongotest')
+}
+if (process.env.TEST_POSTGRES) {
+  collectionNames.push('postgrestest')
+}
+
+collectionNames.forEach(function (collection) {
+  describe(`${collection} updating`, function () {
+    let db
+    let id
+    const collectionName = collection + '3'
+
+    before(async function () {
+      const coll = {
+        _id: collectionName,
+        schema: {
+          type: 'object',
+          additionalProperties: false,
+          properties: {
+            _id: {
+              type: 'string'
+            },
+            title: {
+              type: 'string'
+            },
+            data: {
+              type: 'object',
+              additionalProperties: true,
+              properties: {
+                nestedArr: {
+                  type: 'array',
+                  items: {
+                    type: 'string'
+                  }
+                },
+              }
+            },
+            arr: {
+              type: 'array',
+              items: {
+                type: 'object',
+                properties: {
+                  color: {
+                    type: 'string'
+                  },
+                  num: {
+                    type: 'number'
+                  },
+                  subarray: {
+                    type: 'array',
+                    items: {
+                      type: 'object',
+                      properties: {
+                        v: {
+                          type: 'string'
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            meta: {
+              type: 'object',
+              propertyOrder: 2000,
+              properties: {
+                created: {
+                  type: 'string'
+                },
+                updated: {
+                  type: 'string'
+                },
+              }
+            }
+          },
+          required: [
+            'title'
+          ]
+        },
+        storage: collection.replace('test', ''),
+        documentsHaveOwners: false,
+      }
+
+      const token = await testutils.getUserWithPermissions(api, 'collection: create')
+      await request(app)
+        .post('/collection')
+        .set('x-access-token', token)
+        .send(coll)
+        .expect(200)
+
+      db = api.db[collection]
+
+      id = await db.create({
+        title: 'first',
+        data: { field: '123' },
+        arr: [{ color: 'red', subarray: [{ v: 'abc' }] }],
+      })
+
+      await db.create({
+        title: 'second',
+        data: { field: '123' },
+        arr: [{ color: 'red', subarray: [{ v: 'abc' }] }],
+      })
+
+      await db.create({
+        title: 'third',
+        data: { field: '12345' },
+        arr: [{ color: 'red', subarray: [{ v: 'abc' }] }],
+      })
+    })
+
+    it('update by query with id', async function () {
+      const res = await db.updateWithQuery({ _id: id }, { $set: { title: 'first22' } })
+      expect(res.matchedCount).to.equal(1)
+
+      const doc = await db.get(id)
+      expect(doc.title).to.equal('first22')
+    })
+
+    it('update by query with sub field', async function () {
+      let docs = await db.find({})
+      expect(docs).to.have.length(3)
+
+      const res1 = await db.updateWithQuery({ 'data.field': '123' }, { $set: { test: true } })
+      docs = await db.find({test: true })
+      expect(docs).to.have.length(2)
+      expect(res1.matchedCount).to.equal(2)
+
+      const res2 = await db.updateWithQuery({ 'data.field': { $in: ['123', '12345'] } }, { $set: { test: true } })
+      docs = await db.find({ test: true })
+      expect(docs).to.have.length(3)
+      expect(res2.matchedCount).to.equal(3)
+    })
+
+    it('updateWithQuerySingle - existing document', async function () {
+      const res = await db.updateWithQuerySingle(id, { $set: { singleUpdate: 'test123' } })
+      expect(res.matchedCount).to.equal(1)
+
+      const doc = await db.get(id)
+      expect(doc.singleUpdate).to.equal('test123')
+    })
+
+    it('updateWithQuerySingle - non-existing document', async function () {
+      const fakeId = '7c6f4426-f99f-4764-bebc-3b61c6710488'
+      const res = await db.updateWithQuerySingle(fakeId, { $set: { singleUpdate: 'should-not-exist' } })
+      expect(res.matchedCount).to.equal(0)
+    })
+
+    it('updateWithQuerySingle - complex update operations', async function () {
+      // Test $inc operation
+      const res1 = await db.updateWithQuerySingle(id, { $set: { counter: 5 } })
+      expect(res1.matchedCount).to.equal(1)
+
+      const res2 = await db.updateWithQuerySingle(id, { $inc: { counter: 3 } })
+      expect(res2.matchedCount).to.equal(1)
+
+      let doc = await db.get(id)
+      expect(doc.counter).to.equal(8)
+
+      // Test $push operation on array
+      const res3 = await db.updateWithQuerySingle(id, { $push: { 'arr': { color: 'blue', num: 42 } } })
+      expect(res3.matchedCount).to.equal(1)
+
+      doc = await db.get(id)
+      expect(doc.arr).to.have.length(2)
+      expect(doc.arr[1].color).to.equal('blue')
+      expect(doc.arr[1].num).to.equal(42)
+
+      // Test $unset operation
+      const res4 = await db.updateWithQuerySingle(id, { $unset: { counter: '' } })
+      expect(res4.matchedCount).to.equal(1)
+
+      doc = await db.get(id)
+      expect(doc.counter).to.be.undefined
+    })
+  })
+})
+

package/test/logging.js

@@ -1,29 +1,29 @@
-const request = require('supertest')
-const chai = require('chai')
-const expect = chai.expect
-const testutils = require('./testutils')
-const { app, api } = testutils
-
-describe('request logging', function () {
-  it('logs 404', async function () {
-    const actualRes = await request(app)
-      .post('/users/login2')
-      .send()
-      .expect(404)
-    const requestId = actualRes.headers['x-request-id']
-    const logs = await api.db.requestlog.find({ url: '/users/login2' })
-    const log = logs[0]
-    expect(log.res.statusCode).to.equal(404)
-    expect(log.res.requestId).to.equal(requestId)
-  })
-
-  it('respects logging severity level', async function () {
-    api.settings.logging_level = 'error'
-    await request(app)
-      .post('/users/login3')
-      .send()
-      .expect(404)
-    const logs = await api.db.requestlog.find({ url: '/users/login3' })
-    expect(logs).have.lengthOf(0)
-  })
-})
+const request = require('supertest')
+const chai = require('chai')
+const expect = chai.expect
+const testutils = require('./testutils')
+const { app, api } = testutils
+
+describe('request logging', function () {
+  it('logs 404', async function () {
+    const actualRes = await request(app)
+      .post('/users/login2')
+      .send()
+      .expect(404)
+    const requestId = actualRes.headers['x-request-id']
+    const logs = await api.db.requestlog.find({ url: '/users/login2' })
+    const log = logs[0]
+    expect(log.res.statusCode).to.equal(404)
+    expect(log.res.requestId).to.equal(requestId)
+  })
+
+  it('respects logging severity level', async function () {
+    api.settings.logging_level = 'error'
+    await request(app)
+      .post('/users/login3')
+      .send()
+      .expect(404)
+    const logs = await api.db.requestlog.find({ url: '/users/login3' })
+    expect(logs).have.lengthOf(0)
+  })
+})

package/test/test.js

@@ -1,93 +1,93 @@
-const request = require('supertest')
-const chai = require('chai')
-const expect = chai.expect
-
-const testutils = require('./testutils')
-const { app, api } = testutils
-
-describe('General Tests:', () => {
-  it('returns ready', function (done) {
-    api.addListener('ready', function onStart() {
-      done()
-    })
-  })
-
-  xit('returns status', async function () {
-    const res = await request(app)
-      .get('/status')
-      .expect(200)
-    expect(res.body.installed).to.equal(true)
-
-    const token = await testutils.getUserWithPermissions(api, ['settings: edit'])
-    await request(app)
-      .post('/settings/development/update')
-      .set('x-access-token', token)
-      .send({ $set: { installed: false } })
-      .expect(200)
-
-    const res3 = await request(app)
-      .get('/status')
-      .expect(200)
-    expect(res3.body.installed).to.equal(false)
-
-    await request(app)
-      .post('/settings/development/update')
-      .set('x-access-token', token)
-      .send({ $set: { installed: true } })
-      .expect(200)
-  })
-
-  it('Prevents caching by default', async function () {
-    const res = await request(app)
-      .get('/status')
-      .expect(200)
-    expect(res.headers['cache-control']).to.equal('no-cache, no-store, must-revalidate')
-    expect(res.headers.expires).to.equal('-1')
-  })
-
-  it('returns collections', async function () {
-    const token = await testutils.getUserWithPermissions(api, ['collection: view'])
-    await request(app)
-      .get('/collection')
-      .set('x-access-token', token)
-      .expect(200)
-  })
-
-  it('returns collections using a key', async function () {
-    const badKey = '123'
-    await request(app)
-      .get('/collection')
-      .set('x-access-key', badKey)
-      .expect(401)
-
-    const key = await testutils.getAccessKeyForUserWithPermissions(api, ['collection: view'])
-    await request(app)
-      .get('/collection')
-      .set('x-access-key', key)
-      .expect(200)
-  })
-
-  it('Sets headers', async function () {
-    const token = await testutils.getUserWithPermissions(api, ['collection: view'])
-    const res = await request(app)
-      .get('/collection')
-      .set('x-access-token', token)
-      .expect(200)
-    expect(res.headers).to.have.property('x-request-id')
-    expect(res.headers['x-request-id']).to.have.length(12)
-  })
-
-  it('allows custom endpoints', async function () {
-    // Add a custom endpoint which returns the current user
-    api.custom.get('/test', function (req, res) {
-      res.send(req.user)
-    })
-
-    const token = await testutils.getUserWithPermissions(api, [])
-    const res = await request(app)
-      .get('/test')
-      .set('x-access-token', token)
-      .expect(200)
-    expect(res.body).to.have.property('email')
-  })
-})
+const request = require('supertest')
+const chai = require('chai')
+const expect = chai.expect
+
+const testutils = require('./testutils')
+const { app, api } = testutils
+
+describe('General Tests:', () => {
+  it('returns ready', function (done) {
+    api.addListener('ready', function onStart() {
+      done()
+    })
+  })
+
+  xit('returns status', async function () {
+    const res = await request(app)
+      .get('/status')
+      .expect(200)
+    expect(res.body.installed).to.equal(true)
+
+    const token = await testutils.getUserWithPermissions(api, ['settings: edit'])
+    await request(app)
+      .post('/settings/development/update')
+      .set('x-access-token', token)
+      .send({ $set: { installed: false } })
+      .expect(200)
+
+    const res3 = await request(app)
+      .get('/status')
+      .expect(200)
+    expect(res3.body.installed).to.equal(false)
+
+    await request(app)
+      .post('/settings/development/update')
+      .set('x-access-token', token)
+      .send({ $set: { installed: true } })
+      .expect(200)
+  })
+
+  it('Prevents caching by default', async function () {
+    const res = await request(app)
+      .get('/status')
+      .expect(200)
+    expect(res.headers['cache-control']).to.equal('no-cache, no-store, must-revalidate')
+    expect(res.headers.expires).to.equal('-1')
+  })
+
+  it('returns collections', async function () {
+    const token = await testutils.getUserWithPermissions(api, ['collection: view'])
+    await request(app)
+      .get('/collection')
+      .set('x-access-token', token)
+      .expect(200)
+  })
+
+  it('returns collections using a key', async function () {
+    const badKey = '123'
+    await request(app)
+      .get('/collection')
+      .set('x-access-key', badKey)
+      .expect(401)
+
+    const key = await testutils.getAccessKeyForUserWithPermissions(api, ['collection: view'])
+    await request(app)
+      .get('/collection')
+      .set('x-access-key', key)
+      .expect(200)
+  })
+
+  it('Sets headers', async function () {
+    const token = await testutils.getUserWithPermissions(api, ['collection: view'])
+    const res = await request(app)
+      .get('/collection')
+      .set('x-access-token', token)
+      .expect(200)
+    expect(res.headers).to.have.property('x-request-id')
+    expect(res.headers['x-request-id']).to.have.length(12)
+  })
+
+  it('allows custom endpoints', async function () {
+    // Add a custom endpoint which returns the current user
+    api.custom.get('/test', function (req, res) {
+      res.send(req.user)
+    })
+
+    const token = await testutils.getUserWithPermissions(api, [])
+    const res = await request(app)
+      .get('/test')
+      .set('x-access-token', token)
+      .expect(200)
+    expect(res.body).to.have.property('email')
+  })
+})

package/test/testserver.js

@@ -1,17 +1,30 @@
-// This is for starting a server with the test configuration/data.
-const expressa = require('../index')
-const api = expressa.api({
-  file_storage_path: 'testdata'
-})
-
-const express = require('express')
-const app = express()
-app.use('/api', api)
-app.use('/admin', expressa.admin({ apiurl: 'http://localhost:3001/api/' }))
-
-api.addListener('ready', function onStart() {
-  app.listen(3001, function () {
-    // eslint-disable-next-line no-console
-    console.log('Test server listening on port 3001!')
-  })
-})
+// This is for starting a server with the test configuration/data.
+const expressa = require('../index')
+const api = expressa.api({
+  file_storage_path: 'testdata'
+})
+
+const express = require('express')
+const app = express()
+app.use('/api', api)
+app.use('/admin', expressa.admin({
+  apiurl: 'http://localhost:3001/api/',
+  api_timeout_ms: 10000,
+}))
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}
+
+api.get('/slow_endpoint', async (req, res) => {
+  await sleep(7000)
+
+  res.send('Hello World!')
+})
+
+api.addListener('ready', function onStart() {
+  app.listen(3001, function () {
+    // eslint-disable-next-line no-console
+    console.log('Test server listening on port 3001!')
+  })
+})