fix(override): occured error when using plugin

issues closes #92

Author: kazupon

config/karma.conf.js

@@ -8,7 +8,7 @@ module.exports = function (config) {
 
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-    frameworks: ['mocha'],
+    frameworks: ['mocha', 'sinon'],
 
     // list of files / patterns to load in the browser
     files: [

dist/vue-validator.js

@@ -88,10 +88,6 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _directivesValidator2 = _interopRequireDefault(_directivesValidator);
 
-	var _validation = __webpack_require__(6);
-
-	var _validation2 = _interopRequireDefault(_validation);
-
 	/**
 	 * Install
 	 *
@@ -405,17 +401,15 @@ return /******/ (function(modules) { // webpackBootstrap
 
 /***/ },
 /* 4 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ function(module, exports) {
 
-	'use strict';
+	"use strict";
 
-	Object.defineProperty(exports, '__esModule', {
+	Object.defineProperty(exports, "__esModule", {
 	  value: true
 	});
 
-	var _util = __webpack_require__(1);
-
-	exports['default'] = function (Vue) {
+	exports["default"] = function (Vue) {
 
 	  // override _init
 	  var init = Vue.prototype._init;
@@ -429,12 +423,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	  // override _destroy
 	  var destroy = Vue.prototype._destroy;
 	  Vue.prototype._destroy = function () {
+	    destroy.apply(this, arguments);
 	    this._validatorMaps = null;
-	    destroy.call(this);
 	  };
 	};
 
-	module.exports = exports['default'];
+	module.exports = exports["default"];
 
 /***/ },
 /* 5 */
@@ -462,12 +456,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	    params: ['group'],
 
 	    bind: function bind() {
-	      //console.log('validate:bind', this, this.arg)
 	      var vm = this.vm;
 	      var validatorName = vm.$options._validator;
 	      if (!validatorName) {
 	        // TODO: should be implemented error message
-	        _.warn('TODO: should be implemented error message');
+	        (0, _util.warn)('TODO: should be implemented error message');
 	        return;
 	      }
 
@@ -484,7 +477,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	    },
 
 	    update: function update(value, old) {
-	      //console.log('validate:update', this.arg, value, old, typeof value, JSON.stringify(value))
 	      if (!value) {
 	        return;
 	      }
@@ -518,7 +510,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	    },
 
 	    unbind: function unbind() {
-	      //console.log('validate:unbind', this)
 	      if (this.validator && this.validation) {
 	        if (this.params.group) {
 	          this.validator.removeGroupValidation(this.params.group, this.validation);
@@ -604,7 +595,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'listener',
 	    value: function listener(e) {
-	      //console.log('input event', e.type)
 	      if (e.relatedTarget && (e.relatedTarget.tagName === 'A' || e.relatedTarget.tagName === 'BUTTON')) {
 	        return;
 	      }
@@ -689,14 +679,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	    bind: function bind() {
 	      if (!this.params.name) {
 	        // TODO: should be implemented validator:bind name params nothing error'
-	        _.warn('TODO: should be implemented validator:bind name params nothing error');
+	        (0, _util.warn)('TODO: should be implemented validator:bind name params nothing error');
 	        return;
 	      }
 
 	      var validatorName = this.validatorName = '$' + this.params.name;
 	      if (!this.vm._validatorMaps) {
 	        // TODO: should be implemented error message'
-	        _.warn('TODO: should be implemented error message');
+	        (0, _util.warn)('TODO: should be implemented error message');
 	        return;
 	      }
 
@@ -775,8 +765,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    this.name = name;
 	    this.scope = {}; // TODO: change to Object.create(null)
-	    //this.scope = Object.create(null)
-	    //this.scope.a = 1
+	    /*
+	    this.scope = Object.create(null)
+	    this.scope.a = 1
+	    */
 
 	    this._dir = dir;
 	    this._validations = [];

dist/vue-validator.min.js

@@ -29,12 +29,14 @@
     "karma-phantomjs-launcher": "^0.2.1",
     "karma-safari-launcher": "^0.1.1",
     "karma-sauce-launcher": "^0.2.14",
+    "karma-sinon": "^1.0.4",
     "karma-sourcemap-loader": "^0.3.5",
     "karma-webpack": "^1.7.0",
     "mocha": "^2.3.1",
     "nightmare": "^2.0.5",
     "phantomjs": "^1.9.18",
     "power-assert": "^1.0.0",
+    "sinon": "^1.17.2",
     "vue": "^1.0.8",
     "webpack": "^1.12.1",
     "webpack-dev-server": "^1.11.0"
@@ -68,8 +70,8 @@
     "lint": "eslint src test/specs",
     "mobile": "VUE_VALIDATOR_TYPE=sauce SAUCE=batch3 karma start config/karma.conf.js",
     "sauce": "npm run coolkids && npm run ie && npm run mobile",
-    "unit": "karma start config/karma.conf.js",
     "test": "npm run ci",
+    "unit": "karma start config/karma.conf.js",
     "watch": "babel src --out-dir lib --watch --source-maps-inline"
   }
 }

package.json

@@ -12,7 +12,7 @@ export default function (Vue) {
   // override _destroy
   const destroy = Vue.prototype._destroy
   Vue.prototype._destroy = function () {
+    destroy.apply(this, arguments)
     this._validatorMaps = null
-    destroy.call(this)
   }
 }

src/override.js

@@ -1,9 +1,11 @@
 import Vue from 'vue'
 import VueValidator from '../../src/index'
 
+require('./validators')
+require('./override')
+
 Vue.use(VueValidator)
 
-require('./validators.js')
 require('./asset')
 require('./directives/validator')
 require('./directives/validate')

test/specs/index.js

@@ -0,0 +1,39 @@
+import assert from 'power-assert'
+import override from '../../src/override'
+
+
+describe('override', () => {
+  let Vue
+
+  beforeEach(() => {
+    Vue = function Vue () {}
+    Vue.prototype._init = (options) => {}
+    Vue.prototype._destroy = () => {}
+  })
+
+
+  it('_init', () => {
+    let options = { a: 1 }
+    let spy = sinon.spy(Vue.prototype, '_init')
+    spy.withArgs(options)
+
+    override(Vue)
+    let vm = new Vue()
+    vm._init(options)
+
+    assert(vm._validatorMaps !== undefined)
+    assert(spy.withArgs(options).calledOnce)
+  })
+
+  it('_destroy', () => {
+    let spy = sinon.spy(Vue.prototype, '_destroy')
+    spy.withArgs(false, false)
+
+    override(Vue)
+    let vm = new Vue()
+    vm._destroy(false, false)
+
+    assert(vm._validatorMaps === null)
+    assert(spy.withArgs(false, false).calledOnce)
+  })
+})