Skip to content

Commit 2f0a2e5

Browse files
author
Walker Leite
committed
fix(tests): fix test errors
1 parent 0ba8e18 commit 2f0a2e5

File tree

5 files changed

+32
-14
lines changed

5 files changed

+32
-14
lines changed

meta.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ module.exports = {
3636
"server/boot/create-admin.js": "extended",
3737
"server/initial-data/**/*": "extended",
3838
"server/models/**/*": "extended",
39-
"test/client/app.spec.js": "extended === false",
40-
"test/client/main.spec.js": "extended",
4139
"test/client/components/**/*": "extended",
4240
"test/server/account.test.js": "extended",
4341
},

template/test/client/app.spec.js

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,43 @@
11
import Vue from 'vue';
2-
import App from '../../client/App.vue';
2+
import App from '@/App.vue';
3+
{{#extended}}
4+
5+
// Replicates main.js behavior
6+
import 'babel-polyfill';
7+
import Vue from 'vue';
8+
import { sync } from 'vuex-router-sync';
9+
import 'bootstrap-vue/dist/bootstrap-vue.css';
10+
import BootstrapVue from 'bootstrap-vue';
11+
import Icon from 'vue-awesome';
12+
import router from './router.js';
13+
import store from './store';
14+
15+
Vue.use(BootstrapVue);
16+
Vue.component('icon', Icon);
17+
sync(store, router);
18+
{{/extended}}
319

420
describe('App.vue', () => {
521
const Constructor = Vue.extend(App);
622

23+
{{#extended}}
24+
it('should render login view', () => {
25+
const vm = new Constructor({
26+
render: r => r(App),
27+
router,
28+
store,
29+
}).$mount();
30+
31+
return main.$nextTick().then(() => {
32+
expect(main.$el.querySelector('.login-view')).to.not.equal(undefined);
33+
})
34+
})
35+
{{else}}
736
it('should render correct content', () => {
837
const vm = new Constructor().$mount();
938
return Vue.nextTick().then(() => {
1039
expect(vm.$el.innerHTML).to.equal('Hello World!');
1140
});
1241
});
42+
{{/extended}}
1343
});

template/test/client/components/HelloWorld.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ describe('HelloWorld.vue', () => {
77
it('should render correct content', () => {
88
const vm = new Constructor().$mount();
99
return Vue.nextTick().then(() => {
10-
expect(vm.$el.innerHTML).to.equal('Hello World! This content is restricted.');
10+
expect(vm.$el.innerHTML).to.include('Hello World! This content is restricted.');
1111
});
1212
});
1313
});

template/test/client/main.spec.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

template/test/karma.conf.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { dirs } from '../gulp-tasks/config';
66
import { customSass } from '../gulp-tasks/compilers.js';
77

88
const cssBundleFile = tmp.fileSync();
9-
const cssStream = fs.createWriteStream(cssBundleFile.name);
109

1110
export default (config) => {
1211
vueify.compiler.applyConfig({

0 commit comments

Comments
 (0)