Skip to content

Commit d07e810

Browse files
Auto stash before merge of "develop" and "origin/develop"
1 parent 60a3d62 commit d07e810

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

tests/models/models.js

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@ const options = {
2929
foo: true
3030
},
3131
vue: {
32-
title: 'bar'
32+
head: {
33+
title: 'bar',
34+
meta: [
35+
{foo: true}
36+
]
37+
}
38+
3339
}
3440
};
3541

@@ -70,5 +76,17 @@ test('Defaults data', t => {
7076
})
7177

7278
test('Defaults vue', t => {
73-
t.is(defaultObject.vue.title, 'bar');
79+
t.is(defaultObject.vue.head.title, 'bar');
80+
})
81+
82+
test('Merges VueObject', t => {
83+
const testVueObject = {
84+
head: {
85+
meta: [
86+
{bar: false}
87+
]
88+
}
89+
}
90+
defaultObject.mergeVueObject(testVueObject);
91+
t.deepEqual(defaultObject.vue.head.meta, [{foo: true}, {bar: false}]);
7492
})

0 commit comments

Comments
 (0)