test: fixed

Author: ulivz

babel.config.js

@@ -3,6 +3,9 @@ module.exports = {
     'test': {
       'presets': [
         ['@babel/preset-env', { 'targets': { 'node': 'current' }}]
+      ],
+      'plugins': [
+        '@babel/plugin-syntax-dynamic-import'
       ]
     }
   }

packages/@vuepress/core/lib/client/dataMixin.js

@@ -1,8 +1,8 @@
 /* global VUEPRESS_TEMP_PATH */
 
-import Vue from 'vue'
+import GLobalVue from 'vue'
 
-export default function dataMixin (I18n, siteData) {
+export default function dataMixin (I18n, siteData, Vue = GLobalVue) {
   prepare(siteData)
   Vue.$vuepress.$set('siteData', siteData)
 

packages/@vuepress/core/lib/node/__tests__/plugin-api/PluginUtil.spec.js

@@ -2,30 +2,30 @@ import { flattenPlugin } from '../../plugin-api/util'
 
 describe('flattenPlugin', () => {
   test('should hydrate plugin correctly', () => {
-    const plugin = { name: 'a', shortcut: 'a', module: { enhanceAppFiles: 'file' }}
+    const plugin = { name: 'a', shortcut: 'a', entry: { enhanceAppFiles: 'file' }}
     const hydratedPlugin = flattenPlugin(plugin, {}, {})
     expect(hydratedPlugin.name).toBe('a')
-    expect(hydratedPlugin.shortcut).toBe('a')
+    expect(hydratedPlugin.shortcut).toBe(null)
     expect(hydratedPlugin.enabled).toBe(true)
     expect(hydratedPlugin.enhanceAppFiles).toBe('file')
   })
 
   test('should set \'enabled\' to false when \'pluginOptions\' is set to false.', () => {
-    const plugin = { name: 'a', shortcut: 'a', module: {}}
+    const plugin = { name: 'a', shortcut: 'a', entry: {}}
     const hydratedPlugin = flattenPlugin(plugin, false, {})
     expect(hydratedPlugin.name).toBe('a')
-    expect(hydratedPlugin.shortcut).toBe('a')
+    expect(hydratedPlugin.shortcut).toBe(null)
     expect(hydratedPlugin.enabled).toBe(false)
   })
 
   test('should flatten functional plugin correctly.', () => {
     const config = jest.fn(() => ({ enhanceAppFiles: 'file' }))
-    const plugin = { name: 'a', shortcut: 'a', module: config }
+    const plugin = { name: 'a', shortcut: 'a', entry: config }
     const pluginOptions = {}
     const pluginContext = {}
     const hydratedPlugin = flattenPlugin(plugin, pluginOptions, pluginContext)
     expect(hydratedPlugin.name).toBe('a')
-    expect(hydratedPlugin.shortcut).toBe('a')
+    expect(hydratedPlugin.shortcut).toBe(null)
     expect(hydratedPlugin.enabled).toBe(true)
     expect(hydratedPlugin.enhanceAppFiles).toBe('file')
     expect(config.mock.calls).toHaveLength(1)
@@ -35,7 +35,7 @@ describe('flattenPlugin', () => {
 
   test('should flatten functional plugin correctly - options defaults to \'{}\'.', () => {
     const config = jest.fn(() => ({ enhanceAppFiles: 'file' }))
-    const plugin = { name: 'a', shortcut: 'a', module: config }
+    const plugin = { name: 'a', shortcut: 'a', entry: config }
     const pluginOptions = undefined
     const pluginContext = {}
     flattenPlugin(plugin, pluginOptions, pluginContext)

packages/@vuepress/core/lib/node/__tests__/prepare/prepare.spec.js renamed to packages/@vuepress/core/lib/node/__tests__/prepare/App.spec.js

@@ -1,5 +1,5 @@
 const { fs, path } = require('@vuepress/shared-utils')
-const prepare = require('../../lib/prepare')
+const App = require('../../App')
 
 const docsBaseDir = path.resolve(__dirname, 'fixtures')
 const docsModeNames = fs.readdirSync(docsBaseDir)
@@ -9,12 +9,16 @@ const docsModes = docsModeNames.map(name => {
   return { name, docsPath, docsTempPath }
 })
 
-describe('prepare', () => {
+describe('App', () => {
   test('should not throw error', async () => {
     await Promise.all(docsModes.map(async ({ name, docsPath, docsTempPath }) => {
       await fs.ensureDir(docsTempPath)
-      const context = await prepare(docsPath, { theme: '@vuepress/default', temp: docsTempPath })
-      expect(context.sourceDir).toBe(docsPath)
+      const app = new App({
+        sourceDir: docsPath,
+        theme: '@vuepress/default',
+        emp: docsTempPath
+      })
+      expect(app.sourceDir).toBe(docsPath)
     }))
   })
 })

packages/@vuepress/core/lib/node/__tests__/prepare/Page.spec.js

@@ -1,19 +1,28 @@
-const Page = require('../../lib/prepare/Page')
+const Page = require('../../Page')
+const App = require('../../App')
+
 const {
-  getComputed,
   getMarkdown,
   getDocument,
   readFile
 } = require('./util')
 
 describe('Page', () => {
+  let app
+  let computed
+
+  beforeAll(async () => {
+    app = new App()
+    await app.process()
+    computed = new app.ClientComputedMixinConstructor()
+  })
+
   test('pure route', async () => {
-    const page = new Page({ path: '/' })
+    const page = new Page({ path: '/' }, app)
 
     expect(page.path).toBe('/')
     expect(page.regularPath).toBe('/')
 
-    const computed = getComputed()
     await page.process({ computed })
 
     expect(page.path).toBe('/')
@@ -22,7 +31,7 @@ describe('Page', () => {
 
   test('pure route - encodeURI', async () => {
     const path = '/尤/'
-    const page = new Page({ path })
+    const page = new Page({ path }, app)
 
     expect(page.path).toBe(encodeURI(path))
     expect(page.regularPath).toBe(encodeURI(path))
@@ -33,7 +42,7 @@ describe('Page', () => {
     const page = new Page({
       path: '/',
       frontmatter
-    })
+    }, app)
     expect(page.frontmatter).toBe(frontmatter)
   })
 
@@ -42,15 +51,16 @@ describe('Page', () => {
     const page = new Page({
       path: '/',
       frontmatter
-    })
+    }, app)
 
     expect(page.frontmatter.title).toBe('alpha')
 
-    const computed = getComputed()
     const enhancers = [
       {
         name: 'plugin-a',
-        value: page => { page.frontmatter.title = 'beta' }
+        value: page => {
+          page.frontmatter.title = 'beta'
+        }
       }
     ]
     await page.process({ computed, enhancers })
@@ -60,14 +70,13 @@ describe('Page', () => {
 
   test('markdown page - pointing to a markdown file', async () => {
     const { relative, filePath } = getDocument('README.md')
-    const page = new Page({ filePath, relative })
+    const page = new Page({ filePath, relative }, app)
 
     expect(page._filePath).toBe(filePath)
     expect(page.regularPath).toBe('/')
     expect(page.path).toBe('/')
     expect(page.frontmatter).toEqual({})
 
-    const computed = getComputed()
     const markdown = getMarkdown()
     await page.process({ computed, markdown })
 
@@ -79,14 +88,13 @@ describe('Page', () => {
 
   test('markdown page - pointing to a markdown file with frontmatter', async () => {
     const { relative, filePath } = getDocument('alpha.md')
-    const page = new Page({ filePath, relative })
+    const page = new Page({ filePath, relative }, app)
 
     expect(page._filePath).toBe(filePath)
     expect(page.regularPath).toBe('/alpha.html')
     expect(page.path).toBe('/alpha.html')
     expect(page.frontmatter).toEqual({})
 
-    const computed = getComputed()
     const markdown = getMarkdown()
     await page.process({ computed, markdown })
 

packages/@vuepress/core/lib/node/__tests__/prepare/util.js

@@ -1,16 +1,6 @@
 const { fs, path } = require('@vuepress/shared-utils')
-const AppContext = require('../../lib/prepare/AppContext')
 const createMarkdown = require('../../../../../markdown/index')
 
-function getAppContext () {
-  return new AppContext('.')
-}
-
-function getComputed () {
-  const context = getAppContext()
-  return new context.ClientComputedMixinConstructor()
-}
-
 const docsBaseDir = path.resolve(__dirname, 'fixtures/docs')
 
 function getDocument (relative) {
@@ -25,8 +15,6 @@ const getMarkdown = createMarkdown
 const readFile = async filePath => await fs.readFile(filePath, 'utf-8')
 
 module.exports = {
-  getAppContext,
-  getComputed,
   getMarkdown,
   getDocument,
   readFile

packages/@vuepress/core/lib/node/__tests__/theme-api/index.spec.js

@@ -1,7 +1,7 @@
 jest.mock('vuepress-theme-parent')
 jest.mock('vuepress-theme-child')
 
-import ThemeAPI from '../../lib/theme-api'
+import ThemeAPI from '../../theme-api'
 import { resolve } from 'path'
 
 const theme = {

packages/@vuepress/markdown/__tests__/__snapshots__/containers.spec.js.snap

@@ -3,18 +3,19 @@
 exports[`highlightLines highlight multiple lines 1`] = `
 <div class="highlight-lines">
   <div class="highlighted">&nbsp;</div>
+  <div class="highlighted">&nbsp;</div><br>
   <div class="highlighted">&nbsp;</div>
-  <br>
-  <div class="highlighted">&nbsp;</div>
-  <div class="highlighted">&nbsp;</div>
-  <br>
-  <br>
-</div>const app = new Vue({ render, router }) app.$mount('#app')
+  <div class="highlighted">&nbsp;</div><br><br>
+</div>const app = new Vue({
+render,
+router
+})
+
+app.$mount('#app')
 `;
 
 exports[`highlightLines highlight single line 1`] = `
 <div class="highlight-lines">
-  <div class="highlighted">&nbsp;</div>
-  <br>
+  <div class="highlighted">&nbsp;</div><br>
 </div>new Vue()
 `;

packages/@vuepress/markdown/__tests__/__snapshots__/highlightLines.spec.js.snap

@@ -18,6 +18,7 @@ exports[`hoist Should miss script and style when using hoist 1`] = `
 
 exports[`hoist Should miss script and style when using hoist 2`] = `
 Object {
+  "__data_block": Object {},
   "hoistedTags": Array [
     <script src="vue.js"></script>,
     <style>

packages/@vuepress/markdown/__tests__/__snapshots__/hoist.spec.js.snap

@@ -5,8 +5,7 @@ exports[`lineNumbers should lineNumbers work with highlightLines 1`] = `
 <div class="language-js line-numbers-mode">
   <!--afterbegin-->
   <div class="highlight-lines">
-    <div class="highlighted">&nbsp;</div>
-    <br>
+    <div class="highlighted">&nbsp;</div><br>
   </div>new Vue()
   <div class="line-numbers-wrapper"></div>
   <!--beforeend-->

packages/@vuepress/markdown/__tests__/__snapshots__/lineNumers.spec.js.snap

@@ -1,25 +1,16 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`link should render external links correctly 1`] = `
-<p>
-  <a href="https://vuejs.org/" target="_blank" rel="noopener noreferrer">vue
-    <OutboundLink/>
-  </a>
-</p>
+<p><a href="https://vuejs.org/" target="_blank" rel="noopener noreferrer">vue
+    <OutboundLink /></a></p>
 `;
 
 exports[`link should render external links correctly 2`] = `
-<p>
-  <a href="http://vuejs.org/" target="_blank" rel="noopener noreferrer">vue
-    <OutboundLink/>
-  </a>
-</p>
+<p><a href="http://vuejs.org/" target="_blank" rel="noopener noreferrer">vue
+    <OutboundLink /></a></p>
 `;
 
 exports[`link should render external links correctly 3`] = `
-<p>
-  <a href="https://google.com" target="_blank" rel="noopener noreferrer">some <strong>link</strong> with <code>code</code>
-    <OutboundLink/>
-  </a>
-</p>
+<p><a href="https://google.com" target="_blank" rel="noopener noreferrer">some <strong>link</strong> with <code>code</code>
+    <OutboundLink /></a></p>
 `;

packages/@vuepress/markdown/__tests__/__snapshots__/link.spec.js.snap

@@ -10,17 +10,11 @@ exports[`snippet import snippet 1`] = `
 exports[`snippet import snippet with highlight multiple lines 1`] = `
 <div class="highlight-lines">
   <div class="highlighted">&nbsp;</div>
-  <div class="highlighted">&nbsp;</div>
-  <div class="highlighted">&nbsp;</div>
-  <br>
-</div>export default function () { // .. }
+</div>
 `;
 
 exports[`snippet import snippet with highlight single line 1`] = `
 <div class="highlight-lines">
   <div class="highlighted">&nbsp;</div>
-  <br>
-  <div class="highlighted">&nbsp;</div>
-  <br>
-</div>export default function () { // .. }
+</div>
 `;

packages/@vuepress/markdown/__tests__/__snapshots__/snippet.spec.js.snap

@@ -1 +1 @@
-<<< @/packages/@vuepress/core/__test__/markdown/fragments/snippet.js{1-3}
+<<< @/packages/@vuepress/markdown/__tests__/fragments/snippet.js{1-3}

packages/@vuepress/markdown/__tests__/fragments/code-snippet-highlightLines-multiple.md

@@ -1 +1 @@
-<<< @/packages/@vuepress/core/__test__/markdown/fragments/snippet.js{1,3}
+<<< @/packages/@vuepress/markdown/__tests__/fragments/snippet.js{1,3}

packages/@vuepress/markdown/__tests__/fragments/code-snippet-highlightLines-single.md

@@ -1 +1 @@
-<<< @/packages/@vuepress/core/__test__/markdown/fragments/snippet.js
+<<< @/packages/@vuepress/markdown/__tests__/fragments/snippet.js

packages/@vuepress/markdown/__tests__/fragments/code-snippet.md

@@ -1,12 +1,13 @@
-import { Md, getFragment } from './util'
+import { getFragment } from '@vuepress/test-utils'
+import { Md } from './util'
 import highlight from '../lib/highlight.js'
 
 const md = Md()
 const mdH = Md().set({ highlight })
 
 describe('highlight', () => {
-  test('should highlight code', async () => {
-    const input = await getFragment('code')
+  test('should highlight code', () => {
+    const input = getFragment(__dirname, 'code.md')
     const output1 = md.render(input)
     const output2 = mdH.render(input)
     expect(output1 === output2).toBe(false)