`
@@ -1538,7 +1523,7 @@ id, xml:base, xml:lang, sec-type, disp-level, specific-use
**Contains**:
-title?,(boxed-text|chem-struct-wrap|fig|fig-group|table-wrap|disp-formula|disp-formula-group|def-list|list|p|preformat|disp-quote|supplementary-material|disp-formula|disp-formula-group|def-list|list|p|ack|disp-quote|speech|statement|verse-group)*,sec*
+title?,(boxed-text|chem-struct-wrap|fig|table-wrap|disp-formula|disp-formula-group|def-list|list|p|preformat|disp-quote|supplementary-material|disp-formula|disp-formula-group|def-list|list|p|ack|disp-quote|speech|statement|verse-group)*,sec*
**This element may be contained in:**
@@ -2116,6 +2101,7 @@ element-citation, date, pub-date
- equation-count
- etal
- fig-count
+- fig-group
- floats-group
- front-stub
- funding-statement
diff --git a/index.node.js b/index.node.js
new file mode 100644
index 000000000..bfaf7cfdc
--- /dev/null
+++ b/index.node.js
@@ -0,0 +1,2 @@
+export * from './index.js'
+export * from './src/dar-server/index.js'
diff --git a/make.js b/make.js
index 50c10afc1..9cb7a121a 100644
--- a/make.js
+++ b/make.js
@@ -5,6 +5,7 @@ const path = require('path')
const fork = require('substance-bundler/extensions/fork')
const vfs = require('substance-bundler/extensions/vfs')
const rollup = require('substance-bundler/extensions/rollup')
+const postcss = require('substance-bundler/extensions/postcss')
const yazl = require('yazl')
const compileSchema = require('texture-xml-utils/bundler/compileSchema')
const generateSchemaDocumentation = require('texture-xml-utils/bundler/generateSchemaDocumentation')
@@ -12,6 +13,9 @@ const commonjs = require('rollup-plugin-commonjs')
const nodeResolve = require('rollup-plugin-node-resolve')
const istanbul = require('substance-bundler/extensions/rollup/rollup-plugin-istanbul')
+let _require = require('esm')(module)
+const serve = _require('./src/dar-server/serve').default
+
const DIST = 'dist/'
const APPDIST = 'app-dist/'
const TMP = 'tmp/'
@@ -26,7 +30,6 @@ b.yargs.option('d', {
})
let argv = b.yargs.argv
if (argv.d) {
- const serve = require('./src/dar/serve')
const rootDir = argv.d
const archiveDir = path.resolve(path.join(__dirname, rootDir))
serve(b.server, {
@@ -55,7 +58,7 @@ b.task('lib', ['clean', 'build:schema', 'build:assets', 'build:lib'])
b.task('dev', ['clean', 'build:schema', 'build:assets', 'build:demo'])
.describe('builds the web bundle.')
-b.task('desktop', ['clean', 'build:schema', 'build:assets', 'build:lib:browser', 'build:desktop'])
+b.task('desktop', ['clean', 'build:schema', 'build:assets', 'build:lib', 'build:desktop'])
.describe('builds the desktop bundle (electron).')
b.task('test-nodejs', ['clean', 'build:schema', 'build:test-assets'])
@@ -70,7 +73,7 @@ b.task('test:browser', ['test-browser'])
// spawns electron after build is ready
b.task('run-app', ['desktop'], () => {
// Note: `await=false` is important, as otherwise bundler would await this to finish
- fork(b, require.resolve('electron/cli.js'), '.', { verbose: true, cwd: APPDIST, await: false })
+ fork(b, require.resolve('electron/cli.js'), ['.'], { verbose: true, cwd: APPDIST, await: false })
}).describe('runs the application in electron.')
b.task('schema:texture-article', () => {
@@ -107,8 +110,14 @@ b.task('build:assets', function () {
b.copy('./node_modules/substance/dist/substance.js*', DIST + 'lib/substance/')
b.copy('./node_modules/substance/dist/substance.min.js*', DIST + 'lib/substance/')
b.copy('./node_modules/texture-plugin-jats/dist', DIST + 'plugins/texture-plugin-jats')
- b.css('texture.css', DIST + 'texture.css')
- b.css('texture-reset.css', DIST + 'texture-reset.css')
+ postcss(b, {
+ from: 'texture.css',
+ to: DIST + 'texture.css'
+ })
+ postcss(b, {
+ from: 'texture-reset.css',
+ to: DIST + 'texture-reset.css'
+ })
})
b.task('build:schema', ['schema:texture-article'])
@@ -139,7 +148,8 @@ b.task('build:desktop', ['build:desktop:dars'], () => {
;[
'texture.js',
'texture.css',
- 'texture-reset.css'
+ 'texture-reset.css',
+ 'dar-server.js'
].forEach(f => {
b.copy(`dist/${f}`, APPDIST + 'lib/')
b.copy(`dist/${f}.map`, APPDIST + 'lib/')
@@ -194,13 +204,12 @@ b.task('build:desktop', ['build:desktop:dars'], () => {
]
})
// execute 'install-app-deps'
- fork(b, require.resolve('electron-builder/out/cli/cli.js'), 'install-app-deps', { verbose: true, cwd: APPDIST, await: true })
+ fork(b, require.resolve('electron-builder/out/cli/cli.js'), ['install-app-deps'], { verbose: true, cwd: APPDIST, await: true })
})
b.task('build:desktop:dars', () => {
// templates
_packDar('data/blank', APPDIST + 'templates/blank.dar')
- _packDar('data/blank-figure-package', APPDIST + 'templates/blank-figure-package.dar')
// examples
_packDar('data/elife-32671', APPDIST + 'examples/elife-32671.dar')
_packDar('data/kitchen-sink', APPDIST + 'examples/kitchen-sink.dar')
@@ -302,15 +311,16 @@ b.task('build:coverage:nodejs', ['build:schema', 'build:test-assets'], () => {
b.task('run:coverage:browser', () => {
// Note: `await=false` is important, as otherwise bundler would await this to finish
- fork(b, require.resolve('electron/cli.js'), '.', '--coverage', { verbose: true, cwd: path.join(__dirname, 'builds', 'test'), await: true })
+ fork(b, require.resolve('electron/cli.js'), ['.', '--coverage'], { verbose: true, cwd: path.join(__dirname, 'builds', 'test'), await: true })
})
b.task('run:test:electron', ['test-browser'], () => {
// Note: `await=false` is important, as otherwise bundler would await this to finish
- fork(b, require.resolve('electron/cli.js'), '.', { verbose: true, cwd: path.join(__dirname, 'builds', 'test'), await: false })
+ fork(b, require.resolve('electron/cli.js'), ['.'], { verbose: true, cwd: path.join(__dirname, 'builds', 'test'), await: false })
})
function _buildCoverageBundle (target) {
+ let input = 'index.js'
let output = []
if (target === 'browser') {
output.push({
@@ -324,13 +334,14 @@ function _buildCoverageBundle (target) {
})
}
if (target === 'nodejs') {
+ input = 'index.node.js'
output.push({
file: 'tmp/texture.instrumented.cjs.js',
format: 'cjs'
})
}
rollup(b, {
- input: './index.js',
+ input,
external: [
'substance',
'katex'
@@ -353,6 +364,13 @@ function _buildCoverageBundle (target) {
/* HELPERS */
function _buildLib (DEST, platform) {
+ const external = ['substance', 'katex', 'vfs']
+ const plugins = [
+ nodeResolve(),
+ commonjs({
+ include: 'node_modules/**'
+ })
+ ]
let output = []
if (platform === 'browser' || platform === 'all') {
output.push({
@@ -367,13 +385,6 @@ function _buildLib (DEST, platform) {
sourcemap: true
})
}
- if (platform === 'nodejs' || platform === 'all') {
- output.push({
- file: DEST + 'texture.cjs.js',
- format: 'cjs',
- sourcemap: true
- })
- }
if (platform === 'es' || platform === 'all') {
output.push({
file: DEST + 'texture.es.js',
@@ -381,17 +392,27 @@ function _buildLib (DEST, platform) {
sourcemap: true
})
}
- rollup(b, {
- input: './index.js',
- external: ['substance', 'katex', 'vfs'],
- output,
- plugins: [
- nodeResolve(),
- commonjs({
- include: 'node_modules/**'
- })
- ]
- })
+ // HACK: using a different entry point for nodejs build
+ if (platform !== 'nodejs') {
+ rollup(b, {
+ input: './index.js',
+ external,
+ output,
+ plugins
+ })
+ }
+ if (platform === 'nodejs' || platform === 'all') {
+ rollup(b, {
+ input: './index.node.js',
+ output: {
+ file: DEST + 'texture.cjs.js',
+ format: 'cjs',
+ sourcemap: true
+ },
+ external,
+ plugins
+ })
+ }
}
function _packDar (dataFolder, darPath) {
diff --git a/package.json b/package.json
index 3b2b68075..0959d5d86 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "substance-texture",
- "version": "3.0.0-preview-5",
+ "version": "3.0.0-preview-18",
"author": {
"name": "Substance",
"email": "info@substance.io"
@@ -8,17 +8,19 @@
"description": "A word processor for structured content.",
"main": "./dist/texture.cjs.js",
"browser": "./dist/texture.js",
- "jsnext:main": "index.js",
+ "module": "./dist/texture.es.js",
+ "esnext": "index.js",
"dependencies": {
"debug": "4.1.1",
"fs-extra": "7.0.1",
"katex": "0.10.0",
- "substance": "1.0.2",
+ "parse-formdata": "1.0.2",
+ "texture-xml-utils": "0.2.1",
"yauzl": "2.10.0",
"yazl": "2.5.1"
},
- "peerDependency": {
- "substance": "^1.0.2"
+ "peerDependencies": {
+ "substance": "^1.1.0-preview.27"
},
"devDependencies": {
"colors": "1.3.3",
@@ -32,17 +34,16 @@
"istanbul-lib-instrument": "3.3.0",
"module-alias": "2.2.0",
"nyc": "14.1.1",
- "parse-formdata": "1.0.2",
"rollup": "1.11.3",
"rollup-plugin-commonjs": "9.3.4",
"rollup-plugin-node-resolve": "4.2.3",
"source-map-support": "0.5.10",
"standard": "12.0.1",
- "substance-bundler": "0.26.4",
+ "substance": "1.1.0-preview.27",
+ "substance-bundler": "0.27.0",
"substance-test": "0.14.0",
"tap-spec": "5.0.0",
- "texture-plugin-jats": "0.2.0",
- "texture-xml-utils": "0.2.0"
+ "texture-plugin-jats": "0.2.0"
},
"scripts": {
"prepack": "npm install && node make publish",
@@ -77,7 +78,8 @@
"index.js",
"*.md",
"package.json",
- "*.css"
+ "*.css",
+ "tmp"
],
"publishConfig": {
"tag": "next"
diff --git a/src/Texture.js b/src/Texture.js
index ece8d997e..032e83587 100644
--- a/src/Texture.js
+++ b/src/Texture.js
@@ -1,4 +1,4 @@
-import { Component, platform } from 'substance'
+import { Component, platform, $$ } from 'substance'
import TextureConfigurator from './TextureConfigurator'
import ArticlePackage from './article/ArticlePackage'
import { PinnedMessage } from './kit/ui'
@@ -11,9 +11,17 @@ export default class Texture extends Component {
}
}
- render ($$) {
- const config = this.props.config
- const archive = this.props.archive
+ getChildContext () {
+ const { config, archive, editable } = this.props
+ return {
+ config,
+ archive,
+ editable
+ }
+ }
+
+ render () {
+ const { config, archive } = this.props
let el = $$('div').addClass('sc-texture')
// TODO: switch by current document tab
diff --git a/src/TextureAppMixin.js b/src/TextureAppMixin.js
index 643704824..d5a0b615e 100644
--- a/src/TextureAppMixin.js
+++ b/src/TextureAppMixin.js
@@ -1,16 +1,18 @@
+import { isNil, $$ } from 'substance'
import Texture from './Texture'
import TextureArchive from './TextureArchive'
export default function TextureAppMixin (ParentAppChrome) {
return class TextureApp extends ParentAppChrome {
- render ($$) {
+ render () {
let el = $$('div').addClass('sc-app')
let { archive, error } = this.state
+ let editable = isNil(this.props.editable) ? true : this.props.editable
if (archive) {
const config = this._config
const Texture = this._getAppClass()
el.append(
- $$(Texture, { config, archive }).ref('texture')
+ $$(Texture, { config, archive, editable }).ref('texture')
)
} else if (error) {
let ErrorRenderer = this.getComponent(error.type)
diff --git a/src/TextureArchive.js b/src/TextureArchive.js
index ab8ef7afd..50cbb7e47 100644
--- a/src/TextureArchive.js
+++ b/src/TextureArchive.js
@@ -11,8 +11,8 @@ export default class TextureArchive extends PersistedDocumentArchive {
let manifestXML = _importManifest(rawArchive)
let manifest = this._loadManifest({ data: manifestXML })
documents['manifest'] = manifest
- let entries = manifest.getDocumentEntries()
+ let entries = manifest.getDocumentEntries()
entries.forEach(entry => {
let record = rawArchive.resources[entry.path]
// Note: this happens when a resource is referenced in the manifest
diff --git a/src/TextureConfigurator.js b/src/TextureConfigurator.js
index dabcfca5f..daeb7243b 100644
--- a/src/TextureConfigurator.js
+++ b/src/TextureConfigurator.js
@@ -1,3 +1,57 @@
-import { Configurator } from 'substance'
+import { Configurator, flatten, isArray } from 'substance'
-export default class TextureConfigurator extends Configurator {}
+export default class TextureConfigurator extends Configurator {
+ constructor (...args) {
+ super(...args)
+
+ // Note: in Texture we use 'command-groups' to allow register
+ // a commands in groups, which are then used in tool-panels.
+ // When it comes to execution these groups need to be rolled out.
+ this._compiledToolPanels = new Map()
+ }
+
+ getToolPanel (name, strict) {
+ if (this._compiledToolPanels.has(name)) {
+ return this._compiledToolPanels.get(name)
+ }
+ const toolPanelSpec = super.getToolPanel(name, strict)
+ let compiledToolPanel
+ if (isArray(toolPanelSpec)) {
+ compiledToolPanel = toolPanelSpec.map(itemSpec => this._compileToolPanelItem(itemSpec))
+ } else {
+ compiledToolPanel = this._compileToolPanelItem(toolPanelSpec)
+ }
+ this._compiledToolPanels.set(name, compiledToolPanel)
+ return compiledToolPanel
+ }
+
+ _compileToolPanelItem (itemSpec) {
+ let item = Object.assign({}, itemSpec)
+ let type = itemSpec.type
+ switch (type) {
+ case 'command': {
+ if (!itemSpec.name) throw new Error("'name' is required for type 'command'")
+ break
+ }
+ case 'command-group':
+ return this.getCommandGroup(itemSpec.name).map(commandName => {
+ return {
+ type: 'command',
+ name: commandName
+ }
+ })
+ case 'prompt':
+ case 'group':
+ case 'dropdown':
+ item.items = flatten(itemSpec.items.map(itemSpec => this._compileToolPanelItem(itemSpec)))
+ break
+ case 'custom':
+ case 'separator':
+ case 'spacer':
+ break
+ default:
+ throw new Error('Unsupported tool panel item type: ' + type)
+ }
+ return item
+ }
+}
diff --git a/src/article/ArticlePackage.js b/src/article/ArticlePackage.js
index 790275042..cfb2e9881 100644
--- a/src/article/ArticlePackage.js
+++ b/src/article/ArticlePackage.js
@@ -19,9 +19,14 @@ import ArticleHTMLImporter from './converter/html/ArticleHTMLImporter'
import ArticleJATSConverters from './converter/jats/ArticleJATSConverters'
import ArticleJATSExporter from './converter/jats/ArticleJATSExporter'
import ArticleJATSImporter from './converter/jats/ArticleJATSImporter'
-import ArticlePlainTextExporter from './converter/text/ArticlePlainTextExporter'
import JATSTransformer from './converter/transform/jats/JATSTransformer'
-import { ManuscriptEditor } from './components'
+import DefaultArticleEditor from './components/DefaultArticleEditor'
+import FigureManager from './shared/FigureManager'
+import FootnoteManager from './shared/FootnoteManager'
+import ReferenceManager from './shared/ReferenceManager'
+import EquationManager from './shared/EquationManager'
+import FileManager from './shared/FileManager'
+import TableManager from './shared/TableManager'
export default {
name: 'article',
@@ -79,8 +84,6 @@ export default {
articleConfig.addImporter('html', ArticleHTMLImporter)
articleConfig.addExporter('html', ArticleHTMLExporter)
- articleConfig.addExporter('text', ArticlePlainTextExporter)
-
// ATTENTION: FigureLabelGenerator works a bit differently
// TODO: consolidate LabelGenerators and configuration
// e.g. it does not make sense to say 'setLabelGenerator' but then only provide a configuration for 'NumberedLabelGenerator'
@@ -95,7 +98,7 @@ export default {
and: ',',
to: '-'
}))
- articleConfig.setValue('formula-label-generator', new NumberedLabelGenerator({
+ articleConfig.setValue('equation-label-generator', new NumberedLabelGenerator({
template: '($)',
and: ',',
to: '-'
@@ -105,7 +108,7 @@ export default {
and: ',',
to: '-'
}))
- articleConfig.setValue('supplementary-file-label-generator', new NumberedLabelGenerator({
+ articleConfig.setValue('file-label-generator', new NumberedLabelGenerator({
name: 'Supplementary File',
plural: 'Supplementary Files',
and: ',',
@@ -118,11 +121,18 @@ export default {
to: '-'
}))
- // The default article-editor is a ManuscriptEditor
- // TODO: think about how Texture can allow customizations that use a different editor
- articleConfig.addComponent('article-editor', ManuscriptEditor)
+ // The default article-editor is a DefaultArticleEditor
+ // TODO: document how a plugin can override this, for a specific article type
+ articleConfig.addComponent('article-editor', DefaultArticleEditor)
articleConfig.import(ManuscriptPackage)
+ articleConfig.addService('figure-manager', FigureManager.create)
+ articleConfig.addService('footnote-manager', FootnoteManager.create)
+ articleConfig.addService('equation-manager', EquationManager.create)
+ articleConfig.addService('reference-manager', ReferenceManager.create)
+ articleConfig.addService('file-manager', FileManager.create)
+ articleConfig.addService('table-manager', TableManager.create)
+
articleConfig.import(MetadataPackage)
}
}
diff --git a/src/article/ArticlePanel.js b/src/article/ArticlePanel.js
index 9502ac9b9..f2bf52de8 100644
--- a/src/article/ArticlePanel.js
+++ b/src/article/ArticlePanel.js
@@ -1,8 +1,7 @@
-import { Component, platform } from 'substance'
+import { Component, $$, platform } from 'substance'
import { AppState, createComponentContext } from '../kit'
import DefaultSettings from './settings/DefaultSettings'
import EditorSettings from './settings/ExperimentalEditorSettings'
-import FigurePackageSettings from './settings/FigurePackageSettings'
import ArticleAPI from './api/ArticleAPI'
import ArticleEditorSession from './api/ArticleEditorSession'
@@ -10,7 +9,6 @@ export default class ArticlePanel extends Component {
constructor (...args) {
super(...args)
- // TODO: should we really (ab-)use the regular Component state as AppState?
this._initialize(this.props, this.state)
}
@@ -18,6 +16,8 @@ export default class ArticlePanel extends Component {
return {
executeCommand: this._executeCommand,
toggleOverlay: this._toggleOverlay,
+ // TODO: is this really the right place?
+ // IMO this is editor specific and should go into BasicArticleEditor
startWorkflow: this._startWorkflow,
closeModal: this._closeModal,
scrollElementIntoView: this._scrollElementIntoView,
@@ -47,14 +47,20 @@ export default class ArticlePanel extends Component {
let api = new ArticleAPI(editorSession, archive, config)
this.api = api
- let context = Object.assign(this.context, createComponentContext(config), {
+ const self = this
+ let context = Object.assign({
+ // HACK: as it is not appropriate to register the ArticlePanel as 'context.editor'
+ // it is necessary to provide a getter via context, passing the actual article-editor instance
+ get editor () {
+ return self.refs.content
+ }
+ }, this.context, createComponentContext(config), {
config,
editorSession,
editorState: appState,
api,
archive,
- urlResolver: archive,
- editor: this
+ urlResolver: archive
})
this.context = context
@@ -118,15 +124,15 @@ export default class ArticlePanel extends Component {
)
}
- render ($$) {
+ render () {
let el = $$('div').addClass('sc-article-panel')
el.append(
- this._renderContent($$)
+ this._renderContent()
)
return el
}
- _renderContent ($$) {
+ _renderContent () {
const props = this.props
const api = this.api
const archive = props.archive
@@ -163,13 +169,8 @@ export default class ArticlePanel extends Component {
// On the long run we need to understand better what different means of configuration we want to offer
_createSettings (doc) {
let settings = new EditorSettings()
- let metadata = doc.get('metadata')
// Default settings
settings.load(DefaultSettings)
- // Article type specific settings
- if (metadata.articleType === 'figure-package') {
- settings.extend(FigurePackageSettings)
- }
return settings
}
@@ -204,6 +205,11 @@ export default class ArticlePanel extends Component {
return this.refs.content._scrollElementIntoView(el, force)
}
+ /**
+ * Scroll to the node or other content.
+ *
+ * @param {string} params.nodeId
+ */
_scrollTo (params) {
return this.refs.content._scrollTo(params)
}
diff --git a/src/article/TextureJATS.rng b/src/article/TextureJATS.rng
index 365560c31..16db16d92 100644
--- a/src/article/TextureJATS.rng
+++ b/src/article/TextureJATS.rng
@@ -54,6 +54,7 @@
+
@@ -532,7 +533,6 @@
Lorem Ipsum
-// //
-// // ![]()
-// //
-// // `
-// test(`MetadataEditor: figure caption should be editable`, t => {
-// let { app } = setupTestApp(t, { archiveId: 'blank' })
-// // FIXME: MetadataEditor is not reacting properly on content changes
-// // i.e. loadBodyFixture must be done before the metadata view is opened
-// let editor = openManuscriptEditor(app)
-// loadBodyFixture(editor, ONE_FIG)
-// editor = openMetadataEditor(app)
-// let figurePanel = editor.find('.sc-card.sm-figure-panel[data-id="fig1"]')
-// let legendEditor = figurePanel.find('.sc-form-row.sm-legend > .se-editor > .sc-container-editor')
-// t.notNil(legendEditor, 'figure panel should have a container editor for the legend')
-// t.end()
-// })
-
-// function _setup (t, seedXML) {
-// let testVfs = createTestVfs(seedXML)
-// let { app } = setupTestApp(t, {
-// vfs: testVfs,
-// archiveId: 'test'
-// })
-// let editor = openMetadataEditor(app)
-// return { editor }
-// }
-
-// function _addItem (metadataEditor, modelName) {
-// // open the add drop down
-// let addDropDown = metadataEditor.find('.sc-tool-dropdown.sm-insert')
-// addDropDown.find('button').click()
-// addDropDown.find('.sc-tool.sm-insert-' + modelName).click()
-// }
diff --git a/test/Storage.test.js b/test/Storage.test.js
index 3b21d8056..bb0748df1 100644
--- a/test/Storage.test.js
+++ b/test/Storage.test.js
@@ -1,10 +1,9 @@
import { testAsync } from 'substance-test'
import { uuid } from 'substance'
-import { DarFileStorage, UnpackedDarFolderStorage } from 'substance-texture'
import { promisify } from './shared/testHelpers'
-
-// ATTENTION: these tests can not be run in the browser
-// because implementation uses filesystem etc.
+// ATTENTION: this is an alias setup in _initLoader
+// TODO: try to find a better solution
+import { DarFileStorage, UnpackedDarFolderStorage } from 'dar-server'
/*
TODO:
diff --git a/test/_initLoader.js b/test/_initLoader.js
index 6803b972b..6ce5b4233 100644
--- a/test/_initLoader.js
+++ b/test/_initLoader.js
@@ -10,10 +10,11 @@ module.exports = function (coverage) {
if (coverage) {
textureEntryPoint = path.join(__dirname, '..', 'tmp', 'texture.instrumented.cjs.js')
} else {
- textureEntryPoint = path.join(__dirname, '..', 'index.js')
+ textureEntryPoint = path.join(__dirname, '..', 'index.node.js')
}
moduleAlias.addAlias('substance-texture', textureEntryPoint)
moduleAlias.addAlias('texture', textureEntryPoint)
+ moduleAlias.addAlias('dar-server', path.join(__dirname, '..', 'src', 'dar-server', 'index.js'))
// register the alias module loaded
moduleAlias()
diff --git a/test/index.js b/test/index.js
index 22ab4bbc9..330a0fb58 100644
--- a/test/index.js
+++ b/test/index.js
@@ -10,8 +10,6 @@ import './CrossReference.test'
import './CustomAbstracts.test'
import './Entity.test'
import './Figure.test'
-import './FigureMetadata.test'
-import './FigurePackage.test'
import './FindAndReplace.test'
import './Footnotes.test'
import './FormulaConverter.test'
@@ -29,8 +27,6 @@ import './Table.test'
import './TableConverter.test'
import './UndoRedo.test'
import './Validator.test'
-// FIXME: bring back all relevant tests from MetadataEditor.test
-// import './MetadataEditor.test'
// TODO: there are some tests in ./converter/. Either fix them and include here
// or remove them
@@ -60,10 +56,13 @@ if (platform.inNodeJS) {
platform.DEBUG = true
}
+ // this allows to run only a subset of tests
if (process.env.TEST) {
const { test } = require('substance-test')
let harness = test.getHarness()
let re = new RegExp(process.env.TEST)
+ // TODO: it would be nice to remove the other tests
+ // because skipped tests still produce a lot of noise
harness._tests.forEach(t => {
if (!re.exec(t.name)) {
t._skip = true