Skip to content

Commit bb3fe8e

Browse files
committed
update transition mode specs
1 parent 582a893 commit bb3fe8e

File tree

1 file changed

+41
-59
lines changed

1 file changed

+41
-59
lines changed

test/unit/features/transition/transition-mode.spec.js

Lines changed: 41 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ if (!isIE9) {
2020
it('dynamic components, simultaneous', done => {
2121
const vm = new Vue({
2222
template: `<div>
23-
<component
24-
:is="view"
25-
class="test"
26-
transition>
27-
</component>
23+
<transition>
24+
<component :is="view" class="test">
25+
</component>
26+
</transition>
2827
</div>`,
2928
data: { view: 'one' },
3029
components
@@ -33,13 +32,13 @@ if (!isIE9) {
3332
vm.view = 'two'
3433
waitForUpdate(() => {
3534
expect(vm.$el.innerHTML).toBe(
36-
'<div class="test v-enter v-enter-active">two</div>' +
37-
'<div class="test v-leave v-leave-active">one</div>'
35+
'<div class="test v-leave v-leave-active">one</div>' +
36+
'<div class="test v-enter v-enter-active">two</div>'
3837
)
3938
}).thenWaitFor(nextFrame).then(() => {
4039
expect(vm.$el.innerHTML).toBe(
41-
'<div class="test v-enter-active">two</div>' +
42-
'<div class="test v-leave-active">one</div>'
40+
'<div class="test v-leave-active">one</div>' +
41+
'<div class="test v-enter-active">two</div>'
4342
)
4443
}).thenWaitFor(duration + 10).then(() => {
4544
expect(vm.$el.innerHTML).toBe(
@@ -52,20 +51,16 @@ if (!isIE9) {
5251
let next
5352
const vm = new Vue({
5453
template: `<div>
55-
<component
56-
:is="view"
57-
class="test"
58-
transition="test"
59-
transition-mode="out-in">
60-
</component>
54+
<transition name="test" mode="out-in" @after-leave="afterLeave">
55+
<component :is="view" class="test">
56+
</component>
57+
</transition>
6158
</div>`,
6259
data: { view: 'one' },
6360
components,
64-
transitions: {
65-
test: {
66-
afterLeave () {
67-
next()
68-
}
61+
methods: {
62+
afterLeave () {
63+
next()
6964
}
7065
}
7166
}).$mount(el)
@@ -100,20 +95,16 @@ if (!isIE9) {
10095
let next
10196
const vm = new Vue({
10297
template: `<div>
103-
<component
104-
:is="view"
105-
class="test"
106-
transition="test"
107-
transition-mode="in-out">
108-
</component>
98+
<transition name="test" mode="in-out" @after-enter="afterEnter">
99+
<component :is="view" class="test">
100+
</component>
101+
</transition>
109102
</div>`,
110103
data: { view: 'one' },
111104
components,
112-
transitions: {
113-
test: {
114-
afterEnter () {
115-
next()
116-
}
105+
methods: {
106+
afterEnter () {
107+
next()
117108
}
118109
}
119110
}).$mount(el)
@@ -154,10 +145,9 @@ if (!isIE9) {
154145
it('normal elements with different keys, simultaneous', done => {
155146
const vm = new Vue({
156147
template: `<div>
157-
<div
158-
:key="view"
159-
class="test"
160-
transition>{{view}}</div>
148+
<transition>
149+
<div :key="view" class="test">{{view}}</div>
150+
</transition>
161151
</div>`,
162152
data: { view: 'one' },
163153
components
@@ -166,13 +156,13 @@ if (!isIE9) {
166156
vm.view = 'two'
167157
waitForUpdate(() => {
168158
expect(vm.$el.innerHTML).toBe(
169-
'<div class="test v-enter v-enter-active">two</div>' +
170-
'<div class="test v-leave v-leave-active">one</div>'
159+
'<div class="test v-leave v-leave-active">one</div>' +
160+
'<div class="test v-enter v-enter-active">two</div>'
171161
)
172162
}).thenWaitFor(nextFrame).then(() => {
173163
expect(vm.$el.innerHTML).toBe(
174-
'<div class="test v-enter-active">two</div>' +
175-
'<div class="test v-leave-active">one</div>'
164+
'<div class="test v-leave-active">one</div>' +
165+
'<div class="test v-enter-active">two</div>'
176166
)
177167
}).thenWaitFor(duration + 10).then(() => {
178168
expect(vm.$el.innerHTML).toBe(
@@ -185,19 +175,15 @@ if (!isIE9) {
185175
let next
186176
const vm = new Vue({
187177
template: `<div>
188-
<div
189-
:key="view"
190-
class="test"
191-
transition="test"
192-
transition-mode="out-in">{{view}}</div>
178+
<transition name="test" mode="out-in" @after-leave="afterLeave">
179+
<div :key="view" class="test">{{view}}</div>
180+
</transition>
193181
</div>`,
194182
data: { view: 'one' },
195183
components,
196-
transitions: {
197-
test: {
198-
afterLeave () {
199-
next()
200-
}
184+
methods: {
185+
afterLeave () {
186+
next()
201187
}
202188
}
203189
}).$mount(el)
@@ -232,19 +218,15 @@ if (!isIE9) {
232218
let next
233219
const vm = new Vue({
234220
template: `<div>
235-
<div
236-
:key="view"
237-
class="test"
238-
transition="test"
239-
transition-mode="in-out">{{view}}</div>
221+
<transition name="test" mode="in-out" @after-enter="afterEnter">
222+
<div :key="view" class="test">{{view}}</div>
223+
</transition>
240224
</div>`,
241225
data: { view: 'one' },
242226
components,
243-
transitions: {
244-
test: {
245-
afterEnter () {
246-
next()
247-
}
227+
methods: {
228+
afterEnter () {
229+
next()
248230
}
249231
}
250232
}).$mount(el)

0 commit comments

Comments
 (0)