Merge pull request #19 from Atinux/master

Fix: merge array if vmid is undefined
nuxt · Nov 14, 2016 · ace5030 · ace5030
2 parents 5808ab9 + 488d6d1
commit ace5030
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 6 deletions.
diff --git a/examples/vuex-async/App.vue b/examples/vuex-async/App.vue
@@ -10,7 +10,7 @@
   export default {
     metaInfo: {
       meta: [
-        { vmid: 'charset', charset: 'utf-8' }
+        { charset: 'utf-8' }
       ]
     }
   }

diff --git a/examples/webpack.config.babel.js b/examples/webpack.config.babel.js
@@ -25,9 +25,9 @@ export default {
 
   module: {
     loaders: [
-      { test: /\.js$/, exclude: /node_modules/, loader: 'babel' },
-      { test: /\.vue$/, loader: 'vue' },
-      { test: /\.json$/, loader: 'json' }
+      { test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader' },
+      { test: /\.vue$/, loader: 'vue-loader' },
+      { test: /\.json$/, loader: 'json-loader' }
     ]
   },
 

diff --git a/src/shared/getMetaInfo.js b/src/shared/getMetaInfo.js
@@ -43,7 +43,7 @@ export default function _getMetaInfo (options = {}) {
           let shared = false
           for (let sourceIndex in source) {
             const sourceItem = source[sourceIndex]
-            if (targetItem[tagIDKeyName] === sourceItem[tagIDKeyName]) {
+            if (targetItem[tagIDKeyName] && targetItem[tagIDKeyName] === sourceItem[tagIDKeyName]) {
               shared = true
               break
             }

diff --git a/test/getMetaInfo.spec.js b/test/getMetaInfo.spec.js
@@ -1,7 +1,21 @@
 import Vue from 'vue'
 import _getMetaInfo from '../src/shared/getMetaInfo'
+import {
+  VUE_META_KEY_NAME,
+  VUE_META_ATTRIBUTE,
+  VUE_META_SERVER_RENDERED_ATTRIBUTE,
+  VUE_META_TAG_LIST_ID_KEY_NAME
+} from '../src/shared/constants'
 
-const getMetaInfo = _getMetaInfo()
+// set some default options
+const defaultOptions = {
+  keyName: VUE_META_KEY_NAME,
+  attribute: VUE_META_ATTRIBUTE,
+  ssrAttribute: VUE_META_SERVER_RENDERED_ATTRIBUTE,
+  tagIDKeyName: VUE_META_TAG_LIST_ID_KEY_NAME
+}
+
+const getMetaInfo = _getMetaInfo(defaultOptions)
 
 describe('getMetaInfo', () => {
   // const container = document.createElement('div')
@@ -25,4 +39,30 @@ describe('getMetaInfo', () => {
       noscript: []
     })
   })
+
+  it('returns metaInfos when used in component', () => {
+    component = new Vue({
+      metaInfo: {
+        title: 'Hello',
+        meta: [
+          { charset: 'utf-8' }
+        ]
+      }
+    })
+    expect(getMetaInfo(component)).to.eql({
+      title: 'Hello',
+      titleChunk: 'Hello',
+      titleTemplate: '%s',
+      htmlAttrs: {},
+      bodyAttrs: {},
+      meta: [
+        { charset: 'utf-8' }
+      ],
+      base: [],
+      link: [],
+      style: [],
+      script: [],
+      noscript: []
+    })
+  })
 })