From af5ea616db4e197588eeebe6094fe8bfafc517e3 Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Fri, 6 Jan 2017 16:25:02 +0800
Subject: [PATCH 1/2] Fix: table unit test, fixed #2243

---
 test/unit/specs/table.spec.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/unit/specs/table.spec.js b/test/unit/specs/table.spec.js
index 91d75c9f8..58d18254b 100644
--- a/test/unit/specs/table.spec.js
+++ b/test/unit/specs/table.spec.js
@@ -1305,8 +1305,8 @@ describe('Table', () => {
         vm.label = 'NAME';
         vm.$nextTick(() => {
           expect(vm.$el.querySelector('.el-table__header th .cell').textContent).to.equal('NAME');
+          done();
         });
-        done();
       }, DELAY);
     });
 
@@ -1334,8 +1334,8 @@ describe('Table', () => {
         vm.align = 'right';
         vm.$nextTick(() => {
           expect(vm.$el.querySelectorAll('.el-table__body td.is-right').length > 0).to.be.true;
+          done();
         });
-        done();
       }, DELAY);
     });
 
@@ -1409,8 +1409,8 @@ describe('Table', () => {
         vm.width = 200;
         vm.$nextTick(() => {
           expect(vm.$el.querySelector('.el-table__body col').getAttribute('width')).to.equal('200');
+          done();
         });
-        done();
       }, DELAY);
     });
 
@@ -1438,8 +1438,8 @@ describe('Table', () => {
         vm.width = 200;
         vm.$nextTick(() => {
           expect(vm.$el.querySelector('.el-table__body col').getAttribute('width')).to.equal('200');
+          done();
         });
-        done();
       }, DELAY);
     });
 
@@ -1470,8 +1470,8 @@ describe('Table', () => {
         vm.fixed = true;
         vm.$nextTick(() => {
           expect(!!vm.$el.querySelector('.el-table__fixed')).to.be.true;
+          done();
         });
-        done();
       }, DELAY);
     });
 
@@ -1507,8 +1507,8 @@ describe('Table', () => {
           firstColumnContent = vm.$el.querySelector('.el-table__body td .cell').textContent;
           secondColumnContent = vm.$el.querySelector('.el-table__body td:nth-child(2) .cell').textContent;
           expect(firstColumnContent === secondColumnContent).to.be.true;
+          done();
         });
-        done();
       }, DELAY);
     });
   });

From f234e08fa3cd8a91613a4eff25be4370a2e01d64 Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Fri, 6 Jan 2017 17:01:19 +0800
Subject: [PATCH 2/2] Table: fix unit test again.

---
 test/unit/specs/table.spec.js | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/test/unit/specs/table.spec.js b/test/unit/specs/table.spec.js
index 58d18254b..251a024d4 100644
--- a/test/unit/specs/table.spec.js
+++ b/test/unit/specs/table.spec.js
@@ -1305,6 +1305,7 @@ describe('Table', () => {
         vm.label = 'NAME';
         vm.$nextTick(() => {
           expect(vm.$el.querySelector('.el-table__header th .cell').textContent).to.equal('NAME');
+          destroyVM(vm);
           done();
         });
       }, DELAY);
@@ -1334,6 +1335,7 @@ describe('Table', () => {
         vm.align = 'right';
         vm.$nextTick(() => {
           expect(vm.$el.querySelectorAll('.el-table__body td.is-right').length > 0).to.be.true;
+          destroyVM(vm);
           done();
         });
       }, DELAY);
@@ -1378,6 +1380,7 @@ describe('Table', () => {
               expect(vm.$el.querySelectorAll('.el-table__header th.is-left').length).to.equal(0);
               expect(vm.$el.querySelectorAll('.el-table__header th.is-center').length).to.equal(0);
               expect(vm.$el.querySelectorAll('.el-table__header th.is-right').length).to.above(0);
+              destroyVM(vm);
               done();
             });
           });
@@ -1407,10 +1410,11 @@ describe('Table', () => {
       setTimeout(() => {
         expect(vm.$el.querySelector('.el-table__body col').getAttribute('width')).to.equal('100');
         vm.width = 200;
-        vm.$nextTick(() => {
+        setTimeout(() => {
           expect(vm.$el.querySelector('.el-table__body col').getAttribute('width')).to.equal('200');
+          destroyVM(vm);
           done();
-        });
+        }, 100);
       }, DELAY);
     });
 
@@ -1436,10 +1440,11 @@ describe('Table', () => {
       setTimeout(() => {
         expect(vm.$el.querySelector('.el-table__body col').getAttribute('width')).to.equal('100');
         vm.width = 200;
-        vm.$nextTick(() => {
+        setTimeout(() => {
           expect(vm.$el.querySelector('.el-table__body col').getAttribute('width')).to.equal('200');
+          destroyVM(vm);
           done();
-        });
+        }, 100);
       }, DELAY);
     });
 
@@ -1468,10 +1473,11 @@ describe('Table', () => {
       setTimeout(() => {
         expect(!vm.$el.querySelector('.el-table__fixed')).to.be.true;
         vm.fixed = true;
-        vm.$nextTick(() => {
+        setTimeout(() => {
           expect(!!vm.$el.querySelector('.el-table__fixed')).to.be.true;
+          destroyVM(vm);
           done();
-        });
+        }, 100);
       }, DELAY);
     });
 
@@ -1479,7 +1485,7 @@ describe('Table', () => {
       const vm = createVue({
         template: `
           <el-table :data="testData">
-            <el-table-column :prop="name" />
+            <el-table-column :prop="prop" />
             <el-table-column prop="release" />
             <el-table-column prop="director" />
             <el-table-column prop="runtime" />
@@ -1502,13 +1508,13 @@ describe('Table', () => {
         let secondColumnContent = vm.$el.querySelector('.el-table__body td:nth-child(2) .cell').textContent;
         expect(firstColumnContent !== secondColumnContent).to.be.true;
         vm.prop = 'release';
-        vm.property = 'release';
-        vm.$nextTick(() => {
+        setTimeout(() => {
           firstColumnContent = vm.$el.querySelector('.el-table__body td .cell').textContent;
           secondColumnContent = vm.$el.querySelector('.el-table__body td:nth-child(2) .cell').textContent;
           expect(firstColumnContent === secondColumnContent).to.be.true;
+          destroyVM(vm);
           done();
-        });
+        }, 100);
       }, DELAY);
     });
   });