expressa 2.0.18 → 2.0.20

package/cypress/integration/users.js

@@ -1,61 +1,61 @@
-import { randomId } from '../support/util'
-
-describe('User Management', function() {
-  it('Lists users', function() {
-    cy.server()
-    cy.route('/api/users/schema').as('userschema')
-    cy.route('/api/collection/users').as('users')
-    cy.login()
-    cy.visit('/')
-
-    // cy.visit('#/users/list')
-    cy.get('.hamburger-container').click();
-    cy.wait(100)
-    cy.get('span').contains('People').click();
-    cy.get('span').contains('Users').click();
-    cy.wait('@users')
-    // cy.get('a').contains('a@example.com').click();
-
-
-    cy.get('table tr:last-child td:first-child').click();
-    // cy.visit()
-    cy.wait('@userschema')
-    cy.get('input[name="root[email]"]').should('have.value', 'test@example.com')
-    // cy.get('a[href="#/users/list"]').click()
-    // cy.get('form').submit()
-  })
-
-  const id = randomId()
-  const email = `${id}@example.com`
-  const password = 'expressa2'
-  it('Can create a user', function () {
-    cy.server()
-    cy.route('/api/users/schema').as('userschema')
-    cy.route('/api/collection/users').as('users')
-    cy.login()
-    cy.visit('/')
-
-    cy.get('.hamburger-container').click();
-    cy.wait(100)
-    cy.get('span').contains('People').click();
-    cy.wait(100)
-    cy.get('span').contains('Add').click();
-    cy.get('input[name="root[email]"]').type(email)
-    cy.get('input[name="root[password]"]').type(password)
-    cy.get('input[name="root[password]"]').blur()
-    cy.get('.btn-primary').click()
-    cy.wait('@users')
-    cy.get('div').should('contain', 'test@example.com')
-  })
-
-  it('Can log in as non-admin, but cannot create users', function () {
-    cy.login(email, password)
-    cy.visit('/')
-
-    cy.get('.hamburger-container').click();
-    cy.get('span').contains('People').click();
-    cy.wait(100)
-    cy.get('span').contains('Add').click();
-    cy.get('div.error-message').should('contain', 'Request failed')
-  })
-})
+import { randomId } from '../support/util'
+
+describe('User Management', function() {
+  it('Lists users', function() {
+    cy.server()
+    cy.route('/api/users/schema').as('userschema')
+    cy.route('/api/collection/users').as('users')
+    cy.login()
+    cy.visit('/')
+
+    // cy.visit('#/users/list')
+    cy.get('.hamburger-container').click();
+    cy.wait(100)
+    cy.get('span').contains('People').click();
+    cy.get('span').contains('Users').click();
+    cy.wait('@users')
+    // cy.get('a').contains('a@example.com').click();
+
+
+    cy.get('table tr:last-child td:first-child').click();
+    // cy.visit()
+    cy.wait('@userschema')
+    cy.get('input[name="root[email]"]').should('have.value', 'test@example.com')
+    // cy.get('a[href="#/users/list"]').click()
+    // cy.get('form').submit()
+  })
+
+  const id = randomId()
+  const email = `${id}@example.com`
+  const password = 'expressa2'
+  it('Can create a user', function () {
+    cy.server()
+    cy.route('/api/users/schema').as('userschema')
+    cy.route('/api/collection/users').as('users')
+    cy.login()
+    cy.visit('/')
+
+    cy.get('.hamburger-container').click();
+    cy.wait(100)
+    cy.get('span').contains('People').click();
+    cy.wait(100)
+    cy.get('span').contains('Add').click();
+    cy.get('input[name="root[email]"]').type(email)
+    cy.get('input[name="root[password]"]').type(password)
+    cy.get('input[name="root[password]"]').blur()
+    cy.get('.btn-primary').click()
+    cy.wait('@users')
+    cy.get('div').should('contain', 'test@example.com')
+  })
+
+  it('Can log in as non-admin, but cannot create users', function () {
+    cy.login(email, password)
+    cy.visit('/')
+
+    cy.get('.hamburger-container').click();
+    cy.get('span').contains('People').click();
+    cy.wait(100)
+    cy.get('span').contains('Add').click();
+    cy.get('div.error-message').should('contain', 'Request failed')
+  })
+})

package/cypress/plugins/index.js

@@ -1,17 +1,17 @@
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-module.exports = (on, config) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-}
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+module.exports = (on, config) => {
+  // `on` is used to hook into various events Cypress emits
+  // `config` is the resolved Cypress config
+}

package/cypress/support/commands.js

@@ -1,54 +1,69 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add("login", (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
-
-Cypress.Commands.add('randomId', (length) => {
-    var text = "";
-    var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-
-    for (var i = 0; i < length || 10; i++)
-        text += possible.charAt(Math.floor(Math.random() * possible.length));
-
-    return text;
-})
-
-Cypress.Commands.add('fillValue', (path, value) => {
-    cy.get(`input[name="root[${path}]"]`).type(value)
-})
-
-Cypress.Commands.add('login', (email, password) => {
-    cy.request({
-        method: 'POST',
-        url: 'http://localhost:3001/api/users/login',
-        body: {
-            email: email || 'test@example.com',
-            password: password || 'expressa',
-        }
-    })
-        .then((resp) => {
-            cy.setCookie('Admin-Token', resp.body.token);
-        })
-
-})
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add("login", (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
+
+Cypress.Commands.overwrite('server', () => {
+  // no-op polyfill for deprecated cy.server
+})
+
+Cypress.Commands.overwrite('route', (originalFn, arg1, arg2, arg3) => {
+  // polyfill cy.route to cy.intercept for Cypress >= 10
+  if (typeof arg2 === 'undefined' && typeof arg3 === 'undefined') {
+    return cy.intercept(arg1)
+  }
+  if (typeof arg3 === 'undefined') {
+    return cy.intercept(arg1, arg2)
+  }
+  return cy.intercept(arg1, arg2, arg3)
+})
+
+Cypress.Commands.add('randomId', (length) => {
+    var text = "";
+    var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+    for (var i = 0; i < length || 10; i++)
+        text += possible.charAt(Math.floor(Math.random() * possible.length));
+
+    return text;
+})
+
+Cypress.Commands.add('fillValue', (path, value) => {
+    cy.get(`input[name="root[${path}]"]`).type(value)
+})
+
+Cypress.Commands.add('login', (email, password) => {
+    cy.request({
+        method: 'POST',
+        url: 'http://localhost:3001/api/users/login',
+        body: {
+            email: email || 'test@example.com',
+            password: password || 'expressa',
+        }
+    })
+        .then((resp) => {
+            cy.setCookie('Admin-Token', resp.body.token);
+        })
+
+})

package/cypress/support/index.js

@@ -1,20 +1,20 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import './commands'
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')

package/cypress/support/util.js

@@ -1,10 +1,10 @@
-exports.randomId = function(length) {
-  var text = "";
-  var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-
-  for (var i = 0; i < (length || 10); i++) {
-    text += possible.charAt(Math.floor(Math.random() * possible.length))
-  }
-
-  return text;
-}
+export function randomId(length) {
+  var text = "";
+  var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+  for (var i = 0; i < (length || 10); i++) {
+    text += possible.charAt(Math.floor(Math.random() * possible.length))
+  }
+
+  return text;
+}

package/cypress.config.js

@@ -0,0 +1,18 @@
+// Configure Cypress v10+ while preserving legacy folder structure
+// https://docs.cypress.io/guides/references/configuration
+
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+	e2e: {
+		// Keep using the legacy integration tests directory
+		specPattern: 'cypress/integration/**/*.js',
+		supportFile: 'cypress/support/index.js',
+		baseUrl: 'http://localhost:3001/admin',
+		setupNodeEvents(on, config) {
+			// no plugins yet
+			return config
+		}
+	},
+	video: false
+})

package/cypress.json

@@ -1,4 +1,4 @@
-{
-  "video": false,
-  "baseUrl": "http://localhost:3001/admin"
-}
+{
+  "video": false,
+  "baseUrl": "http://localhost:3001/admin"
+}

package/db/cached.js

@@ -1,40 +1,40 @@
-module.exports = function (storage) {
-  const cache = require('./memory')()
-
-  return {
-    cache: cache,
-    init: async function () {
-      await Promise.resolve(storage.init())
-      const data = await storage.all()
-      await Promise.all(data.map((doc) => cache.create(doc)))
-    },
-    all: function () {
-      return cache.all()
-    },
-    find: function (query, offset, limit, orderby, fields) {
-      return cache.find(query, offset, limit, orderby, fields)
-    },
-    count: async function(...params) {
-      return await cache.count(...params)
-    },
-    get: function (id, fields) {
-      return cache.get(id, fields)
-    },
-    create: async function (data) {
-      await cache.create(data)
-      return storage.create(data)
-    },
-    update: async function (id, data) {
-      await cache.update(id, data)
-      return storage.update(id, data)
-    },
-    updateWithQuery: async function (query, update, options) {
-      await cache.updateWithQuery(query, update, options)
-      return storage.updateWithQuery(query, update, options)
-    },
-    delete: async function (id) {
-      await cache.delete(id)
-      return storage.delete(id)
-    }
-  }
-}
+module.exports = function (storage) {
+  const cache = require('./memory')()
+
+  return {
+    cache: cache,
+    init: async function () {
+      await Promise.resolve(storage.init())
+      const data = await storage.all()
+      await Promise.all(data.map((doc) => cache.create(doc)))
+    },
+    all: function () {
+      return cache.all()
+    },
+    find: function (query, offset, limit, orderby, fields) {
+      return cache.find(query, offset, limit, orderby, fields)
+    },
+    count: async function(...params) {
+      return await cache.count(...params)
+    },
+    get: function (id, fields) {
+      return cache.get(id, fields)
+    },
+    create: async function (data) {
+      await cache.create(data)
+      return storage.create(data)
+    },
+    update: async function (id, data) {
+      await cache.update(id, data)
+      return storage.update(id, data)
+    },
+    updateWithQuery: async function (query, update, options) {
+      await cache.updateWithQuery(query, update, options)
+      return storage.updateWithQuery(query, update, options)
+    },
+    delete: async function (id) {
+      await cache.delete(id)
+      return storage.delete(id)
+    }
+  }
+}