fix tests

uNmAnNeR · Sep 19, 2017 · 8c90fde · 8c90fde
1 parent d13cbb9
commit 8c90fde
Show file tree

Hide file tree

Showing 14 changed files with 1,631 additions and 1,627 deletions.
diff --git a/dist/imask.es.js b/dist/imask.es.js
diff --git a/dist/imask.es.js.map b/dist/imask.es.js.map
diff --git a/dist/imask.js b/dist/imask.js
diff --git a/dist/imask.js.map b/dist/imask.js.map
diff --git a/dist/imask.min.es.js b/dist/imask.min.es.js
diff --git a/dist/imask.min.es.js.map b/dist/imask.min.es.js.map
diff --git a/dist/imask.min.js b/dist/imask.min.js
diff --git a/dist/imask.min.js.map b/dist/imask.min.js.map
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,3 +1,5 @@
+var resolve = require('rollup-plugin-node-resolve');
+var commonjs = require('rollup-plugin-commonjs');
 var babel = require('rollup-plugin-babel');
 
 
@@ -30,6 +32,11 @@ module.exports = function (config) {
     browsers: ['Chrome'],
     rollupPreprocessor: {
       plugins: [
+      resolve({
+        jsnext: true,
+        main: true
+      }),
+      commonjs(),
         babel({
           exclude: 'node_modules/**',
         })

diff --git a/src/masked/factory.js b/src/masked/factory.js
@@ -1,4 +1,6 @@
 import {isString} from '../core/utils';
+import Masked from './base';
+import MaskedNumber from './number';
 
 
 export default
@@ -7,23 +9,23 @@ function createMask (opts) {
 
   const mask = opts.mask;
 
-  if (mask instanceof IMask.Masked) {
+  if (mask instanceof Masked) {
     return mask;
   }
   if (mask instanceof RegExp) {
     opts.validate = (value) => mask.test(value);
-    return new IMask.Masked(opts);
+    return new Masked(opts);
   }
   if (isString(mask)) {
     return new IMask.MaskedPattern(opts);
   }
-  if (mask.prototype instanceof IMask.Masked) {
+  if (mask.prototype instanceof Masked) {
     delete opts.mask;
     return new mask(opts);
   }
   if (mask instanceof Number || typeof mask === 'number' || mask === Number) {
     delete opts.mask;
-    return new IMask.MaskedNumber(opts);
+    return new MaskedNumber(opts);
   }
   if (mask instanceof Date || mask === Date) {
     delete opts.mask;
@@ -35,9 +37,9 @@ function createMask (opts) {
   }
   if (mask instanceof Function){
     opts.validate = mask;
-    return new IMask.Masked(opts);
+    return new Masked(opts);
   }
 
   console.warn('Mask not found for', opts);  // eslint-disable-line no-console
-  return new IMask.Masked(opts);
+  return new Masked(opts);
 }
diff --git a/test/imask.js b/test/imask.js
@@ -0,0 +1 @@
+import IMask from '../src/imask';
diff --git a/test/masked/pattern/cursor.js b/test/masked/pattern/cursor.js
@@ -1,12 +1,10 @@
-import PatternMasked from '../../../src/masked/pattern';
+import MaskedPattern from '../../../src/masked/pattern';
 
 
 describe('Align left', function () {
-  const mask = new PatternMasked({
+  const mask = new MaskedPattern({
     mask: '',
-    placeholder: {
-      show: 'always'
-    }
+    placeholder: {lazy: false}
   });
 
   beforeEach(function () {

diff --git a/test/masked/pattern/extract.js b/test/masked/pattern/extract.js
@@ -1,12 +1,10 @@
-import PatternMasked from '../../../src/masked/pattern';
+import MaskedPattern from '../../../src/masked/pattern';
 
 
 describe('Extract', function () {
-  const mask = new PatternMasked({
+  const mask = new MaskedPattern({
     mask: '',
-    placeholder: {
-      show: 'always'
-    }
+    placeholder: {lazy: false}
   });
 
   beforeEach(function () {

diff --git a/test/masked/pattern/insert.js b/test/masked/pattern/insert.js
@@ -1,12 +1,10 @@
-import PatternMasked from '../../../src/masked/pattern';
+import MaskedPattern from '../../../src/masked/pattern';
 
 
 describe('Insert', function () {
-  const mask = new PatternMasked({
+  const mask = new MaskedPattern({
     mask: '',
-    placeholder: {
-      show: 'always'
-    }
+    placeholder: {lazy: false}
   });
 
   beforeEach(function () {