lcppcl
diff --git a/‎src/directives/component.js
Copy file name to clipboardExpand all lines: src/directives/component.js
+9-2Lines changed: 9 additions & 2 deletions b/‎src/directives/component.js
Copy file name to clipboardExpand all lines: src/directives/component.js
+9-2Lines changed: 9 additions & 2 deletions
diff --git a/‎test/unit/specs/directives/component_spec.js
Copy file name to clipboardExpand all lines: test/unit/specs/directives/component_spec.js
+48-1Lines changed: 48 additions & 1 deletion b/‎test/unit/specs/directives/component_spec.js
Copy file name to clipboardExpand all lines: test/unit/specs/directives/component_spec.js
+48-1Lines changed: 48 additions & 1 deletion
@@ -117,22 +117,29 @@ module.exports = {
     } else {
       this.resolveComponent(value, _.bind(function () {
         this.unbuild(true)
+        if (this.waitingFor) {
+          this.waitingFor.$destroy()
+          this.waitingFor = null
+        }
         var options
         var self = this
         var waitFor = this.waitForEvent
         if (waitFor) {
           options = {
             created: function () {
               this.$once(waitFor, function () {
+                self.waitingFor = null
                 self.transition(this, cb)
               })
             }
           }
         }
         var cached = this.getCached()
-        var newComponent = cached || this.build(options)
+        var newComponent = this.build(options)
         if (!waitFor || cached) {
           this.transition(newComponent, cb)
+        } else {
+          this.waitingFor = newComponent
         }
       }, this))
     }
@@ -273,7 +280,6 @@ module.exports = {
   transition: function (target, cb) {
     var self = this
     var current = this.childVM
-    this.unsetCurrent()
     this.setCurrent(target)
     switch (self.transMode) {
       case 'in-out':
@@ -297,6 +303,7 @@ module.exports = {
    */
 
   setCurrent: function (child) {
+    this.unsetCurrent()
     this.childVM = child
     var refID = child._refID || this.refID
     if (refID) {
 
@@ -312,13 +312,60 @@ if (_.inBrowser) {
         }
       })
       vm.$children[0].$emit('ok')
+      expect(el.textContent).toBe('AAA')
       vm.view = 'view-b'
       _.nextTick(function () {
         expect(el.textContent).toBe('AAA')
         // old vm is already removed, this is the new vm
+        expect(vm.$children.length).toBe(1)
         vm.$children[0].$emit('ok')
         expect(el.textContent).toBe('BBB')
-        done()
+        // ensure switching before ready event correctly
+        // cleans up the component being waited on.
+        // see #1152
+        vm.view = 'view-a'
+        _.nextTick(function () {
+          vm.view = 'view-b'
+          _.nextTick(function () {
+            expect(vm.$children.length).toBe(1)
+            expect(vm.$children[0].$el.textContent).toBe('BBB')
+            done()
+          })
+        })
+      })
+    })
+
+    // #1150
+    it('wait-for + keep-alive', function (done) {
+      var vm = new Vue({
+        el: el,
+        data: {
+          view: 'view-a'
+        },
+        template: '<component is="{{view}}" wait-for="ok" keep-alive></component>',
+        components: {
+          'view-a': {
+            template: 'AAA'
+          },
+          'view-b': {
+            template: 'BBB'
+          }
+        }
+      })
+      vm.$children[0].$emit('ok')
+      expect(el.textContent).toBe('AAA')
+      vm.view = 'view-b'
+      _.nextTick(function () {
+        expect(vm.$children.length).toBe(2)
+        vm.$children[1].$emit('ok')
+        expect(el.textContent).toBe('BBB')
+        vm.view = 'view-a'
+        _.nextTick(function () {
+          // should switch without the need to emit
+          // because of keep-alive
+          expect(el.textContent).toBe('AAA')
+          done()
+        })
       })
     })