apostrophe 3.61.1 → 3.63.0

package/modules/@apostrophecms/widget-type/ui/apos/mixins/AposWidgetMixin.js

@@ -7,6 +7,12 @@ export default {
     type: String,
     areaFieldId: String,
     value: Object,
+    meta: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
     // Ignored for server side rendering
     areaField: Object,
     followingValues: Object,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "apostrophe",
-  "version": "3.61.1",
+  "version": "3.63.0",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {
     "pretest": "npm run lint",
-    "test": "nyc --reporter=html mocha -t 10000",
+    "test": "nyc --reporter=html mocha -t 10000 --ignore=test/assets.js && nyc --reporter=html mocha -t 10000 test/assets.js",
     "eslint": "eslint --ext .js,.vue .",
     "eslint-fix": "npm run eslint -- --fix",
     "i18n": "node scripts/lint-i18n",

package/test/areas.js

@@ -1,8 +1,8 @@
 const t = require('../test-lib/test.js');
 const assert = require('assert');
-let apos;
 
 describe('Areas', function() {
+  let apos;
 
   this.timeout(t.timeout);
 

package/test/assets.js

@@ -12,8 +12,6 @@ const {
   fillExtraBundles
 } = require('../modules/@apostrophecms/asset/lib/webpack/utils');
 
-let apos;
-
 const badModules = {
   badModuleConfig: {
     options: {
@@ -85,6 +83,8 @@ const modules = {
 };
 
 describe('Assets', function() {
+  let apos;
+
   const {
     publicFolderPath,
     cacheFolderPath,

package/test/attachments.js

@@ -3,10 +3,10 @@ const assert = require('assert');
 const fs = require('fs-extra');
 const path = require('path');
 
-let apos;
-
 describe('Attachment', function() {
 
+  let apos;
+
   after(async function() {
     await wipeIt();
 

package/test/base-module.js

@@ -1,9 +1,10 @@
 const t = require('../test-lib/test.js');
 const assert = require('assert');
-let apos;
 
 describe('Base Module', function() {
 
+  let apos;
+
   this.timeout(t.timeout);
 
   after(async function() {

package/test/base-url-env-var.js

@@ -1,7 +1,5 @@
 const t = require('../test-lib/test.js');
 const assert = require('assert');
-let apos;
-let savedBaseUrl;
 
 const config = {
   root: module,
@@ -11,6 +9,8 @@ const config = {
 
 describe('Locales', function() {
   this.timeout(t.timeout);
+  let apos;
+  let savedBaseUrl;
 
   before(async function() {
     savedBaseUrl = process.env.APOS_BASE_URL;

package/test/change-doc-ids.js

@@ -1,10 +1,12 @@
 const t = require('../test-lib/test.js');
 const assert = require('assert');
-let apos;
-const articles = []; const categories = [];
 
 describe('change-doc-ids', function() {
 
+  let apos;
+  const articles = [];
+  const categories = [];
+
   this.timeout(t.timeout);
 
   after(function() {
@@ -102,33 +104,33 @@ describe('change-doc-ids', function() {
     await sanityCheck(newPageId, newCategoryId);
   });
 
-});
-
-async function sanityCheck(newPageId, newCategoryId) {
-  const pages = await apos.page.find(apos.task.getReq(), {}).children(true).toArray();
-  const test = pages.find(page => page.slug === '/test');
-  assert(test);
-  assert(test._children[0]);
-  assert(!test._children[1]);
-  assert.strictEqual(test._children[0].slug, '/test/child');
-  if (newPageId) {
-    assert.strictEqual(test._id, newPageId);
-    const newPageDocId = newPageId.replace(/:.+$/, '');
-    assert.strictEqual(test.aposDocId, newPageDocId);
-    assert(test.path.includes(newPageDocId));
-    assert(test._children[0].path.includes(newPageDocId));
-  }
-  const articles = await apos.article.find(apos.task.getReq(), {}).sort({ slug: 1 }).toArray();
-  assert.strictEqual(articles[0].title, 'Article 0');
-  assert(articles[0]._categories);
-  assert.strictEqual(articles[0]._categories.length, 2);
-  assert(articles[0]._categories.find(category => category.slug === 'category-0'));
-  assert(articles[0]._categories.find(category => category.slug === 'category-1'));
-  if (newCategoryId) {
-    assert.strictEqual(articles[0]._categories[0]._id, newCategoryId);
-    const newCategory = articles[0]._categories.find(category => category._id === newCategoryId);
-    assert(newCategory);
-    assert.strictEqual(newCategory._id, newCategoryId);
-    assert.strictEqual(newCategory.aposDocId, newCategoryId.replace(/:.+$/, ''));
+  async function sanityCheck(newPageId, newCategoryId) {
+    const pages = await apos.page.find(apos.task.getReq(), {}).children(true).toArray();
+    const test = pages.find(page => page.slug === '/test');
+    assert(test);
+    assert(test._children[0]);
+    assert(!test._children[1]);
+    assert.strictEqual(test._children[0].slug, '/test/child');
+    if (newPageId) {
+      assert.strictEqual(test._id, newPageId);
+      const newPageDocId = newPageId.replace(/:.+$/, '');
+      assert.strictEqual(test.aposDocId, newPageDocId);
+      assert(test.path.includes(newPageDocId));
+      assert(test._children[0].path.includes(newPageDocId));
+    }
+    const articles = await apos.article.find(apos.task.getReq(), {}).sort({ slug: 1 }).toArray();
+    assert.strictEqual(articles[0].title, 'Article 0');
+    assert(articles[0]._categories);
+    assert.strictEqual(articles[0]._categories.length, 2);
+    assert(articles[0]._categories.find(category => category.slug === 'category-0'));
+    assert(articles[0]._categories.find(category => category.slug === 'category-1'));
+    if (newCategoryId) {
+      assert.strictEqual(articles[0]._categories[0]._id, newCategoryId);
+      const newCategory = articles[0]._categories.find(category => category._id === newCategoryId);
+      assert(newCategory);
+      assert.strictEqual(newCategory._id, newCategoryId);
+      assert.strictEqual(newCategory.aposDocId, newCategoryId.replace(/:.+$/, ''));
+    }
   }
-}
+
+});

package/test/command-menu.js

@@ -684,7 +684,7 @@ describe('Command-Menu', function() {
       action: {},
       shortcut: 'c',
       permission: {
-        action: 'edit',
+        action: 'create',
         type: '@apostrophecms/page',
         mode: 'draft'
       }
@@ -704,7 +704,7 @@ describe('Command-Menu', function() {
       action: {},
       shortcut: 'c',
       permission: {
-        action: 'edit',
+        action: 'create',
         type: '@apostrophecms/page',
         mode: 'published'
       }

package/test/content-i18n.js

@@ -1,56 +1,57 @@
 const t = require('../test-lib/test.js');
 const assert = require('assert');
-let apos;
 
-const config = {
-  root: module,
-  // Wrong port, but that is OK for this test
-  baseUrl: 'http://localhost:3000',
-  modules: {
-    '@apostrophecms/i18n': {
-      options: {
-        locales: {
-          en: {
-            label: 'English'
-          },
-          'en-CA': {
-            label: 'Canadian English',
-            prefix: '/ca-en'
-          },
-          'fr-CA': {
-            label: 'Canadian French',
-            prefix: '/ca-fr'
-          },
-          'es-MX': {
-            label: 'Mexico',
-            hostname: 'example.mx'
+describe('content-i18n', function() {
+
+  let apos;
+
+  const config = {
+    root: module,
+    // Wrong port, but that is OK for this test
+    baseUrl: 'http://localhost:3000',
+    modules: {
+      '@apostrophecms/i18n': {
+        options: {
+          locales: {
+            en: {
+              label: 'English'
+            },
+            'en-CA': {
+              label: 'Canadian English',
+              prefix: '/ca-en'
+            },
+            'fr-CA': {
+              label: 'Canadian French',
+              prefix: '/ca-fr'
+            },
+            'es-MX': {
+              label: 'Mexico',
+              hostname: 'example.mx'
+            }
           }
         }
-      }
-    },
-    '@apostrophecms/express': {
-      options: {
-        // Allows us to inject an X-Forwarded-Host header for test purposes
-        trustProxy: true
-      }
-    },
-    'default-page': {},
-    '@apostrophecms/page': {
-      options: {
-        park: [
-          {
-            parkedId: 'people',
-            type: 'default-page',
-            slug: '/people',
-            title: 'People'
-          }
-        ]
+      },
+      '@apostrophecms/express': {
+        options: {
+          // Allows us to inject an X-Forwarded-Host header for test purposes
+          trustProxy: true
+        }
+      },
+      'default-page': {},
+      '@apostrophecms/page': {
+        options: {
+          park: [
+            {
+              parkedId: 'people',
+              type: 'default-page',
+              slug: '/people',
+              title: 'People'
+            }
+          ]
+        }
       }
     }
-  }
-};
-
-describe('Locales', function() {
+  };
 
   this.timeout(t.timeout);
 

package/test/db.js

@@ -1,10 +1,10 @@
 const t = require('../test-lib/test.js');
 const assert = require('assert');
 
-let apos, apos2;
-
 describe('Db', function() {
 
+  let apos, apos2;
+
   after(async function () {
     await t.destroy(apos);
     await t.destroy(apos2);