-
+
+
{{currentQuestion.message}}
+
+
+
+
diff --git a/frontend/src/components/QuestionTypes/QuestionConfirm.vue b/frontend/src/components/QuestionTypes/QuestionConfirm.vue
index 0f3bac6a..5cd2c7ad 100644
--- a/frontend/src/components/QuestionTypes/QuestionConfirm.vue
+++ b/frontend/src/components/QuestionTypes/QuestionConfirm.vue
@@ -1,9 +1,10 @@
-
-
- Yes
- No
-
+
+
{{currentQuestion.message}}
+
+
+
+
@@ -13,19 +14,11 @@ export default {
props: {
currentQuestion: Object
}
-}
+};
diff --git a/frontend/src/components/QuestionTypes/QuestionEditor.vue b/frontend/src/components/QuestionTypes/QuestionEditor.vue
index 2f596def..7899c941 100644
--- a/frontend/src/components/QuestionTypes/QuestionEditor.vue
+++ b/frontend/src/components/QuestionTypes/QuestionEditor.vue
@@ -1,10 +1,14 @@
-
+ {{currentQuestion.message}}
+
+ >
+
+
\ No newline at end of file
diff --git a/frontend/src/components/QuestionTypes/QuestionExpand.vue b/frontend/src/components/QuestionTypes/QuestionExpand.vue
index 135114b7..575406d3 100644
--- a/frontend/src/components/QuestionTypes/QuestionExpand.vue
+++ b/frontend/src/components/QuestionTypes/QuestionExpand.vue
@@ -1,12 +1,15 @@
-
-
-
+ {{currentQuestion.message}}
+
+ {{ choice.name }}
-
+ >
+
{{ choice.name }}
+
+
@@ -18,22 +21,20 @@ export default {
},
methods: {
onClick(answer) {
- this.currentQuestion.answer = answer
+ this.currentQuestion.answer = answer;
}
}
-}
+};
diff --git a/frontend/src/components/QuestionTypes/QuestionInput.vue b/frontend/src/components/QuestionTypes/QuestionInput.vue
index 4bc4f9cf..cc88eadc 100644
--- a/frontend/src/components/QuestionTypes/QuestionInput.vue
+++ b/frontend/src/components/QuestionTypes/QuestionInput.vue
@@ -1,15 +1,20 @@
-
+
+
\ No newline at end of file
diff --git a/frontend/src/components/QuestionTypes/QuestionList.vue b/frontend/src/components/QuestionTypes/QuestionList.vue
index c0cf508d..ea0cf7d3 100644
--- a/frontend/src/components/QuestionTypes/QuestionList.vue
+++ b/frontend/src/components/QuestionTypes/QuestionList.vue
@@ -1,85 +1,71 @@
-
+
+
{{currentQuestion.message}}
+
+
-
diff --git a/frontend/src/components/Step.vue b/frontend/src/components/Step.vue
index 8a7dddba..3854f6aa 100644
--- a/frontend/src/components/Step.vue
+++ b/frontend/src/components/Step.vue
@@ -1,13 +1,9 @@
-
-
+
-
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 1b2eeea7..6835a780 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -7,7 +7,6 @@ import 'bootstrap/dist/css/bootstrap.css';
import 'bootstrap-vue/dist/bootstrap-vue.css';
import vuetify from "./plugins/vuetify";
-import "material-design-icons-iconfont/dist/material-design-icons.css";
Vue.use(BootstrapVue);
Vue.config.productionTip = false
diff --git a/frontend/src/plugins/vuetify.js b/frontend/src/plugins/vuetify.js
index 2f13eb0b..9ca37f2e 100644
--- a/frontend/src/plugins/vuetify.js
+++ b/frontend/src/plugins/vuetify.js
@@ -4,7 +4,8 @@ import "material-design-icons-iconfont/dist/material-design-icons.css";
import '@mdi/font/css/materialdesignicons.css'
Vue.use(Vuetify, {
- iconfont: 'mdi'
-})
+ iconfont: 'mdi'
+ })
+
export default new Vuetify({
-});
\ No newline at end of file
+});
diff --git a/frontend/tests/components/Done.spec.js b/frontend/tests/components/Done.spec.js
index 944320a0..e9cdaa32 100644
--- a/frontend/tests/components/Done.spec.js
+++ b/frontend/tests/components/Done.spec.js
@@ -1,6 +1,6 @@
import {initComponent, destroy} from '../Utils'
import Done from '../../src/components/Done.vue'
-import { BJumbotron, BButton, BContainer } from 'bootstrap-vue'
+import { BJumbotron, BContainer } from 'bootstrap-vue'
import _ from 'lodash'
@@ -45,7 +45,7 @@ describe('Done.vue', () => {
expect(clickEvent.currentTarget.dataset.commandName).toBe('workbench.action.closeActiveEditor')
})
wrapper.setMethods({executeCommand: executeCommandMock})
- wrapper.find(BButton).trigger('click')
+ wrapper.find('button').trigger('click')
expect(executeCommandMock).toHaveBeenCalled()
})
@@ -55,7 +55,7 @@ describe('Done.vue', () => {
postMessage: jest.fn()
}
wrapper = initComponent(Done, { doneMessage: testDoneMessage, donePath: 'testDonePath', isInVsCode: true}, true)
- const buttons = wrapper.findAll(BButton)
+ const buttons = wrapper.findAll('button')
const nWorkspaceButton = buttons.wrappers[1]
nWorkspaceButton.trigger('click')
expect(window.vscode.postMessage).toHaveBeenCalled()
diff --git a/frontend/tests/components/QuestionTypes/QuestionCheckbox.spec.js b/frontend/tests/components/QuestionTypes/QuestionCheckbox.spec.js
index 30c05140..d31c5d13 100644
--- a/frontend/tests/components/QuestionTypes/QuestionCheckbox.spec.js
+++ b/frontend/tests/components/QuestionTypes/QuestionCheckbox.spec.js
@@ -1,6 +1,5 @@
import QuestionCheckbox from '../../../src/components/QuestionTypes/QuestionCheckbox.vue'
import { initComponent, destroy } from '../../Utils'
-import {BFormCheckboxGroup} from 'bootstrap-vue'
let wrapper
@@ -63,8 +62,8 @@ describe('QuestionCheckbox.vue', () => {
}
})
- const bFormCheckboxGroup = wrapper.find(BFormCheckboxGroup)
- expect(bFormCheckboxGroup.vm.options[0].text).toBe('testName1')
+ const bFormCheckboxGroup = wrapper.find('v-checkbox-stub')
+ expect(bFormCheckboxGroup.vm.label).toBe('testName1')
})
test('choices is not array', () => {
@@ -74,8 +73,8 @@ describe('QuestionCheckbox.vue', () => {
}
})
- const bFormCheckboxGroup = wrapper.find(BFormCheckboxGroup)
- expect(bFormCheckboxGroup.vm.options).toHaveLength(0)
+ const bFormCheckboxGroup = wrapper.find('v-checkbox-stub')
+ expect(bFormCheckboxGroup.vm).toBeUndefined()
})
})
})
diff --git a/frontend/tests/components/QuestionTypes/QuestionExpand.spec.js b/frontend/tests/components/QuestionTypes/QuestionExpand.spec.js
index b15dd923..976f442f 100644
--- a/frontend/tests/components/QuestionTypes/QuestionExpand.spec.js
+++ b/frontend/tests/components/QuestionTypes/QuestionExpand.spec.js
@@ -1,5 +1,4 @@
import QuestionExpand from '../../../src/components/QuestionTypes/QuestionExpand.vue'
-import {BButton} from 'bootstrap-vue'
import {initComponent, destroy} from '../../Utils'
let wrapper
@@ -19,7 +18,7 @@ describe('QuestionExpand.vue', () => {
expect(wrapper.vm.currentQuestion.answer).toBeUndefined()
- wrapper.find(BButton).trigger('click')
+ wrapper.find('button').trigger('click')
await wrapper.vm.$nextTick()
expect(wrapper.vm.currentQuestion.answer).toBe('testValue')
diff --git a/frontend/tests/components/QuestionTypes/QuestionInput.spec.js b/frontend/tests/components/QuestionTypes/QuestionInput.spec.js
index 18461242..50950d26 100644
--- a/frontend/tests/components/QuestionTypes/QuestionInput.spec.js
+++ b/frontend/tests/components/QuestionTypes/QuestionInput.spec.js
@@ -1,5 +1,4 @@
import QuestionInput from '../../../src/components/QuestionTypes/QuestionInput.vue'
-import {BFormInput} from 'bootstrap-vue'
import {initComponent, destroy} from '../../Utils'
let wrapper
@@ -18,7 +17,7 @@ describe('QuestionInput.vue', () => {
}
})
- const bFormInput = wrapper.find(BFormInput)
+ const bFormInput = wrapper.find('v-text-field-stub')
expect(bFormInput.vm.type).toBe('time')
})
@@ -29,7 +28,7 @@ describe('QuestionInput.vue', () => {
}
})
- const bFormInput = wrapper.find(BFormInput)
+ const bFormInput = wrapper.find('v-text-field-stub')
expect(bFormInput.vm.type).toBe('text')
})
})
diff --git a/frontend/tests/components/QuestionTypes/QuestionList.spec.js b/frontend/tests/components/QuestionTypes/QuestionList.spec.js
index a3747d0c..bbedf6d0 100644
--- a/frontend/tests/components/QuestionTypes/QuestionList.spec.js
+++ b/frontend/tests/components/QuestionTypes/QuestionList.spec.js
@@ -1,5 +1,4 @@
import QuestionList from '../../../src/components/QuestionTypes/QuestionList.vue'
-import {BFormSelect} from 'bootstrap-vue'
import {initComponent, destroy} from '../../Utils'
let wrapper
@@ -115,7 +114,7 @@ describe('QuestionList.vue', () => {
}
})
- const options = wrapper.find(BFormSelect).vm.options
+ const options = wrapper.find('v-select-stub').vm.items
expect(options).toHaveLength(0)
})
@@ -131,7 +130,7 @@ describe('QuestionList.vue', () => {
}
})
- const options = wrapper.find(BFormSelect).vm.options
+ const options = wrapper.find('v-select-stub').vm.items
expect(options).toHaveLength(4)
expect(options[0].name).toBe('testName1')
expect(options[0].text).toBe('testText1')