Merge pull request #211 from probil/bugfix/#189-mixins-support

Bugfix/#189 mixins support
probil · Dec 2, 2018 · ff680ec · ff680ec
2 parents dcfc247 + 7a770e7
commit ff680ec
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/Main.js b/src/Main.js
@@ -14,6 +14,8 @@ export default {
     // eslint-disable-next-line no-param-reassign
     Vue.prototype.$socket = socket;
     Vue.mixin(createMixin(GlobalEmitter));
+    const strategies = Vue.config.optionMergeStrategies;
+    strategies.sockets = strategies.methods;
   },
   defaults,
 };
diff --git a/src/__tests__/Main.spec.js b/src/__tests__/Main.spec.js
@@ -52,6 +52,25 @@ describe('.install()', () => {
     expect(spy).toHaveBeenCalledTimes(1);
     expect(spy).toHaveBeenCalledWith(expect.any(Object));
   });
+
+  it('correctly merges `sockets` property of the mixin and the component', () => {
+    Vue.use(Main, io('ws://localhost'));
+    const mixinListener = jest.fn();
+    const componentListener = jest.fn();
+    const someMixin = {
+      sockets: { mixinListener },
+    };
+    const wrapper = mount({
+      mixins: [someMixin],
+      render: () => null,
+      sockets: { componentListener },
+    }, { localVue: Vue });
+
+    expect(wrapper.vm.$options.sockets).toMatchObject({
+      mixinListener,
+      componentListener,
+    });
+  });
 });
 
 describe('.defaults', () => {