-
{{ query.name }}
+
{{ inquiry.name }}
Predefined
-
- Predefined queries come from the server.
- These queries can’t be deleted or renamed.
+
+ Predefined inquiries come from the server.
+ These inquiries can’t be deleted or renamed.
-
{{ query.createdAt | date }}
+
{{ inquiry.createdAt | date }}
-
Cancel
- Rename
+ Rename
-
+
{{ deleteDialogMsg }}
-
+
- Note: Predefined queries you've selected won't be deleted
+ Note: Predefined inquiries you've selected won't be deleted
Cancel
- Delete
+ Delete
- Duplicate query
+
+ Duplicate inquiry
@@ -27,7 +26,13 @@ import tooltipMixin from '@/tooltipMixin'
export default {
name: 'CopyIcon',
- mixins: [tooltipMixin]
+ mixins: [tooltipMixin],
+ methods: {
+ onClick () {
+ this.hideTooltip()
+ this.$emit('click')
+ }
+ }
}
diff --git a/src/views/Main/MyQueries/svg/delete.vue b/src/views/Main/Inquiries/svg/delete.vue
similarity index 70%
rename from src/views/Main/MyQueries/svg/delete.vue
rename to src/views/Main/Inquiries/svg/delete.vue
index 785a00b..2d6270a 100644
--- a/src/views/Main/MyQueries/svg/delete.vue
+++ b/src/views/Main/Inquiries/svg/delete.vue
@@ -6,18 +6,17 @@
height="18"
viewBox="0 0 18 18"
fill="none"
- xmlns="http://www.w3.org/2000/svg"
- @click.stop="$emit('click')"
- @mouseover="showTooltip"
- @mouseout="hideTooltip"
+ @click.stop="onClick"
+ @mouseenter="showTooltip($event, 'top-left')"
+ @mouseleave="hideTooltip"
>
- Delete query
+
+ Delete inquiry
@@ -27,7 +26,13 @@ import tooltipMixin from '@/tooltipMixin'
export default {
name: 'DeleteIcon',
- mixins: [tooltipMixin]
+ mixins: [tooltipMixin],
+ methods: {
+ onClick () {
+ this.hideTooltip()
+ this.$emit('click')
+ }
+ }
}
diff --git a/src/views/Main/MyQueries/svg/rename.vue b/src/views/Main/Inquiries/svg/rename.vue
similarity index 72%
rename from src/views/Main/MyQueries/svg/rename.vue
rename to src/views/Main/Inquiries/svg/rename.vue
index e3795ec..99b70f7 100644
--- a/src/views/Main/MyQueries/svg/rename.vue
+++ b/src/views/Main/Inquiries/svg/rename.vue
@@ -6,18 +6,17 @@
height="18"
viewBox="0 0 18 18"
fill="none"
- xmlns="http://www.w3.org/2000/svg"
- @click.stop="$emit('click')"
- @mouseover="showTooltip"
- @mouseout="hideTooltip"
+ @click.stop="onClick"
+ @mouseenter="showTooltip"
+ @mouseleave="hideTooltip"
>
- Rename query
+
+ Rename inquiry
@@ -27,7 +26,13 @@ import tooltipMixin from '@/tooltipMixin'
export default {
name: 'RenameIcon',
- mixins: [tooltipMixin]
+ mixins: [tooltipMixin],
+ methods: {
+ onClick () {
+ this.hideTooltip()
+ this.$emit('click')
+ }
+ }
}
diff --git a/src/views/Main/MainMenu.vue b/src/views/Main/MainMenu.vue
index 1741a30..d8c491e 100644
--- a/src/views/Main/MainMenu.vue
+++ b/src/views/Main/MainMenu.vue
@@ -1,53 +1,44 @@
-
Editor
-
My queries
+
Workspace
+
Inquiries
Help
- Note: Predefined queries can't be edited.
- That's why your modifications will be saved as a new query. Enter the name for it.
+ Note: Predefined inquiries can't be edited.
+ That's why your modifications will be saved as a new inquiry. Enter the name for it.
Cancel
- Save
+ Save
@@ -64,7 +55,7 @@
+
+
diff --git a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue
new file mode 100644
index 0000000..5063dd9
--- /dev/null
+++ b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue
@@ -0,0 +1,71 @@
+
+
+ {{ value.includes('key') ? 'key' : 'value' }}
+
+
+
+
+
+
diff --git a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue
new file mode 100644
index 0000000..98b6fd2
--- /dev/null
+++ b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue
@@ -0,0 +1,302 @@
+
+
+
+
+
Columns
+
+
+ No Results
+
+
+ Choose columns
+
+
+ No Results
+
+
+
+
+
+
+
Rows
+
+
+ No Results
+
+
+ Choose rows
+
+
+ No Results
+
+
+
+
+
+
+ Aggregator
+
+
+ No Results
+
+
+
+
+
+
+ View
+
+
+ No Results
+
+
+
+
+
+ {{ collapsed ? 'Show pivot settings' : 'Hide pivot settings' }}
+
+
+
+
+
diff --git a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/pivotHelper.js b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/pivotHelper.js
new file mode 100644
index 0000000..d20d8f9
--- /dev/null
+++ b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/pivotHelper.js
@@ -0,0 +1,77 @@
+import $ from 'jquery'
+import 'pivottable'
+import 'pivottable/dist/export_renderers.js'
+import 'pivottable/dist/plotly_renderers.js'
+
+export const zeroValAggregators = [
+ 'Count',
+ 'Count as Fraction of Total',
+ 'Count as Fraction of Rows',
+ 'Count as Fraction of Columns'
+]
+
+export const twoValAggregators = [
+ 'Sum over Sum',
+ '80% Upper Bound',
+ '80% Lower Bound'
+]
+
+export function _getDataSources (pivotData) {
+ const rowKeys = pivotData.getRowKeys()
+ const colKeys = pivotData.getColKeys()
+
+ const dataSources = {
+ 'Column keys': colKeys.map(colKey => colKey.join('-')),
+ 'Row keys': rowKeys.map(rowKey => rowKey.join('-'))
+ }
+
+ const dataSourcesByRows = {}
+ const dataSourcesByCols = {}
+
+ const rowAttrs = pivotData.rowAttrs.join('-')
+ const colAttrs = pivotData.colAttrs.join('-')
+
+ colKeys.forEach(colKey => {
+ const sourceColKey = colAttrs + ':' + colKey.join('-')
+ dataSourcesByCols[sourceColKey] = []
+ rowKeys.forEach(rowKey => {
+ const value = pivotData.getAggregator(rowKey, colKey).value()
+ dataSourcesByCols[sourceColKey].push(value)
+ const sourceRowKey = rowAttrs + ':' + rowKey.join('-')
+ if (!dataSourcesByRows[sourceRowKey]) {
+ dataSourcesByRows[sourceRowKey] = []
+ }
+ dataSourcesByRows[sourceRowKey].push(value)
+ })
+ })
+
+ return Object.assign(dataSources, dataSourcesByCols, dataSourcesByRows)
+}
+
+function customChartRenderer (data, options) {
+ options.customChartComponent.dataSources = _getDataSources(data)
+ options.customChartComponent.$mount()
+
+ return $(options.customChartComponent.$el)
+}
+
+$.extend(
+ $.pivotUtilities.renderers,
+ $.pivotUtilities.export_renderers,
+ $.pivotUtilities.plotly_renderers,
+ { 'Custom chart': customChartRenderer }
+)
+
+export const renderers = Object.keys($.pivotUtilities.renderers).map(key => {
+ return {
+ name: key,
+ fun: $.pivotUtilities.renderers[key]
+ }
+})
+
+export const aggregators = Object.keys($.pivotUtilities.aggregators).map(key => {
+ return {
+ name: key,
+ fun: $.pivotUtilities.aggregators[key]
+ }
+})
diff --git a/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue
new file mode 100644
index 0000000..3e7e58c
--- /dev/null
+++ b/src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue
@@ -0,0 +1,228 @@
+
+
+
+ There is no data to build a pivot. Run your SQL query and make sure the result is not empty.
+
+
+
+
+
+
+
+
diff --git a/src/views/Main/Workspace/Tabs/Tab/DataView/index.vue b/src/views/Main/Workspace/Tabs/Tab/DataView/index.vue
new file mode 100644
index 0000000..652a6df
--- /dev/null
+++ b/src/views/Main/Workspace/Tabs/Tab/DataView/index.vue
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/Main/Workspace/Tabs/Tab/RunResult.vue b/src/views/Main/Workspace/Tabs/Tab/RunResult.vue
new file mode 100644
index 0000000..6b3c547
--- /dev/null
+++ b/src/views/Main/Workspace/Tabs/Tab/RunResult.vue
@@ -0,0 +1,130 @@
+
+
+
+
+ Run your query and get results here
+
+
+
+
+ No rows retrieved according to your query
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/Main/Workspace/Tabs/Tab/SideToolBar.vue b/src/views/Main/Workspace/Tabs/Tab/SideToolBar.vue
new file mode 100644
index 0000000..211436a
--- /dev/null
+++ b/src/views/Main/Workspace/Tabs/Tab/SideToolBar.vue
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
diff --git a/src/views/Main/Editor/Tabs/Tab/SqlEditor/hint.js b/src/views/Main/Workspace/Tabs/Tab/SqlEditor/hint.js
similarity index 100%
rename from src/views/Main/Editor/Tabs/Tab/SqlEditor/hint.js
rename to src/views/Main/Workspace/Tabs/Tab/SqlEditor/hint.js
diff --git a/src/views/Main/Editor/Tabs/Tab/SqlEditor/index.vue b/src/views/Main/Workspace/Tabs/Tab/SqlEditor/index.vue
similarity index 51%
rename from src/views/Main/Editor/Tabs/Tab/SqlEditor/index.vue
rename to src/views/Main/Workspace/Tabs/Tab/SqlEditor/index.vue
index cbc2788..99cb4c4 100644
--- a/src/views/Main/Editor/Tabs/Tab/SqlEditor/index.vue
+++ b/src/views/Main/Workspace/Tabs/Tab/SqlEditor/index.vue
@@ -1,6 +1,24 @@
-
-
+
@@ -13,16 +31,23 @@ import 'codemirror/mode/sql/sql.js'
import 'codemirror/theme/neo.css'
import 'codemirror/addon/hint/show-hint.css'
import 'codemirror/addon/display/autorefresh.js'
+import SideToolBar from '../SideToolBar'
+import IconButton from '@/components/IconButton'
+import RunIcon from '@/components/svg/run'
export default {
name: 'SqlEditor',
- props: ['value'],
- components: { codemirror },
+ props: ['value', 'isGettingResults'],
+ components: {
+ codemirror,
+ SideToolBar,
+ IconButton,
+ RunIcon
+ },
data () {
return {
query: this.value,
cmOptions: {
- // codemirror options
tabSize: 4,
mode: 'text/x-mysql',
theme: 'neo',
@@ -33,6 +58,11 @@ export default {
}
}
},
+ computed: {
+ runDisabled () {
+ return (!this.$store.state.db || !this.query || this.isGettingResults)
+ }
+ },
watch: {
query () {
this.$emit('input', this.query)
@@ -48,9 +78,18 @@ export default {
diff --git a/src/views/Main/Editor/Tabs/index.vue b/src/views/Main/Workspace/Tabs/index.vue
similarity index 83%
rename from src/views/Main/Editor/Tabs/index.vue
rename to src/views/Main/Workspace/Tabs/index.vue
index f081332..ab7e53e 100644
--- a/src/views/Main/Editor/Tabs/index.vue
+++ b/src/views/Main/Workspace/Tabs/index.vue
@@ -8,7 +8,7 @@
:class="[{'tab-selected': (tab.id === selectedIndex)}, 'tab']"
>
- *
+ *
{{ tab.name }}
{{ tab.tempName }}
@@ -23,14 +23,15 @@
:id="tab.id"
:init-name="tab.name"
:init-query="tab.query"
- :init-chart="tab.chart"
+ :init-view-options="tab.viewOptions"
+ :init-view-type="tab.viewType"
:is-predefined="tab.isPredefined"
:tab-index="index"
/>
- Create
- a new query from scratch or open the one from
- My queries
+ Create
+ new inquiry from scratch or open one from
+ Inquiries
@@ -88,7 +89,7 @@ export default {
},
methods: {
leavingSqliteviz (event) {
- if (this.tabs.some(tab => tab.isUnsaved)) {
+ if (this.tabs.some(tab => !tab.isSaved)) {
event.preventDefault()
event.returnValue = ''
}
@@ -98,7 +99,7 @@ export default {
},
beforeCloseTab (index) {
this.closingTabIndex = index
- if (this.tabs[index].isUnsaved) {
+ if (!this.tabs[index].isSaved) {
this.$modal.show('close-warn')
} else {
this.closeTab(index)
@@ -110,14 +111,14 @@ export default {
this.$store.commit('deleteTab', index)
},
saveAndClose (index) {
- this.$root.$on('querySaved', () => {
+ this.$root.$on('inquirySaved', () => {
this.closeTab(index)
- this.$root.$off('querySaved')
+ this.$root.$off('inquirySaved')
})
this.selectTab(this.tabs[index].id)
this.$modal.hide('close-warn')
this.$nextTick(() => {
- this.$root.$emit('saveQuery')
+ this.$root.$emit('saveInquiry')
})
}
}
@@ -159,18 +160,29 @@ export default {
flex-shrink: 1;
}
-#tabs-header div:hover {
+#tabs-header .tab:hover {
cursor: pointer;
}
#tabs-header .tab-selected {
color: var(--color-text-active);
- font-weight: 600;
border-bottom: none;
background-color: var(--color-white);
+ position: relative;
}
-#tabs-header .tab-selected:hover {
- cursor: default;
+
+#tabs-header .tab-selected:after {
+ content: '';
+ width: 100%;
+ height: 4px;
+ background-color: var(--color-accent);
+ position: absolute;
+ left: 0;
+ bottom: 0;
+}
+
+#tabs-header .tab.tab-selected:hover {
+ cursor: default;
}
.close-icon {
diff --git a/src/views/Main/Editor/index.vue b/src/views/Main/Workspace/index.vue
similarity index 98%
rename from src/views/Main/Editor/index.vue
rename to src/views/Main/Workspace/index.vue
index dc5b023..ae1d98b 100644
--- a/src/views/Main/Editor/index.vue
+++ b/src/views/Main/Workspace/index.vue
@@ -21,7 +21,7 @@ import Schema from './Schema'
import Tabs from './Tabs'
export default {
- name: 'Editor',
+ name: 'Workspace',
components: {
Schema,
Splitpanes,
diff --git a/src/views/Main/index.vue b/src/views/Main/index.vue
index c62b2c5..fdcd5e8 100644
--- a/src/views/Main/index.vue
+++ b/src/views/Main/index.vue
@@ -1,7 +1,7 @@
+
diff --git a/src/views/Welcome.vue b/src/views/Welcome.vue
index 341ecc6..d00f0bd 100644
--- a/src/views/Welcome.vue
+++ b/src/views/Welcome.vue
@@ -4,7 +4,7 @@
Sqliteviz is fully client-side. Your database never leaves your computer.
-
+
Create empty database
',
@@ -12,13 +22,16 @@ describe('tooltipMixin.js', () => {
expect(wrapper.find('div').isVisible()).to.equal(false)
})
- it('tooltipStyle is correct when showTooltip', async () => {
+ it('tooltipStyle is correct when showTooltip: top-right', async () => {
const component = {
- template: '
',
+ template: '
',
mixins: [tooltipMixin]
}
- const wrapper = mount(component)
- await wrapper.vm.showTooltip(new MouseEvent('mouseover', {
+
+ const wrapper = mount(component, { attachTo: container })
+
+ // by default top-right
+ await wrapper.vm.showTooltip(new MouseEvent('mouseenter', {
clientX: 10,
clientY: 20
}))
@@ -30,13 +43,73 @@ describe('tooltipMixin.js', () => {
expect(wrapper.find('div').isVisible()).to.equal(true)
})
+ it('tooltipStyle is correct when showTooltip: top-left', async () => {
+ const component = {
+ template: '
',
+ mixins: [tooltipMixin]
+ }
+ const wrapper = mount(component, { attachTo: container })
+
+ await wrapper.vm.showTooltip(new MouseEvent('mouseenter', {
+ clientX: 212,
+ clientY: 20
+ }), 'top-left')
+
+ expect(wrapper.vm.tooltipStyle).to.eql({
+ visibility: 'visible',
+ top: '8px',
+ left: '100px'
+ })
+
+ expect(wrapper.find('div').isVisible()).to.equal(true)
+ })
+
+ it('tooltipStyle is correct when showTooltip: bottom-right', async () => {
+ const component = {
+ template: '
',
+ mixins: [tooltipMixin]
+ }
+ const wrapper = mount(component, { attachTo: container })
+
+ await wrapper.vm.showTooltip(new MouseEvent('mouseenter', {
+ clientX: 10,
+ clientY: 20
+ }), 'bottom-right')
+ expect(wrapper.vm.tooltipStyle).to.eql({
+ visibility: 'visible',
+ top: '32px',
+ left: '22px'
+ })
+ expect(wrapper.find('div').isVisible()).to.equal(true)
+ })
+
+ it('tooltipStyle is correct when showTooltip: bottom-left', async () => {
+ const component = {
+ template: '
',
+ mixins: [tooltipMixin]
+ }
+ const wrapper = mount(component, { attachTo: container })
+
+ await wrapper.vm.showTooltip(new MouseEvent('mouseenter', {
+ clientX: 212,
+ clientY: 20
+ }), 'bottom-left')
+
+ expect(wrapper.vm.tooltipStyle).to.eql({
+ visibility: 'visible',
+ top: '32px',
+ left: '100px'
+ })
+ expect(wrapper.find('div').isVisible()).to.equal(true)
+ })
+
it('tooltip is not visible after hideTooltip', async () => {
const component = {
template: '
',
mixins: [tooltipMixin]
}
const wrapper = mount(component)
- await wrapper.vm.showTooltip(new MouseEvent('mouseover', {
+ await wrapper.vm.showTooltip(new MouseEvent('mouseenter', {
clientX: 10,
clientY: 20
}))
diff --git a/tests/views/MainView/MyQueries/MyQueries.spec.js b/tests/views/Main/Inquiries/Inquiries.spec.js
similarity index 52%
rename from tests/views/MainView/MyQueries/MyQueries.spec.js
rename to tests/views/Main/Inquiries/Inquiries.spec.js
index 78bb427..c88f83e 100644
--- a/tests/views/MainView/MyQueries/MyQueries.spec.js
+++ b/tests/views/Main/Inquiries/Inquiries.spec.js
@@ -2,47 +2,68 @@ import { expect } from 'chai'
import sinon from 'sinon'
import { mount, shallowMount } from '@vue/test-utils'
import Vuex from 'vuex'
-import MyQueries from '@/views/Main/MyQueries'
-import storedQueries from '@/lib/storedQueries'
+import Inquiries from '@/views/Main/Inquiries'
+import storedInquiries from '@/lib/storedInquiries'
import mutations from '@/store/mutations'
import fu from '@/lib/utils/fileIo'
-describe('MyQueries.vue', () => {
+describe('Inquiries.vue', () => {
afterEach(() => {
sinon.restore()
})
- it('Shows start-guide message if there are no saved and predefined queries', () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([])
- sinon.stub(storedQueries, 'getStoredQueries').returns([])
+ it('Shows start-guide message if there are no saved and predefined inquiries', () => {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([])
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([])
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const mutations = {
- updatePredefinedQueries: sinon.stub()
+ updatePredefinedInquiries: sinon.stub()
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = shallowMount(MyQueries, { store })
+ const wrapper = shallowMount(Inquiries, { store })
expect(wrapper.find('#start-guide').exists()).to.equal(true)
})
- it('Renders the list on saved or predefined queries', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([
- { id: 0, name: 'hello_world', query: '', chart: [], createdAt: '2020-03-08T19:57:56.299Z' }
+ it('Renders the list on saved or predefined inquiries', async () => {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([
+ {
+ id: 0,
+ name: 'hello_world',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-03-08T19:57:56.299Z'
+ }
])
- sinon.stub(storedQueries, 'getStoredQueries').returns([
- { id: 1, name: 'foo', query: '', chart: [], createdAt: '2020-11-03T19:57:56.299Z' },
- { id: 2, name: 'bar', query: '', chart: [], createdAt: '2020-12-04T18:53:56.299Z' }
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([
+ {
+ id: 1,
+ name: 'foo',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-11-03T19:57:56.299Z'
+ },
+ {
+ id: 2,
+ name: 'bar',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-12-04T18:53:56.299Z'
+ }
])
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = shallowMount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = shallowMount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
expect(wrapper.find('#start-guide').exists()).to.equal(false)
@@ -60,20 +81,41 @@ describe('MyQueries.vue', () => {
expect(rows.at(2).findAll('td').at(1).text()).to.equals('4 December 2020 19:53')
})
- it('Filters the list of queries', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([
- { id: 0, name: 'hello_world', query: '', chart: [], createdAt: '2020-03-08T19:57:56.299Z' }
+ it('Filters the list of inquiries', async () => {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([
+ {
+ id: 0,
+ name: 'hello_world',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-03-08T19:57:56.299Z'
+ }
])
- sinon.stub(storedQueries, 'getStoredQueries').returns([
- { id: 1, name: 'foo', query: '', chart: [], createdAt: '2020-11-03T19:57:56.299Z' },
- { id: 2, name: 'bar', query: '', chart: [], createdAt: '2020-12-04T18:53:56.299Z' }
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([
+ {
+ id: 1,
+ name: 'foo',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-11-03T19:57:56.299Z'
+ },
+ {
+ id: 2,
+ name: 'bar',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-12-04T18:53:56.299Z'
+ }
])
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
+ const wrapper = mount(Inquiries, { store })
await wrapper.find('#toolbar-search input').setValue('OO')
await wrapper.vm.$nextTick()
@@ -83,21 +125,35 @@ describe('MyQueries.vue', () => {
expect(rows.at(0).findAll('td').at(1).text()).to.contains('3 November 2020 20:57')
})
- it('Predefined query has a badge', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([
- { id: 0, name: 'hello_world', query: '', chart: [], createdAt: '2020-03-08T19:57:56.299Z' }
+ it('Predefined inquiry has a badge', async () => {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([
+ {
+ id: 0,
+ name: 'hello_world',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-03-08T19:57:56.299Z'
+ }
])
- sinon.stub(storedQueries, 'getStoredQueries').returns([
- { id: 1, name: 'foo', query: '', chart: [], createdAt: '2020-11-03T19:57:56.299Z' }
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([
+ {
+ id: 1,
+ name: 'foo',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-11-03T19:57:56.299Z'
+ }
])
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = shallowMount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = shallowMount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
const rows = wrapper.findAll('tbody tr')
@@ -105,94 +161,106 @@ describe('MyQueries.vue', () => {
expect(rows.at(1).find('td .badge').exists()).to.equals(false)
})
- it('Exports one query', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([])
- sinon.stub(storedQueries, 'getStoredQueries').returns([
- { id: 1, name: 'foo', query: '', chart: [], createdAt: '2020-11-03T19:57:56.299Z' }
+ it('Exports one inquiry', async () => {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([])
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([
+ {
+ id: 1,
+ name: 'foo',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-11-03T19:57:56.299Z'
+ }
])
- sinon.stub(storedQueries, 'serialiseQueries').returns('I am a serialized query')
+ sinon.stub(storedInquiries, 'serialiseInquiries').returns('I am a serialized inquiry')
sinon.stub(fu, 'exportToFile')
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
await wrapper.findComponent({ name: 'ExportIcon' }).find('svg').trigger('click')
- expect(fu.exportToFile.calledOnceWith('I am a serialized query', 'foo.json')).to.equals(true)
+ expect(fu.exportToFile.calledOnceWith('I am a serialized inquiry', 'foo.json')).to.equals(true)
})
- it('Duplicates a query', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([])
- const queryInStorage = {
+ it('Duplicates an inquiry', async () => {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([])
+ const inquiryInStorage = {
id: 1,
name: 'foo',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-11-03T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'getStoredQueries').returns([queryInStorage])
- sinon.stub(storedQueries, 'updateStorage')
- const newQuery = {
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([inquiryInStorage])
+ sinon.stub(storedInquiries, 'updateStorage')
+ const newInquiry = {
id: 2,
name: 'foo copy',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-12-03T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'duplicateQuery').returns(newQuery)
+ sinon.stub(storedInquiries, 'duplicateInquiry').returns(newInquiry)
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
await wrapper.findComponent({ name: 'CopyIcon' }).find('svg').trigger('click')
- expect(storedQueries.duplicateQuery.calledOnceWith(queryInStorage)).to.equals(true)
+ expect(storedInquiries.duplicateInquiry.calledOnceWith(inquiryInStorage)).to.equals(true)
const rows = wrapper.findAll('tbody tr')
expect(rows).to.have.lengthOf(2)
expect(rows.at(1).findAll('td').at(0).text()).to.equals('foo copy')
expect(rows.at(1).findAll('td').at(1).text()).to.contains('3 December 2020 20:57')
- expect(storedQueries.updateStorage.calledOnceWith(sinon.match([queryInStorage, newQuery])))
- .to.equals(true)
+ expect(
+ storedInquiries.updateStorage.calledOnceWith(sinon.match([inquiryInStorage, newInquiry]))
+ ).to.equals(true)
})
- it('Makes the copy of the query selected if all queries were selected before duplication',
+ it('Makes the copy of the inquiry selected if all inquiries were selected before duplication',
async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([])
- const queryInStorage = {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([])
+ const inquiryInStorage = {
id: 1,
name: 'foo',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-11-03T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'getStoredQueries').returns([queryInStorage])
- sinon.stub(storedQueries, 'updateStorage')
- const newQuery = {
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([inquiryInStorage])
+ sinon.stub(storedInquiries, 'updateStorage')
+ const newInquiry = {
id: 2,
name: 'foo copy',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-12-03T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'duplicateQuery').returns(newQuery)
+ sinon.stub(storedInquiries, 'duplicateInquiry').returns(newInquiry)
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
await wrapper.findComponent({ ref: 'mainCheckBox' }).find('.checkbox-container').trigger('click')
await wrapper.findComponent({ name: 'CopyIcon' }).find('svg').trigger('click')
@@ -202,74 +270,89 @@ describe('MyQueries.vue', () => {
expect(checkboxes.at(1).vm.checked).to.equals(true)
})
- it('Opens a query', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([])
- const queryInStorage = {
+ it('Opens an inquiry', async () => {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([])
+ const inquiryInStorage = {
id: 1,
name: 'foo',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-11-03T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'getStoredQueries').returns([queryInStorage])
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([inquiryInStorage])
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const actions = { addTab: sinon.stub().resolves(1) }
sinon.spy(mutations, 'setCurrentTabId')
const $router = { push: sinon.stub() }
const store = new Vuex.Store({ state, mutations, actions })
- const wrapper = shallowMount(MyQueries, {
+ const wrapper = shallowMount(Inquiries, {
store,
mocks: { $router }
})
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
await wrapper.find('tbody tr').trigger('click')
expect(actions.addTab.calledOnce).to.equals(true)
- expect(actions.addTab.getCall(0).args[1]).to.equals(queryInStorage)
+ expect(actions.addTab.getCall(0).args[1]).to.equals(inquiryInStorage)
await actions.addTab.returnValues[0]
expect(mutations.setCurrentTabId.calledOnceWith(state, 1)).to.equals(true)
- expect($router.push.calledOnceWith('/editor')).to.equals(true)
+ expect($router.push.calledOnceWith('/workspace')).to.equals(true)
})
- it('Rename is not available for predefined queries', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([
- { id: 0, name: 'hello_world', query: '', chart: [], createdAt: '2020-03-08T19:57:56.299Z' }
+ it('Rename is not available for predefined inquiries', async () => {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([
+ {
+ id: 0,
+ name: 'hello_world',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-03-08T19:57:56.299Z'
+ }
])
- sinon.stub(storedQueries, 'getStoredQueries').returns([])
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([])
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
expect(wrapper.findComponent({ name: 'RenameIcon' }).exists()).to.equals(false)
})
- it('Renames a query', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([])
- sinon.stub(storedQueries, 'getStoredQueries').returns([
- { id: 1, name: 'foo', query: '', chart: [], createdAt: '2020-11-03T19:57:56.299Z' }
+ it('Renames an inquiry', async () => {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([])
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([
+ {
+ id: 1,
+ name: 'foo',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-11-03T19:57:56.299Z'
+ }
])
- sinon.stub(storedQueries, 'updateStorage')
+ sinon.stub(storedInquiries, 'updateStorage')
const state = {
tabs: [{ id: 1, name: 'foo' }],
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
// click Rename icon in the grid
@@ -278,7 +361,7 @@ describe('MyQueries.vue', () => {
// check that rename dialog is open
expect(wrapper.find('[data-modal="rename"]').exists()).to.equal(true)
- // check that input is filled by the current query name
+ // check that input is filled by the current inquiry name
expect(wrapper.find('.dialog-body input').element.value).to.equals('foo')
// change the name
@@ -294,11 +377,12 @@ describe('MyQueries.vue', () => {
expect(wrapper.find('tbody tr td').text()).to.equals('bar')
// check that storage is updated
- expect(storedQueries.updateStorage.calledOnceWith(sinon.match([{
+ expect(storedInquiries.updateStorage.calledOnceWith(sinon.match([{
id: 1,
name: 'bar',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-11-03T19:57:56.299Z'
}]))).to.equals(true)
@@ -310,20 +394,27 @@ describe('MyQueries.vue', () => {
})
it('Shows an error if try to rename to empty string', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([])
- sinon.stub(storedQueries, 'getStoredQueries').returns([
- { id: 1, name: 'foo', query: '', chart: [], createdAt: '2020-11-03T19:57:56.299Z' }
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([])
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([
+ {
+ id: 1,
+ name: 'foo',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-11-03T19:57:56.299Z'
+ }
])
- sinon.stub(storedQueries, 'updateStorage')
+ sinon.stub(storedInquiries, 'updateStorage')
const state = {
tabs: [{ id: 1, name: 'foo' }],
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
// click Rename icon in the grid
@@ -339,38 +430,40 @@ describe('MyQueries.vue', () => {
.trigger('click')
expect(wrapper.find('.dialog-body .text-field-error').text())
- .to.equals("Query name can't be empty")
+ .to.equals("Inquiry name can't be empty")
// check that rename dialog is still open
expect(wrapper.find('[data-modal="rename"]').exists()).to.equal(true)
})
- it('Imports queries', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([])
- const queryInStorage = {
+ it('Imports inquiries', async () => {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([])
+ const inquiryInStorage = {
id: 1,
name: 'foo',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-11-03T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'getStoredQueries').returns([queryInStorage])
- sinon.stub(storedQueries, 'updateStorage')
- const importedQuery = {
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([inquiryInStorage])
+ sinon.stub(storedInquiries, 'updateStorage')
+ const importedInquiry = {
id: 2,
name: 'bar',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-12-03T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'importQueries').resolves([importedQuery])
+ sinon.stub(storedInquiries, 'importInquiries').resolves([importedInquiry])
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = shallowMount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = shallowMount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
// click Import
@@ -380,38 +473,40 @@ describe('MyQueries.vue', () => {
expect(rows).to.have.lengthOf(2)
expect(rows.at(1).findAll('td').at(0).text()).to.equals('bar')
expect(rows.at(1).findAll('td').at(1).text()).to.equals('3 December 2020 20:57')
- expect(storedQueries.updateStorage.calledOnceWith(
- sinon.match([queryInStorage, importedQuery])
+ expect(storedInquiries.updateStorage.calledOnceWith(
+ sinon.match([inquiryInStorage, importedInquiry])
)).to.equals(true)
})
- it('Imported queries are selected if master check box is checked', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([])
- const queryInStorage = {
+ it('Imported inquiries are selected if master check box is checked', async () => {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([])
+ const inquiryInStorage = {
id: 1,
name: 'foo',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-11-03T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'getStoredQueries').returns([queryInStorage])
- sinon.stub(storedQueries, 'updateStorage')
- const importedQuery = {
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([inquiryInStorage])
+ sinon.stub(storedInquiries, 'updateStorage')
+ const importedInquiry = {
id: 2,
name: 'bar',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-12-03T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'importQueries').resolves([importedQuery])
+ sinon.stub(storedInquiries, 'importInquiries').resolves([importedInquiry])
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
// click on master checkbox
@@ -425,52 +520,61 @@ describe('MyQueries.vue', () => {
expect(checkboxes.at(1).vm.checked).to.equals(true)
})
- it('Deletion is not available for predefined queries', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([
- { id: 0, name: 'hello_world', query: '', chart: [], createdAt: '2020-03-08T19:57:56.299Z' }
+ it('Deletion is not available for predefined inquiries', async () => {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([
+ {
+ id: 0,
+ name: 'hello_world',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-03-08T19:57:56.299Z'
+ }
])
- sinon.stub(storedQueries, 'getStoredQueries').returns([])
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([])
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
expect(wrapper.findComponent({ name: 'DeleteIcon' }).exists()).to.equals(false)
})
- it('Delete a query', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([])
+ it('Delete an inquiry', async () => {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([])
const foo = {
id: 1,
name: 'foo',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-11-03T19:57:56.299Z'
}
const bar = {
id: 2,
name: 'bar',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-11-03T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'getStoredQueries').returns([foo, bar])
- sinon.stub(storedQueries, 'updateStorage')
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([foo, bar])
+ sinon.stub(storedInquiries, 'updateStorage')
const state = {
tabs: [{ id: 1 }, { id: 2 }],
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
// click Delete icon in the first row of the grid
await wrapper.findComponent({ name: 'DeleteIcon' }).find('svg').trigger('click')
@@ -491,33 +595,47 @@ describe('MyQueries.vue', () => {
expect(wrapper.findAll('tbody tr')).to.have.lengthOf(1)
expect(wrapper.findAll('tbody tr').at(0).find('td').text()).to.equals('bar')
- // check that deleted query was also deleted from tabs
+ // check that deleted inquiry was also deleted from tabs
expect(state.tabs).to.have.lengthOf(1)
expect(state.tabs[0].id).to.equals(2)
// check that storage is updated
- expect(storedQueries.updateStorage.calledOnceWith(sinon.match([bar]))).to.equals(true)
+ expect(storedInquiries.updateStorage.calledOnceWith(sinon.match([bar]))).to.equals(true)
// check that delete dialog is closed
expect(wrapper.find('[data-modal="delete"]').exists()).to.equal(false)
})
it('Group operations are available when there are checked rows', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([
- { id: 0, name: 'hello_world', query: '', chart: [], createdAt: '2020-03-08T19:57:56.299Z' }
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([
+ {
+ id: 0,
+ name: 'hello_world',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-03-08T19:57:56.299Z'
+ }
])
- sinon.stub(storedQueries, 'getStoredQueries').returns([
- { id: 1, name: 'foo', query: '', chart: [], createdAt: '2020-11-03T19:57:56.299Z' }
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([
+ {
+ id: 1,
+ name: 'foo',
+ query: '',
+ viewType: 'chart',
+ viewOptions: [],
+ createdAt: '2020-11-03T19:57:56.299Z'
+ }
])
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
expect(wrapper.find('#toolbar-btns-export').isVisible()).to.equal(false)
@@ -525,105 +643,110 @@ describe('MyQueries.vue', () => {
const rows = wrapper.findAll('tbody tr')
- // Select a predefined query
+ // Select a predefined inquiry
await rows.at(0).find('.checkbox-container').trigger('click')
expect(wrapper.find('#toolbar-btns-export').isVisible()).to.equal(true)
expect(wrapper.find('#toolbar-btns-delete').isVisible()).to.equal(false)
- // Select also not predefined query
+ // Select also not predefined inquiry
await rows.at(1).find('.checkbox-container').trigger('click')
expect(wrapper.find('#toolbar-btns-export').isVisible()).to.equal(true)
expect(wrapper.find('#toolbar-btns-delete').isVisible()).to.equal(true)
- // Uncheck a predefined query
+ // Uncheck a predefined inquiry
await rows.at(0).find('.checkbox-container').trigger('click')
expect(wrapper.find('#toolbar-btns-export').isVisible()).to.equal(true)
expect(wrapper.find('#toolbar-btns-delete').isVisible()).to.equal(true)
})
- it('Exports a group of queries', async () => {
- const predefinedQuery = {
+ it('Exports a group of inquiries', async () => {
+ const predefinedInquiry = {
id: 0,
name: 'hello_world',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([predefinedQuery])
- const queryInStore = {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([predefinedInquiry])
+ const inquiryInStore = {
id: 1,
name: 'foo',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'getStoredQueries').returns([queryInStore, {
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([inquiryInStore, {
id: 2,
name: 'bar',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}])
- sinon.stub(storedQueries, 'serialiseQueries').returns('I am a serialized queries')
+ sinon.stub(storedInquiries, 'serialiseInquiries').returns('I am a serialized inquiries')
sinon.stub(fu, 'exportToFile')
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
const rows = wrapper.findAll('tbody tr')
- // Select queries
+ // Select inquiries
await rows.at(0).find('.checkbox-container').trigger('click')
await rows.at(1).find('.checkbox-container').trigger('click')
await wrapper.find('#toolbar-btns-export').trigger('click')
- expect(storedQueries.serialiseQueries.calledOnceWith(
- sinon.match([predefinedQuery, queryInStore])
+ expect(storedInquiries.serialiseInquiries.calledOnceWith(
+ sinon.match([predefinedInquiry, inquiryInStore])
)).to.equals(true)
expect(
- fu.exportToFile.calledOnceWith('I am a serialized queries', 'My sqliteviz queries.json')
+ fu.exportToFile.calledOnceWith('I am a serialized inquiries', 'My sqliteviz inquiries.json')
).to.equals(true)
})
- it('Exports all queries', async () => {
- const predefinedQuery = {
+ it('Exports all inquiries', async () => {
+ const predefinedInquiry = {
id: 0,
name: 'hello_world',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([predefinedQuery])
- const queryInStore = {
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([predefinedInquiry])
+ const inquiryInStore = {
id: 1,
name: 'foo',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'getStoredQueries').returns([queryInStore])
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([inquiryInStore])
- sinon.stub(storedQueries, 'serialiseQueries').returns('I am a serialized queries')
+ sinon.stub(storedInquiries, 'serialiseInquiries').returns('I am a serialized inquiries')
sinon.stub(fu, 'exportToFile')
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
await wrapper.findComponent({ ref: 'mainCheckBox' }).find('.checkbox-container')
@@ -631,63 +754,67 @@ describe('MyQueries.vue', () => {
await wrapper.find('#toolbar-btns-export').trigger('click')
- expect(storedQueries.serialiseQueries.calledOnceWith(
- sinon.match([predefinedQuery, queryInStore])
+ expect(storedInquiries.serialiseInquiries.calledOnceWith(
+ sinon.match([predefinedInquiry, inquiryInStore])
)).to.equals(true)
expect(
- fu.exportToFile.calledOnceWith('I am a serialized queries', 'My sqliteviz queries.json')
+ fu.exportToFile.calledOnceWith('I am a serialized inquiries', 'My sqliteviz inquiries.json')
).to.equals(true)
})
- it('Deletes a group of queries', async () => {
- const predefinedQuery = {
+ it('Deletes a group of inquiries', async () => {
+ const predefinedInquiry = {
id: 0,
name: 'hello_world',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([predefinedQuery])
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([predefinedInquiry])
const foo = {
id: 1,
name: 'foo',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
const bar = {
id: 2,
name: 'bar',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
const baz = {
id: 3,
name: 'baz',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'getStoredQueries').returns([foo, bar, baz])
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([foo, bar, baz])
- sinon.stub(storedQueries, 'updateStorage')
+ sinon.stub(storedInquiries, 'updateStorage')
const state = {
tabs: [{ id: 1 }, { id: 2 }, { id: 0 }, { id: 3 }],
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
const rows = wrapper.findAll('tbody tr')
- // Select queries (don't select predefined queries)
+ // Select inquiries (don't select predefined inquiries)
await rows.at(1).find('.checkbox-container').trigger('click')
await rows.at(2).find('.checkbox-container').trigger('click')
@@ -698,7 +825,7 @@ describe('MyQueries.vue', () => {
// check the message in the dialog
expect(wrapper.find('.dialog-body').text())
- .to.contains('Are you sure you want to delete 2 queries?')
+ .to.contains('Are you sure you want to delete 2 inquiries?')
// find Delete in the dialog and click
await wrapper
@@ -711,58 +838,61 @@ describe('MyQueries.vue', () => {
expect(wrapper.findAll('tbody tr').at(0).find('td').text()).to.contains('hello_world')
expect(wrapper.findAll('tbody tr').at(1).find('td').text()).to.equals('baz')
- // check that deleted query was also deleted from tabs
+ // check that deleted inquiry was also deleted from tabs
expect(state.tabs).to.have.lengthOf(2)
expect(state.tabs[0].id).to.equals(0)
expect(state.tabs[1].id).to.equals(3)
// check that storage is updated
- expect(storedQueries.updateStorage.calledOnceWith(sinon.match([baz]))).to.equals(true)
+ expect(storedInquiries.updateStorage.calledOnceWith(sinon.match([baz]))).to.equals(true)
// check that delete dialog is closed
expect(wrapper.find('[data-modal="delete"]').exists()).to.equal(false)
})
- it('Ignores predefined queries during deletion', async () => {
- const predefinedQuery = {
+ it('Ignores predefined inquiries during deletion', async () => {
+ const predefinedInquiry = {
id: 0,
name: 'hello_world',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([predefinedQuery])
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([predefinedInquiry])
const foo = {
id: 1,
name: 'foo',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
const bar = {
id: 2,
name: 'bar',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'getStoredQueries').returns([foo, bar])
- sinon.stub(storedQueries, 'updateStorage')
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([foo, bar])
+ sinon.stub(storedInquiries, 'updateStorage')
const state = {
tabs: [],
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
const rows = wrapper.findAll('tbody tr')
- // Select queries (select also predefined queries)
+ // Select inquiries (select also predefined inquiries)
await rows.at(0).find('.checkbox-container').trigger('click')
await rows.at(1).find('.checkbox-container').trigger('click')
@@ -773,7 +903,7 @@ describe('MyQueries.vue', () => {
// check the message in the dialog
expect(wrapper.find('.dialog-body').text())
- .to.contains('Are you sure you want to delete 1 query?')
+ .to.contains('Are you sure you want to delete 1 inquiry?')
expect(wrapper.find('.dialog-body #note').isVisible()).to.equals(true)
@@ -789,47 +919,50 @@ describe('MyQueries.vue', () => {
expect(wrapper.findAll('tbody tr').at(1).find('td').text()).to.equals('bar')
// check that storage is updated
- expect(storedQueries.updateStorage.calledOnceWith(sinon.match([bar]))).to.equals(true)
+ expect(storedInquiries.updateStorage.calledOnceWith(sinon.match([bar]))).to.equals(true)
// check that delete dialog is closed
expect(wrapper.find('[data-modal="delete"]').exists()).to.equal(false)
})
- it('Deletes all queries ignoring predefined ones', async () => {
- const predefinedQuery = {
+ it('Deletes all inquiries ignoring predefined ones', async () => {
+ const predefinedInquiry = {
id: 0,
name: 'hello_world',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([predefinedQuery])
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([predefinedInquiry])
const foo = {
id: 1,
name: 'foo',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
const bar = {
id: 2,
name: 'bar',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'getStoredQueries').returns([foo, bar])
- sinon.stub(storedQueries, 'updateStorage')
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([foo, bar])
+ sinon.stub(storedInquiries, 'updateStorage')
const state = {
tabs: [],
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
await wrapper.findComponent({ ref: 'mainCheckBox' }).find('.checkbox-container')
@@ -842,7 +975,7 @@ describe('MyQueries.vue', () => {
// check the message in the dialog
expect(wrapper.find('.dialog-body').text())
- .to.contains('Are you sure you want to delete 2 queries?')
+ .to.contains('Are you sure you want to delete 2 inquiries?')
expect(wrapper.find('.dialog-body #note').isVisible()).to.equals(true)
@@ -857,38 +990,40 @@ describe('MyQueries.vue', () => {
expect(wrapper.findAll('tbody tr').at(0).find('td').text()).to.contains('hello_world')
// check that storage is updated
- expect(storedQueries.updateStorage.calledOnceWith(sinon.match([]))).to.equals(true)
+ expect(storedInquiries.updateStorage.calledOnceWith(sinon.match([]))).to.equals(true)
// check that delete dialog is closed
expect(wrapper.find('[data-modal="delete"]').exists()).to.equal(false)
})
it('Main checkbox', async () => {
- sinon.stub(storedQueries, 'readPredefinedQueries').resolves([])
+ sinon.stub(storedInquiries, 'readPredefinedInquiries').resolves([])
const foo = {
id: 1,
name: 'foo',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
const bar = {
id: 2,
name: 'bar',
query: '',
- chart: [],
+ viewType: 'chart',
+ viewOptions: [],
createdAt: '2020-03-08T19:57:56.299Z'
}
- sinon.stub(storedQueries, 'getStoredQueries').returns([foo, bar])
+ sinon.stub(storedInquiries, 'getStoredInquiries').returns([foo, bar])
const state = {
- predefinedQueries: []
+ predefinedInquiries: []
}
const store = new Vuex.Store({ state, mutations })
- const wrapper = mount(MyQueries, { store })
- await storedQueries.readPredefinedQueries.returnValues[0]
- await storedQueries.getStoredQueries.returnValues[0]
+ const wrapper = mount(Inquiries, { store })
+ await storedInquiries.readPredefinedInquiries.returnValues[0]
+ await storedInquiries.getStoredInquiries.returnValues[0]
await wrapper.vm.$nextTick()
const mainCheckBox = wrapper.findComponent({ ref: 'mainCheckBox' })
diff --git a/tests/views/MainView/MainMenu.spec.js b/tests/views/Main/MainMenu.spec.js
similarity index 66%
rename from tests/views/MainView/MainMenu.spec.js
rename to tests/views/Main/MainMenu.spec.js
index 9acb4ff..4fb9393 100644
--- a/tests/views/MainView/MainMenu.spec.js
+++ b/tests/views/Main/MainMenu.spec.js
@@ -3,7 +3,7 @@ import sinon from 'sinon'
import { mount, shallowMount, createWrapper } from '@vue/test-utils'
import Vuex from 'vuex'
import MainMenu from '@/views/Main/MainMenu'
-import storedQueries from '@/lib/storedQueries'
+import storedInquiries from '@/lib/storedInquiries'
let wrapper = null
@@ -16,91 +16,63 @@ describe('MainMenu.vue', () => {
wrapper.destroy()
})
- it('Run and Save are visible only on /editor page', async () => {
+ it('Create and Save are visible only on /workspace page', async () => {
const state = {
currentTab: { query: '', execute: sinon.stub() },
tabs: [{}],
db: {}
}
const store = new Vuex.Store({ state })
- const $route = { path: '/editor' }
+ const $route = { path: '/workspace' }
// mount the component
wrapper = shallowMount(MainMenu, {
store,
mocks: { $route },
stubs: ['router-link']
})
- expect(wrapper.find('#run-btn').exists()).to.equal(true)
- expect(wrapper.find('#run-btn').isVisible()).to.equal(true)
expect(wrapper.find('#save-btn').exists()).to.equal(true)
expect(wrapper.find('#save-btn').isVisible()).to.equal(true)
expect(wrapper.find('#create-btn').exists()).to.equal(true)
expect(wrapper.find('#create-btn').isVisible()).to.equal(true)
- await wrapper.vm.$set(wrapper.vm.$route, 'path', '/my-queries')
- expect(wrapper.find('#run-btn').exists()).to.equal(false)
+ await wrapper.vm.$set(wrapper.vm.$route, 'path', '/inquiries')
expect(wrapper.find('#save-btn').exists()).to.equal(true)
expect(wrapper.find('#save-btn').isVisible()).to.equal(false)
expect(wrapper.find('#create-btn').exists()).to.equal(true)
expect(wrapper.find('#create-btn').isVisible()).to.equal(true)
})
- it('Run and Save are not visible if there is no tabs', () => {
+ it('Save is not visible if there is no tabs', () => {
const state = {
currentTab: null,
tabs: [{}],
db: {}
}
const store = new Vuex.Store({ state })
- const $route = { path: '/editor' }
+ const $route = { path: '/workspace' }
wrapper = shallowMount(MainMenu, {
store,
mocks: { $route },
stubs: ['router-link']
})
- expect(wrapper.find('#run-btn').exists()).to.equal(false)
expect(wrapper.find('#save-btn').exists()).to.equal(true)
expect(wrapper.find('#save-btn').isVisible()).to.equal(false)
expect(wrapper.find('#create-btn').exists()).to.equal(true)
expect(wrapper.find('#create-btn').isVisible()).to.equal(true)
})
- it('Run is disabled if there is no db or no query', async () => {
- const state = {
- currentTab: { query: 'SELECT * FROM foo', execute: sinon.stub() },
- tabs: [{}],
- db: null
- }
- const store = new Vuex.Store({ state })
- const $route = { path: '/editor' }
-
- wrapper = shallowMount(MainMenu, {
- store,
- mocks: { $route },
- stubs: ['router-link']
- })
- const vm = wrapper.vm
- expect(wrapper.find('#run-btn').element.disabled).to.equal(true)
-
- await vm.$set(state, 'db', {})
- expect(wrapper.find('#run-btn').element.disabled).to.equal(false)
-
- await vm.$set(state.currentTab, 'query', '')
- expect(wrapper.find('#run-btn').element.disabled).to.equal(true)
- })
-
- it('Save is disabled if current tab.isUnsaved is false', async () => {
+ it('Save is disabled if current tab.isSaved is true', async () => {
const state = {
currentTab: {
query: 'SELECT * FROM foo',
execute: sinon.stub(),
tabIndex: 0
},
- tabs: [{ isUnsaved: true }],
+ tabs: [{ isSaved: false }],
db: {}
}
const store = new Vuex.Store({ state })
- const $route = { path: '/editor' }
+ const $route = { path: '/workspace' }
wrapper = shallowMount(MainMenu, {
store,
@@ -110,7 +82,7 @@ describe('MainMenu.vue', () => {
const vm = wrapper.vm
expect(wrapper.find('#save-btn').element.disabled).to.equal(false)
- await vm.$set(state.tabs[0], 'isUnsaved', false)
+ await vm.$set(state.tabs[0], 'isSaved', true)
expect(wrapper.find('#save-btn').element.disabled).to.equal(true)
})
@@ -121,18 +93,18 @@ describe('MainMenu.vue', () => {
execute: sinon.stub(),
tabIndex: 0
},
- tabs: [{ isUnsaved: true }],
+ tabs: [{ isSaved: false }],
db: {}
}
- const newQueryId = 1
+ const newInquiryId = 1
const actions = {
- addTab: sinon.stub().resolves(newQueryId)
+ addTab: sinon.stub().resolves(newInquiryId)
}
const mutations = {
setCurrentTabId: sinon.stub()
}
const store = new Vuex.Store({ state, mutations, actions })
- const $route = { path: '/editor' }
+ const $route = { path: '/workspace' }
const $router = { push: sinon.stub() }
wrapper = shallowMount(MainMenu, {
@@ -144,29 +116,29 @@ describe('MainMenu.vue', () => {
await wrapper.find('#create-btn').trigger('click')
expect(actions.addTab.calledOnce).to.equal(true)
await actions.addTab.returnValues[0]
- expect(mutations.setCurrentTabId.calledOnceWith(state, newQueryId)).to.equal(true)
+ expect(mutations.setCurrentTabId.calledOnceWith(state, newInquiryId)).to.equal(true)
expect($router.push.calledOnce).to.equal(false)
})
- it('Creates a tab and redirects to editor', async () => {
+ it('Creates a tab and redirects to workspace', async () => {
const state = {
currentTab: {
query: 'SELECT * FROM foo',
execute: sinon.stub(),
tabIndex: 0
},
- tabs: [{ isUnsaved: true }],
+ tabs: [{ isSaved: false }],
db: {}
}
- const newQueryId = 1
+ const newInquiryId = 1
const actions = {
- addTab: sinon.stub().resolves(newQueryId)
+ addTab: sinon.stub().resolves(newInquiryId)
}
const mutations = {
setCurrentTabId: sinon.stub()
}
const store = new Vuex.Store({ state, mutations, actions })
- const $route = { path: '/my-queries' }
+ const $route = { path: '/inquiries' }
const $router = { push: sinon.stub() }
wrapper = shallowMount(MainMenu, {
@@ -178,11 +150,11 @@ describe('MainMenu.vue', () => {
await wrapper.find('#create-btn').trigger('click')
expect(actions.addTab.calledOnce).to.equal(true)
await actions.addTab.returnValues[0]
- expect(mutations.setCurrentTabId.calledOnceWith(state, newQueryId)).to.equal(true)
+ expect(mutations.setCurrentTabId.calledOnceWith(state, newInquiryId)).to.equal(true)
expect($router.push.calledOnce).to.equal(true)
})
- it('Ctrl R calls currentTab.execute if running is enabled and route.path is "/editor"',
+ it('Ctrl R calls currentTab.execute if running is enabled and route.path is "/workspace"',
async () => {
const state = {
currentTab: {
@@ -190,11 +162,11 @@ describe('MainMenu.vue', () => {
execute: sinon.stub(),
tabIndex: 0
},
- tabs: [{ isUnsaved: true }],
+ tabs: [{ isSaved: false }],
db: {}
}
const store = new Vuex.Store({ state })
- const $route = { path: '/editor' }
+ const $route = { path: '/workspace' }
const $router = { push: sinon.stub() }
wrapper = shallowMount(MainMenu, {
@@ -205,29 +177,29 @@ describe('MainMenu.vue', () => {
const ctrlR = new KeyboardEvent('keydown', { key: 'r', ctrlKey: true })
const metaR = new KeyboardEvent('keydown', { key: 'r', metaKey: true })
- // Running is enabled and route path is editor
+ // Running is enabled and route path is workspace
document.dispatchEvent(ctrlR)
expect(state.currentTab.execute.calledOnce).to.equal(true)
document.dispatchEvent(metaR)
expect(state.currentTab.execute.calledTwice).to.equal(true)
- // Running is disabled and route path is editor
+ // Running is disabled and route path is workspace
await wrapper.vm.$set(state, 'db', null)
document.dispatchEvent(ctrlR)
expect(state.currentTab.execute.calledTwice).to.equal(true)
document.dispatchEvent(metaR)
expect(state.currentTab.execute.calledTwice).to.equal(true)
- // Running is enabled and route path is not editor
+ // Running is enabled and route path is not workspace
await wrapper.vm.$set(state, 'db', {})
- await wrapper.vm.$set($route, 'path', '/my-queries')
+ await wrapper.vm.$set($route, 'path', '/inquiries')
document.dispatchEvent(ctrlR)
expect(state.currentTab.execute.calledTwice).to.equal(true)
document.dispatchEvent(metaR)
expect(state.currentTab.execute.calledTwice).to.equal(true)
})
- it('Ctrl Enter calls currentTab.execute if running is enabled and route.path is "/editor"',
+ it('Ctrl Enter calls currentTab.execute if running is enabled and route.path is "/workspace"',
async () => {
const state = {
currentTab: {
@@ -235,11 +207,11 @@ describe('MainMenu.vue', () => {
execute: sinon.stub(),
tabIndex: 0
},
- tabs: [{ isUnsaved: true }],
+ tabs: [{ isSaved: false }],
db: {}
}
const store = new Vuex.Store({ state })
- const $route = { path: '/editor' }
+ const $route = { path: '/workspace' }
const $router = { push: sinon.stub() }
wrapper = shallowMount(MainMenu, {
@@ -250,63 +222,63 @@ describe('MainMenu.vue', () => {
const ctrlEnter = new KeyboardEvent('keydown', { key: 'Enter', ctrlKey: true })
const metaEnter = new KeyboardEvent('keydown', { key: 'Enter', metaKey: true })
- // Running is enabled and route path is editor
+ // Running is enabled and route path is workspace
document.dispatchEvent(ctrlEnter)
expect(state.currentTab.execute.calledOnce).to.equal(true)
document.dispatchEvent(metaEnter)
expect(state.currentTab.execute.calledTwice).to.equal(true)
- // Running is disabled and route path is editor
+ // Running is disabled and route path is workspace
await wrapper.vm.$set(state, 'db', null)
document.dispatchEvent(ctrlEnter)
expect(state.currentTab.execute.calledTwice).to.equal(true)
document.dispatchEvent(metaEnter)
expect(state.currentTab.execute.calledTwice).to.equal(true)
- // Running is enabled and route path is not editor
+ // Running is enabled and route path is not workspace
await wrapper.vm.$set(state, 'db', {})
- await wrapper.vm.$set($route, 'path', '/my-queries')
+ await wrapper.vm.$set($route, 'path', '/inquiries')
document.dispatchEvent(ctrlEnter)
expect(state.currentTab.execute.calledTwice).to.equal(true)
document.dispatchEvent(metaEnter)
expect(state.currentTab.execute.calledTwice).to.equal(true)
})
- it('Ctrl B calls createNewQuery', async () => {
+ it('Ctrl B calls createNewInquiry', async () => {
const state = {
currentTab: {
query: 'SELECT * FROM foo',
execute: sinon.stub(),
tabIndex: 0
},
- tabs: [{ isUnsaved: true }],
+ tabs: [{ isSaved: false }],
db: {}
}
const store = new Vuex.Store({ state })
- const $route = { path: '/editor' }
+ const $route = { path: '/workspace' }
wrapper = shallowMount(MainMenu, {
store,
mocks: { $route },
stubs: ['router-link']
})
- sinon.stub(wrapper.vm, 'createNewQuery')
+ sinon.stub(wrapper.vm, 'createNewInquiry')
const ctrlB = new KeyboardEvent('keydown', { key: 'b', ctrlKey: true })
const metaB = new KeyboardEvent('keydown', { key: 'b', metaKey: true })
document.dispatchEvent(ctrlB)
- expect(wrapper.vm.createNewQuery.calledOnce).to.equal(true)
+ expect(wrapper.vm.createNewInquiry.calledOnce).to.equal(true)
document.dispatchEvent(metaB)
- expect(wrapper.vm.createNewQuery.calledTwice).to.equal(true)
+ expect(wrapper.vm.createNewInquiry.calledTwice).to.equal(true)
- await wrapper.vm.$set($route, 'path', '/my-queries')
+ await wrapper.vm.$set($route, 'path', '/inquiries')
document.dispatchEvent(ctrlB)
- expect(wrapper.vm.createNewQuery.calledThrice).to.equal(true)
+ expect(wrapper.vm.createNewInquiry.calledThrice).to.equal(true)
document.dispatchEvent(metaB)
- expect(wrapper.vm.createNewQuery.callCount).to.equal(4)
+ expect(wrapper.vm.createNewInquiry.callCount).to.equal(4)
})
- it('Ctrl S calls checkQueryBeforeSave if the tab is unsaved and route path is /editor',
+ it('Ctrl S calls checkInquiryBeforeSave if the tab is unsaved and route path is /workspace',
async () => {
const state = {
currentTab: {
@@ -314,44 +286,44 @@ describe('MainMenu.vue', () => {
execute: sinon.stub(),
tabIndex: 0
},
- tabs: [{ isUnsaved: true }],
+ tabs: [{ isSaved: false }],
db: {}
}
const store = new Vuex.Store({ state })
- const $route = { path: '/editor' }
+ const $route = { path: '/workspace' }
wrapper = shallowMount(MainMenu, {
store,
mocks: { $route },
stubs: ['router-link']
})
- sinon.stub(wrapper.vm, 'checkQueryBeforeSave')
+ sinon.stub(wrapper.vm, 'checkInquiryBeforeSave')
const ctrlS = new KeyboardEvent('keydown', { key: 's', ctrlKey: true })
const metaS = new KeyboardEvent('keydown', { key: 's', metaKey: true })
- // tab is unsaved and route is /editor
+ // tab is unsaved and route is /workspace
document.dispatchEvent(ctrlS)
- expect(wrapper.vm.checkQueryBeforeSave.calledOnce).to.equal(true)
+ expect(wrapper.vm.checkInquiryBeforeSave.calledOnce).to.equal(true)
document.dispatchEvent(metaS)
- expect(wrapper.vm.checkQueryBeforeSave.calledTwice).to.equal(true)
+ expect(wrapper.vm.checkInquiryBeforeSave.calledTwice).to.equal(true)
- // tab is saved and route is /editor
- await wrapper.vm.$set(state.tabs[0], 'isUnsaved', false)
+ // tab is saved and route is /workspace
+ await wrapper.vm.$set(state.tabs[0], 'isSaved', true)
document.dispatchEvent(ctrlS)
- expect(wrapper.vm.checkQueryBeforeSave.calledTwice).to.equal(true)
+ expect(wrapper.vm.checkInquiryBeforeSave.calledTwice).to.equal(true)
document.dispatchEvent(metaS)
- expect(wrapper.vm.checkQueryBeforeSave.calledTwice).to.equal(true)
+ expect(wrapper.vm.checkInquiryBeforeSave.calledTwice).to.equal(true)
- // tab is unsaved and route is not /editor
- await wrapper.vm.$set($route, 'path', '/my-queries')
- await wrapper.vm.$set(state.tabs[0], 'isUnsaved', true)
+ // tab is unsaved and route is not /workspace
+ await wrapper.vm.$set($route, 'path', '/inquiries')
+ await wrapper.vm.$set(state.tabs[0], 'isSaved', false)
document.dispatchEvent(ctrlS)
- expect(wrapper.vm.checkQueryBeforeSave.calledTwice).to.equal(true)
+ expect(wrapper.vm.checkInquiryBeforeSave.calledTwice).to.equal(true)
document.dispatchEvent(metaS)
- expect(wrapper.vm.checkQueryBeforeSave.calledTwice).to.equal(true)
+ expect(wrapper.vm.checkInquiryBeforeSave.calledTwice).to.equal(true)
})
- it('Saves the query when no need the new name',
+ it('Saves the inquiry when no need the new name',
async () => {
const state = {
currentTab: {
@@ -359,20 +331,21 @@ describe('MainMenu.vue', () => {
execute: sinon.stub(),
tabIndex: 0
},
- tabs: [{ id: 1, name: 'foo', isUnsaved: true }],
+ tabs: [{ id: 1, name: 'foo', isSaved: false }],
db: {}
}
const mutations = {
updateTab: sinon.stub()
}
const store = new Vuex.Store({ state, mutations })
- const $route = { path: '/editor' }
- sinon.stub(storedQueries, 'isTabNeedName').returns(false)
- sinon.stub(storedQueries, 'save').returns({
+ const $route = { path: '/workspace' }
+ sinon.stub(storedInquiries, 'isTabNeedName').returns(false)
+ sinon.stub(storedInquiries, 'save').returns({
name: 'foo',
id: 1,
query: 'SELECT * FROM foo',
- chart: []
+ viewType: 'chart',
+ viewOptions: []
})
wrapper = mount(MainMenu, {
@@ -386,8 +359,8 @@ describe('MainMenu.vue', () => {
// check that the dialog is closed
expect(wrapper.find('[data-modal="save"]').exists()).to.equal(false)
- // check that the query was saved via storedQueries.save (newName='')
- expect(storedQueries.save.calledOnceWith(state.currentTab, '')).to.equal(true)
+ // check that the inquiry was saved via storedInquiries.save (newName='')
+ expect(storedInquiries.save.calledOnceWith(state.currentTab, '')).to.equal(true)
// check that the tab was updated
expect(mutations.updateTab.calledOnceWith(state, sinon.match({
@@ -395,12 +368,13 @@ describe('MainMenu.vue', () => {
name: 'foo',
id: 1,
query: 'SELECT * FROM foo',
- chart: [],
- isUnsaved: false
+ viewType: 'chart',
+ viewOptions: [],
+ isSaved: true
}))).to.equal(true)
- // check that 'querySaved' event was triggered on $root
- expect(createWrapper(wrapper.vm.$root).emitted('querySaved')).to.have.lengthOf(1)
+ // check that 'inquirySaved' event was triggered on $root
+ expect(createWrapper(wrapper.vm.$root).emitted('inquirySaved')).to.have.lengthOf(1)
})
it('Shows en error when the new name is needed but not specifyied', async () => {
@@ -410,20 +384,21 @@ describe('MainMenu.vue', () => {
execute: sinon.stub(),
tabIndex: 0
},
- tabs: [{ id: 1, name: null, tempName: 'Untitled', isUnsaved: true }],
+ tabs: [{ id: 1, name: null, tempName: 'Untitled', isSaved: false }],
db: {}
}
const mutations = {
updateTab: sinon.stub()
}
const store = new Vuex.Store({ state, mutations })
- const $route = { path: '/editor' }
- sinon.stub(storedQueries, 'isTabNeedName').returns(true)
- sinon.stub(storedQueries, 'save').returns({
+ const $route = { path: '/workspace' }
+ sinon.stub(storedInquiries, 'isTabNeedName').returns(true)
+ sinon.stub(storedInquiries, 'save').returns({
name: 'foo',
id: 1,
query: 'SELECT * FROM foo',
- chart: []
+ viewType: 'chart',
+ viewOptions: []
})
wrapper = mount(MainMenu, {
@@ -444,31 +419,32 @@ describe('MainMenu.vue', () => {
.trigger('click')
// check that we have an error message and dialog is still open
- expect(wrapper.find('.text-field-error').text()).to.equal('Query name can\'t be empty')
+ expect(wrapper.find('.text-field-error').text()).to.equal('Inquiry name can\'t be empty')
expect(wrapper.find('[data-modal="save"]').exists()).to.equal(true)
})
- it('Saves the query with a new name', async () => {
+ it('Saves the inquiry with a new name', async () => {
const state = {
currentTab: {
query: 'SELECT * FROM foo',
execute: sinon.stub(),
tabIndex: 0
},
- tabs: [{ id: 1, name: null, tempName: 'Untitled', isUnsaved: true }],
+ tabs: [{ id: 1, name: null, tempName: 'Untitled', isSaved: false }],
db: {}
}
const mutations = {
updateTab: sinon.stub()
}
const store = new Vuex.Store({ state, mutations })
- const $route = { path: '/editor' }
- sinon.stub(storedQueries, 'isTabNeedName').returns(true)
- sinon.stub(storedQueries, 'save').returns({
+ const $route = { path: '/workspace' }
+ sinon.stub(storedInquiries, 'isTabNeedName').returns(true)
+ sinon.stub(storedInquiries, 'save').returns({
name: 'foo',
id: 1,
query: 'SELECT * FROM foo',
- chart: []
+ viewType: 'chart',
+ viewOptions: []
})
wrapper = mount(MainMenu, {
@@ -494,8 +470,8 @@ describe('MainMenu.vue', () => {
// check that the dialog is closed
expect(wrapper.find('[data-modal="save"]').exists()).to.equal(false)
- // check that the query was saved via storedQueries.save (newName='foo')
- expect(storedQueries.save.calledOnceWith(state.currentTab, 'foo')).to.equal(true)
+ // check that the inquiry was saved via storedInquiries.save (newName='foo')
+ expect(storedInquiries.save.calledOnceWith(state.currentTab, 'foo')).to.equal(true)
// check that the tab was updated
expect(mutations.updateTab.calledOnceWith(state, sinon.match({
@@ -503,15 +479,16 @@ describe('MainMenu.vue', () => {
name: 'foo',
id: 1,
query: 'SELECT * FROM foo',
- chart: [],
- isUnsaved: false
+ viewType: 'chart',
+ viewOptions: [],
+ isSaved: true
}))).to.equal(true)
- // check that 'querySaved' event was triggered on $root
- expect(createWrapper(wrapper.vm.$root).emitted('querySaved')).to.have.lengthOf(1)
+ // check that 'inquirySaved' event was triggered on $root
+ expect(createWrapper(wrapper.vm.$root).emitted('inquirySaved')).to.have.lengthOf(1)
})
- it('Saves a predefined query with a new name', async () => {
+ it('Saves a predefined inquiry with a new name', async () => {
const state = {
currentTab: {
query: 'SELECT * FROM foo',
@@ -525,22 +502,24 @@ describe('MainMenu.vue', () => {
[2, 'Drako Malfoy']
]
},
- view: 'chart'
+ viewType: 'chart',
+ viewOptions: []
},
- tabs: [{ id: 1, name: 'foo', isUnsaved: true, isPredefined: true }],
+ tabs: [{ id: 1, name: 'foo', isSaved: false, isPredefined: true }],
db: {}
}
const mutations = {
updateTab: sinon.stub()
}
const store = new Vuex.Store({ state, mutations })
- const $route = { path: '/editor' }
- sinon.stub(storedQueries, 'isTabNeedName').returns(true)
- sinon.stub(storedQueries, 'save').returns({
+ const $route = { path: '/workspace' }
+ sinon.stub(storedInquiries, 'isTabNeedName').returns(true)
+ sinon.stub(storedInquiries, 'save').returns({
name: 'bar',
id: 2,
query: 'SELECT * FROM foo',
- chart: []
+ viewType: 'chart',
+ viewOptions: []
})
wrapper = mount(MainMenu, {
@@ -569,8 +548,8 @@ describe('MainMenu.vue', () => {
// check that the dialog is closed
expect(wrapper.find('[data-modal="save"]').exists()).to.equal(false)
- // check that the query was saved via storedQueries.save (newName='bar')
- expect(storedQueries.save.calledOnceWith(state.currentTab, 'bar')).to.equal(true)
+ // check that the inquiry was saved via storedInquiries.save (newName='bar')
+ expect(storedInquiries.save.calledOnceWith(state.currentTab, 'bar')).to.equal(true)
// check that the tab was updated
expect(mutations.updateTab.calledOnceWith(state, sinon.match({
@@ -578,18 +557,19 @@ describe('MainMenu.vue', () => {
name: 'bar',
id: 2,
query: 'SELECT * FROM foo',
- chart: [],
- isUnsaved: false
+ viewType: 'chart',
+ viewOptions: [],
+ isSaved: true
}))).to.equal(true)
- // check that 'querySaved' event was triggered on $root
- expect(createWrapper(wrapper.vm.$root).emitted('querySaved')).to.have.lengthOf(1)
+ // check that 'inquirySaved' event was triggered on $root
+ expect(createWrapper(wrapper.vm.$root).emitted('inquirySaved')).to.have.lengthOf(1)
- // We saved predefined query, so the tab will be created again
+ // We saved predefined inquiry, so the tab will be created again
// (because of new id) and it will be without sql result and has default view - table.
// That's why we need to restore data and view.
// Check that result and view are preserved in the currentTab:
- expect(state.currentTab.view).to.equal('chart')
+ expect(state.currentTab.viewType).to.equal('chart')
expect(state.currentTab.result).to.eql({
columns: ['id', 'name'],
values: [
@@ -606,16 +586,16 @@ describe('MainMenu.vue', () => {
execute: sinon.stub(),
tabIndex: 0
},
- tabs: [{ id: 1, name: null, tempName: 'Untitled', isUnsaved: true }],
+ tabs: [{ id: 1, name: null, tempName: 'Untitled', isSaved: false }],
db: {}
}
const mutations = {
updateTab: sinon.stub()
}
const store = new Vuex.Store({ state, mutations })
- const $route = { path: '/editor' }
- sinon.stub(storedQueries, 'isTabNeedName').returns(true)
- sinon.stub(storedQueries, 'save').returns({
+ const $route = { path: '/workspace' }
+ sinon.stub(storedInquiries, 'isTabNeedName').returns(true)
+ sinon.stub(storedInquiries, 'save').returns({
name: 'bar',
id: 2,
query: 'SELECT * FROM foo',
@@ -642,13 +622,13 @@ describe('MainMenu.vue', () => {
// check that the dialog is closed
expect(wrapper.find('[data-modal="save"]').exists()).to.equal(false)
- // check that the query was not saved via storedQueries.save
- expect(storedQueries.save.called).to.equal(false)
+ // check that the inquiry was not saved via storedInquiries.save
+ expect(storedInquiries.save.called).to.equal(false)
// check that the tab was not updated
expect(mutations.updateTab.called).to.equal(false)
- // check that 'querySaved' event is not listened on $root
- expect(wrapper.vm.$root.$listeners).to.not.have.property('querySaved')
+ // check that 'inquirySaved' event is not listened on $root
+ expect(wrapper.vm.$root.$listeners).to.not.have.property('inquirySaved')
})
})
diff --git a/tests/views/Main/Workspace/Editor.spec.js b/tests/views/Main/Workspace/Editor.spec.js
new file mode 100644
index 0000000..f129cd4
--- /dev/null
+++ b/tests/views/Main/Workspace/Editor.spec.js
@@ -0,0 +1,23 @@
+import { expect } from 'chai'
+import { mount } from '@vue/test-utils'
+import actions from '@/store/actions'
+import Vuex from 'vuex'
+import Workspace from '@/views/Main/Workspace'
+
+describe('Workspace.vue', () => {
+ it('Creates a tab with example if schema is empty', () => {
+ const state = {
+ db: {},
+ tabs: []
+ }
+ const store = new Vuex.Store({ state, actions })
+ mount(Workspace, { store })
+
+ expect(state.tabs[0].query).to.include('Your database is empty.')
+ expect(state.tabs[0].tempName).to.equal('Untitled')
+ expect(state.tabs[0].name).to.equal(null)
+ expect(state.tabs[0].viewType).to.equal('chart')
+ expect(state.tabs[0].viewOptions).to.equal(undefined)
+ expect(state.tabs[0].isSaved).to.equal(false)
+ })
+})
diff --git a/tests/views/MainView/Editor/Schema/Schema.spec.js b/tests/views/Main/Workspace/Schema/Schema.spec.js
similarity index 95%
rename from tests/views/MainView/Editor/Schema/Schema.spec.js
rename to tests/views/Main/Workspace/Schema/Schema.spec.js
index 4d18d0f..6f8a429 100644
--- a/tests/views/MainView/Editor/Schema/Schema.spec.js
+++ b/tests/views/Main/Workspace/Schema/Schema.spec.js
@@ -2,8 +2,8 @@ import { expect } from 'chai'
import sinon from 'sinon'
import { mount, createLocalVue } from '@vue/test-utils'
import Vuex from 'vuex'
-import Schema from '@/views/Main/Editor/Schema'
-import TableDescription from '@/views/Main/Editor/Schema/TableDescription'
+import Schema from '@/views/Main/Workspace/Schema'
+import TableDescription from '@/views/Main/Workspace/Schema/TableDescription'
import database from '@/lib/database'
import fIo from '@/lib/utils/fileIo'
import csv from '@/components/CsvImport/csv'
@@ -129,10 +129,8 @@ describe('Schema.vue', () => {
sinon.stub(csv, 'parse').resolves({
delimiter: '|',
data: {
- columns: ['col1', 'col2'],
- values: [
- [1, 'foo']
- ]
+ col1: [1],
+ col2: ['foo']
},
hasErrors: false,
messages: []
@@ -171,8 +169,8 @@ describe('Schema.vue', () => {
const res = await wrapper.vm.$store.state.db.execute('select * from test')
expect(res).to.eql({
- columns: ['col1', 'col2'],
- values: [[1, 'foo']]
+ col1: [1],
+ col2: ['foo']
})
})
})
diff --git a/tests/views/MainView/Editor/Schema/TableDescription.spec.js b/tests/views/Main/Workspace/Schema/TableDescription.spec.js
similarity index 94%
rename from tests/views/MainView/Editor/Schema/TableDescription.spec.js
rename to tests/views/Main/Workspace/Schema/TableDescription.spec.js
index d26080e..cc227e7 100644
--- a/tests/views/MainView/Editor/Schema/TableDescription.spec.js
+++ b/tests/views/Main/Workspace/Schema/TableDescription.spec.js
@@ -1,6 +1,6 @@
import { expect } from 'chai'
import { shallowMount } from '@vue/test-utils'
-import TableDescription from '@/views/Main/Editor/Schema/TableDescription'
+import TableDescription from '@/views/Main/Workspace/Schema/TableDescription'
describe('TableDescription.vue', () => {
it('Initially the columns are hidden and table name is rendered', () => {
diff --git a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js
new file mode 100644
index 0000000..48f9aac
--- /dev/null
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Chart.spec.js
@@ -0,0 +1,50 @@
+import { expect } from 'chai'
+import sinon from 'sinon'
+import { mount, shallowMount } from '@vue/test-utils'
+import Chart from '@/views/Main/Workspace/Tabs/Tab/DataView/Chart'
+import chartHelper from '@/views/Main/Workspace/Tabs/Tab/DataView/Chart/chartHelper'
+import * as dereference from 'react-chart-editor/lib/lib/dereference'
+
+describe('Chart.vue', () => {
+ afterEach(() => {
+ sinon.restore()
+ })
+
+ it('getOptionsForSave called with proper arguments', () => {
+ // mount the component
+ const wrapper = shallowMount(Chart)
+ const vm = wrapper.vm
+ const stub = sinon.stub(chartHelper, 'getOptionsForSave').returns('result')
+ const chartData = vm.getOptionsForSave()
+ expect(stub.calledOnceWith(vm.state, vm.dataSources)).to.equal(true)
+ expect(chartData).to.equal('result')
+ })
+
+ it('emits update when plotly updates', async () => {
+ // mount the component
+ const wrapper = mount(Chart)
+ wrapper.findComponent({ ref: 'plotlyEditor' }).vm.$emit('onUpdate')
+ expect(wrapper.emitted('update')).to.have.lengthOf(1)
+ })
+
+ it('calls dereference when sqlResult is changed', async () => {
+ sinon.stub(dereference, 'default')
+ const dataSources = {
+ id: [1],
+ name: ['foo']
+ }
+
+ // mount the component
+ const wrapper = shallowMount(Chart, {
+ propsData: { dataSources }
+ })
+
+ const newDataSources = {
+ id: [2],
+ name: ['bar']
+ }
+
+ await wrapper.setProps({ dataSources: newDataSources })
+ expect(dereference.default.called).to.equal(true)
+ })
+})
diff --git a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/DataView.spec.js b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/DataView.spec.js
new file mode 100644
index 0000000..e0d9ab6
--- /dev/null
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/DataView.spec.js
@@ -0,0 +1,32 @@
+import { expect } from 'chai'
+import { mount, createWrapper } from '@vue/test-utils'
+import DataView from '@/views/Main/Workspace/Tabs/Tab/DataView'
+import sinon from 'sinon'
+
+describe('DataView.vue', () => {
+ it('emits update on mode changing', async () => {
+ const wrapper = mount(DataView)
+
+ const pivotBtn = createWrapper(wrapper.findComponent({ name: 'pivotIcon' }).vm.$parent)
+ await pivotBtn.trigger('click')
+
+ expect(wrapper.emitted('update')).to.have.lengthOf(1)
+ })
+
+ it('method getOptionsForSave call the same method of the current view component', async () => {
+ const wrapper = mount(DataView)
+
+ const chart = wrapper.findComponent({ name: 'Chart' }).vm
+ sinon.stub(chart, 'getOptionsForSave').returns({ here_are: 'chart_settings' })
+
+ expect(wrapper.vm.getOptionsForSave()).to.eql({ here_are: 'chart_settings' })
+
+ const pivotBtn = createWrapper(wrapper.findComponent({ name: 'pivotIcon' }).vm.$parent)
+ await pivotBtn.trigger('click')
+
+ const pivot = wrapper.findComponent({ name: 'pivot' }).vm
+ sinon.stub(pivot, 'getOptionsForSave').returns({ here_are: 'pivot_settings' })
+
+ expect(wrapper.vm.getOptionsForSave()).to.eql({ here_are: 'pivot_settings' })
+ })
+})
diff --git a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/Pivot.spec.js b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/Pivot.spec.js
new file mode 100644
index 0000000..dab042e
--- /dev/null
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/Pivot.spec.js
@@ -0,0 +1,214 @@
+import { expect } from 'chai'
+import { mount } from '@vue/test-utils'
+import Pivot from '@/views/Main/Workspace/Tabs/Tab/DataView/Pivot'
+import $ from 'jquery'
+
+describe('Pivot.vue', () => {
+ it('renders pivot table', () => {
+ const wrapper = mount(Pivot, {
+ propsData: {
+ dataSources: {
+ item: ['foo', 'bar', 'bar', 'bar'],
+ year: [2021, 2021, 2020, 2020]
+ },
+ initOptions: {
+ rows: ['item'],
+ cols: ['year'],
+ colOrder: 'key_a_to_z',
+ rowOrder: 'key_a_to_z',
+ aggregatorName: 'Count',
+ vals: [],
+ rendererName: 'Table'
+ }
+ }
+ })
+ const colLabels = wrapper.findAll('.pivot-output thead th.pvtColLabel')
+ expect(colLabels.at(0).text()).to.equal('2020')
+ expect(colLabels.at(1).text()).to.equal('2021')
+ const rows = wrapper.findAll('.pivot-output tbody tr')
+ // row0: bar - 2 - 1
+ expect(rows.at(0).find('th').text()).to.equal('bar')
+ expect(rows.at(0).find('td.col0').text()).to.equal('2')
+ expect(rows.at(0).find('td.col1').text()).to.equal('1')
+ expect(rows.at(0).find('td.rowTotal').text()).to.equal('3')
+
+ // row1: foo - - 2
+ expect(rows.at(1).find('th').text()).to.equal('foo')
+ expect(rows.at(1).find('td.col0').text()).to.equal('')
+ expect(rows.at(1).find('td.col1').text()).to.equal('1')
+ expect(rows.at(1).find('td.rowTotal').text()).to.equal('1')
+ })
+
+ it('updates when dataSource changes', async () => {
+ const wrapper = mount(Pivot, {
+ propsData: {
+ dataSources: {
+ item: ['foo', 'bar', 'bar', 'bar'],
+ year: [2021, 2021, 2020, 2020]
+ },
+ initOptions: {
+ rows: ['item'],
+ cols: ['year'],
+ colOrder: 'key_a_to_z',
+ rowOrder: 'key_a_to_z',
+ aggregatorName: 'Count',
+ vals: [],
+ rendererName: 'Table'
+ }
+ }
+ })
+
+ await wrapper.setProps({
+ dataSources: {
+ item: ['foo', 'bar', 'bar', 'bar', 'foo', 'baz'],
+ year: [2021, 2021, 2020, 2020, 2021, 2020]
+ }
+ })
+
+ const colLabels = wrapper.findAll('.pivot-output thead th.pvtColLabel')
+ expect(colLabels.at(0).text()).to.equal('2020')
+ expect(colLabels.at(1).text()).to.equal('2021')
+ const rows = wrapper.findAll('.pivot-output tbody tr')
+ // row0: bar - 2 - 1
+ expect(rows.at(0).find('th').text()).to.equal('bar')
+ expect(rows.at(0).find('td.col0').text()).to.equal('2')
+ expect(rows.at(0).find('td.col1').text()).to.equal('1')
+ expect(rows.at(0).find('td.rowTotal').text()).to.equal('3')
+
+ // row1: baz - 1 -
+ expect(rows.at(1).find('th').text()).to.equal('baz')
+ expect(rows.at(1).find('td.col0').text()).to.equal('1')
+ expect(rows.at(1).find('td.col1').text()).to.equal('')
+ expect(rows.at(1).find('td.rowTotal').text()).to.equal('1')
+
+ // row2: foo - - 2
+ expect(rows.at(2).find('th').text()).to.equal('foo')
+ expect(rows.at(2).find('td.col0').text()).to.equal('')
+ expect(rows.at(2).find('td.col1').text()).to.equal('2')
+ expect(rows.at(2).find('td.rowTotal').text()).to.equal('2')
+ })
+
+ it('updates when pivot settings changes', async () => {
+ const wrapper = mount(Pivot, {
+ propsData: {
+ dataSources: {
+ item: ['foo', 'bar', 'bar', 'bar'],
+ year: [2021, 2021, 2020, 2020]
+ },
+ initOptions: {
+ rows: ['item'],
+ cols: ['year'],
+ colOrder: 'key_a_to_z',
+ rowOrder: 'key_a_to_z',
+ aggregatorName: 'Count',
+ vals: [],
+ rendererName: 'Table'
+ }
+ }
+ })
+
+ await wrapper.findComponent({ name: 'pivotUi' }).vm.$emit('input', {
+ rows: ['year'],
+ cols: ['item'],
+ colOrder: 'key_a_to_z',
+ rowOrder: 'key_a_to_z',
+ aggregator: $.pivotUtilities.aggregators.Count(),
+ aggregatorName: 'Count',
+ renderer: $.pivotUtilities.renderers.Table,
+ rendererName: 'Table',
+ rendererOptions: undefined,
+ vals: []
+ })
+
+ const colLabels = wrapper.findAll('.pivot-output thead th.pvtColLabel')
+ expect(colLabels.at(0).text()).to.equal('bar')
+ expect(colLabels.at(1).text()).to.equal('foo')
+ const rows = wrapper.findAll('.pivot-output tbody tr')
+ // row0: 2020 - 2 -
+ expect(rows.at(0).find('th').text()).to.equal('2020')
+ expect(rows.at(0).find('td.col0').text()).to.equal('2')
+ expect(rows.at(0).find('td.col1').text()).to.equal('')
+ expect(rows.at(0).find('td.rowTotal').text()).to.equal('2')
+
+ // row1: 2021 - 1 - 1
+ expect(rows.at(1).find('th').text()).to.equal('2021')
+ expect(rows.at(1).find('td.col0').text()).to.equal('1')
+ expect(rows.at(1).find('td.col1').text()).to.equal('1')
+ expect(rows.at(1).find('td.rowTotal').text()).to.equal('2')
+ })
+
+ it('returns options for save', async () => {
+ const wrapper = mount(Pivot, {
+ propsData: {
+ dataSources: {
+ item: ['foo', 'bar', 'bar', 'bar'],
+ year: [2021, 2021, 2020, 2020]
+ },
+ initOptions: {
+ rows: ['item'],
+ cols: ['year'],
+ colOrder: 'key_a_to_z',
+ rowOrder: 'key_a_to_z',
+ aggregatorName: 'Count',
+ vals: [],
+ rendererName: 'Table'
+ }
+ }
+ })
+
+ await wrapper.findComponent({ name: 'pivotUi' }).vm.$emit('input', {
+ rows: ['year'],
+ cols: ['item'],
+ colOrder: 'value_a_to_z',
+ rowOrder: 'value_z_to_a',
+ aggregator: $.pivotUtilities.aggregators.Count(),
+ aggregatorName: 'Count',
+ renderer: $.pivotUtilities.renderers.Table,
+ rendererName: 'Table',
+ rendererOptions: undefined,
+ vals: []
+ })
+
+ let optionsForSave = wrapper.vm.getOptionsForSave()
+
+ expect(optionsForSave.rows).to.eql(['year'])
+ expect(optionsForSave.cols).to.eql(['item'])
+ expect(optionsForSave.colOrder).to.equal('value_a_to_z')
+ expect(optionsForSave.rowOrder).to.equal('value_z_to_a')
+ expect(optionsForSave.aggregatorName).to.equal('Count')
+ expect(optionsForSave.rendererName).to.equal('Table')
+ expect(optionsForSave.rendererOptions).to.equal(undefined)
+ expect(optionsForSave.vals).to.eql([])
+
+ await wrapper.findComponent({ name: 'pivotUi' }).vm.$emit('input', {
+ rows: ['item'],
+ cols: ['year'],
+ colOrder: 'value_a_to_z',
+ rowOrder: 'value_z_to_a',
+ aggregator: $.pivotUtilities.aggregators.Count(),
+ aggregatorName: 'Count',
+ renderer: $.pivotUtilities.renderers['Custom chart'],
+ rendererName: 'Custom chart',
+ rendererOptions: {
+ customChartComponent: {
+ getOptionsForSave () {
+ return { here_are: 'custom chart settings' }
+ }
+ }
+ },
+ vals: []
+ })
+
+ optionsForSave = wrapper.vm.getOptionsForSave()
+ expect(optionsForSave.rows).to.eql(['item'])
+ expect(optionsForSave.cols).to.eql(['year'])
+ expect(optionsForSave.colOrder).to.equal('value_a_to_z')
+ expect(optionsForSave.rowOrder).to.equal('value_z_to_a')
+ expect(optionsForSave.aggregatorName).to.equal('Count')
+ expect(optionsForSave.rendererName).to.equal('Custom chart')
+ expect(optionsForSave.rendererOptions).to.eql({
+ customChartOptions: { here_are: 'custom chart settings' }
+ })
+ expect(optionsForSave.vals).to.eql([])
+ })
+})
diff --git a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/PivotSortBtn.spec.js b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/PivotSortBtn.spec.js
new file mode 100644
index 0000000..4a79e93
--- /dev/null
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/PivotSortBtn.spec.js
@@ -0,0 +1,21 @@
+import { expect } from 'chai'
+import { shallowMount } from '@vue/test-utils'
+import PivotSortBtn from '@/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn'
+
+describe('PivotSortBtn.vue', () => {
+ it('switches order', async () => {
+ const wrapper = shallowMount(PivotSortBtn, { propsData: { value: 'key_a_to_z' } })
+
+ expect(wrapper.vm.value).to.equal('key_a_to_z')
+ await wrapper.find('.pivot-sort-btn').trigger('click')
+ expect(wrapper.emitted('input')[0]).to.eql(['value_a_to_z'])
+
+ await wrapper.setProps({ value: 'value_a_to_z' })
+ await wrapper.find('.pivot-sort-btn').trigger('click')
+ expect(wrapper.emitted('input')[1]).to.eql(['value_z_to_a'])
+
+ await wrapper.setProps({ value: 'value_z_to_a' })
+ await wrapper.find('.pivot-sort-btn').trigger('click')
+ expect(wrapper.emitted('input')[2]).to.eql(['key_a_to_z'])
+ })
+})
diff --git a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/PivotUi.spec.js b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/PivotUi.spec.js
new file mode 100644
index 0000000..1933f3e
--- /dev/null
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/PivotUi.spec.js
@@ -0,0 +1,143 @@
+import { expect } from 'chai'
+import { mount } from '@vue/test-utils'
+import PivotUi from '@/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi'
+
+describe('PivotUi.vue', () => {
+ it('returns value when settings changed', async () => {
+ const wrapper = mount(PivotUi, {
+ propsData: {
+ keyNames: ['foo', 'bar']
+ }
+ })
+
+ // choose columns
+ await wrapper.findAll('.sqliteviz-select.cols .multiselect__element > span').at(0)
+ .trigger('click')
+
+ expect(wrapper.emitted().update.length).to.equal(1)
+ expect(wrapper.emitted().input[0][0].rows).to.eql([])
+ expect(wrapper.emitted().input[0][0].cols).to.eql(['foo'])
+ expect(wrapper.emitted().input[0][0].colOrder).to.equal('key_a_to_z')
+ expect(wrapper.emitted().input[0][0].rowOrder).to.equal('key_a_to_z')
+ expect(wrapper.emitted().input[0][0].aggregatorName).to.equal('Count')
+ expect(wrapper.emitted().input[0][0].rendererName).to.equal('Table')
+ expect(wrapper.emitted().input[0][0].rendererOptions).to.equal(undefined)
+ expect(wrapper.emitted().input[0][0].vals).to.eql([])
+
+ // choose rows
+ await wrapper.findAll('.sqliteviz-select.rows .multiselect__element > span').at(0)
+ .trigger('click')
+
+ expect(wrapper.emitted().update.length).to.equal(2)
+ expect(wrapper.emitted().input[1][0].rows).to.eql(['bar'])
+ expect(wrapper.emitted().input[1][0].cols).to.eql(['foo'])
+ expect(wrapper.emitted().input[1][0].colOrder).to.equal('key_a_to_z')
+ expect(wrapper.emitted().input[1][0].rowOrder).to.equal('key_a_to_z')
+ expect(wrapper.emitted().input[1][0].aggregatorName).to.equal('Count')
+ expect(wrapper.emitted().input[1][0].rendererName).to.equal('Table')
+ expect(wrapper.emitted().input[1][0].rendererOptions).to.equal(undefined)
+ expect(wrapper.emitted().input[1][0].vals).to.eql([])
+
+ // change column order
+ await wrapper.find('.pivot-sort-btn.col').trigger('click')
+
+ expect(wrapper.emitted().update.length).to.equal(3)
+ expect(wrapper.emitted().input[2][0].rows).to.eql(['bar'])
+ expect(wrapper.emitted().input[2][0].cols).to.eql(['foo'])
+ expect(wrapper.emitted().input[2][0].colOrder).to.equal('value_a_to_z')
+ expect(wrapper.emitted().input[2][0].rowOrder).to.equal('key_a_to_z')
+ expect(wrapper.emitted().input[2][0].aggregatorName).to.equal('Count')
+ expect(wrapper.emitted().input[2][0].rendererName).to.equal('Table')
+ expect(wrapper.emitted().input[2][0].rendererOptions).to.equal(undefined)
+ expect(wrapper.emitted().input[2][0].vals).to.eql([])
+
+ // change row order
+ await wrapper.find('.pivot-sort-btn.row').trigger('click')
+
+ expect(wrapper.emitted().update.length).to.equal(4)
+ expect(wrapper.emitted().input[3][0].rows).to.eql(['bar'])
+ expect(wrapper.emitted().input[3][0].cols).to.eql(['foo'])
+ expect(wrapper.emitted().input[3][0].colOrder).to.equal('value_a_to_z')
+ expect(wrapper.emitted().input[3][0].rowOrder).to.equal('value_a_to_z')
+ expect(wrapper.emitted().input[3][0].aggregatorName).to.equal('Count')
+ expect(wrapper.emitted().input[3][0].rendererName).to.equal('Table')
+ expect(wrapper.emitted().input[3][0].rendererOptions).to.equal(undefined)
+ expect(wrapper.emitted().input[3][0].vals).to.eql([])
+
+ // change aggregator
+ await wrapper.findAll('.sqliteviz-select.aggregator .multiselect__element > span').at(12)
+ .trigger('click')
+
+ expect(wrapper.emitted().update.length).to.equal(5)
+ expect(wrapper.emitted().input[4][0].rows).to.eql(['bar'])
+ expect(wrapper.emitted().input[4][0].cols).to.eql(['foo'])
+ expect(wrapper.emitted().input[4][0].colOrder).to.equal('value_a_to_z')
+ expect(wrapper.emitted().input[4][0].rowOrder).to.equal('value_a_to_z')
+ expect(wrapper.emitted().input[4][0].aggregatorName).to.equal('Sum over Sum')
+ expect(wrapper.emitted().input[4][0].rendererName).to.equal('Table')
+ expect(wrapper.emitted().input[4][0].rendererOptions).to.equal(undefined)
+ expect(wrapper.emitted().input[4][0].vals).to.eql(['', ''])
+
+ // set first aggregator argument
+ await wrapper
+ .findAll('.sqliteviz-select.aggr-arg').at(0)
+ .findAll('.multiselect__element > span').at(0)
+ .trigger('click')
+
+ expect(wrapper.emitted().update.length).to.equal(6)
+ expect(wrapper.emitted().input[5][0].rows).to.eql(['bar'])
+ expect(wrapper.emitted().input[5][0].cols).to.eql(['foo'])
+ expect(wrapper.emitted().input[5][0].colOrder).to.equal('value_a_to_z')
+ expect(wrapper.emitted().input[5][0].rowOrder).to.equal('value_a_to_z')
+ expect(wrapper.emitted().input[5][0].aggregatorName).to.equal('Sum over Sum')
+ expect(wrapper.emitted().input[5][0].rendererName).to.equal('Table')
+ expect(wrapper.emitted().input[5][0].rendererOptions).to.equal(undefined)
+ expect(wrapper.emitted().input[5][0].vals).to.eql(['foo', ''])
+
+ // set second aggregator argument
+ await wrapper
+ .findAll('.sqliteviz-select.aggr-arg').at(1)
+ .findAll('.multiselect__element > span').at(1)
+ .trigger('click')
+
+ expect(wrapper.emitted().update.length).to.equal(7)
+ expect(wrapper.emitted().input[6][0].rows).to.eql(['bar'])
+ expect(wrapper.emitted().input[6][0].cols).to.eql(['foo'])
+ expect(wrapper.emitted().input[6][0].colOrder).to.equal('value_a_to_z')
+ expect(wrapper.emitted().input[6][0].rowOrder).to.equal('value_a_to_z')
+ expect(wrapper.emitted().input[6][0].aggregatorName).to.equal('Sum over Sum')
+ expect(wrapper.emitted().input[6][0].rendererName).to.equal('Table')
+ expect(wrapper.emitted().input[6][0].rendererOptions).to.equal(undefined)
+ expect(wrapper.emitted().input[6][0].vals).to.eql(['foo', 'bar'])
+
+ // change renderer
+ await wrapper.findAll('.sqliteviz-select.renderer .multiselect__element > span').at(13)
+ .trigger('click')
+
+ expect(wrapper.emitted().update.length).to.equal(8)
+ expect(wrapper.emitted().input[7][0].rows).to.eql(['bar'])
+ expect(wrapper.emitted().input[7][0].cols).to.eql(['foo'])
+ expect(wrapper.emitted().input[7][0].colOrder).to.equal('value_a_to_z')
+ expect(wrapper.emitted().input[7][0].rowOrder).to.equal('value_a_to_z')
+ expect(wrapper.emitted().input[7][0].aggregatorName).to.equal('Sum over Sum')
+ expect(wrapper.emitted().input[7][0].rendererName).to.equal('Custom chart')
+ expect(wrapper.emitted().input[7][0].rendererOptions.customChartComponent)
+ .to.not.equal(undefined)
+ expect(wrapper.emitted().input[7][0].vals).to.eql(['foo', 'bar'])
+
+ // change aggregator again
+ await wrapper.findAll('.sqliteviz-select.aggregator .multiselect__element > span').at(3)
+ .trigger('click')
+
+ expect(wrapper.emitted().update.length).to.equal(9)
+ expect(wrapper.emitted().input[8][0].rows).to.eql(['bar'])
+ expect(wrapper.emitted().input[8][0].cols).to.eql(['foo'])
+ expect(wrapper.emitted().input[8][0].colOrder).to.equal('value_a_to_z')
+ expect(wrapper.emitted().input[8][0].rowOrder).to.equal('value_a_to_z')
+ expect(wrapper.emitted().input[8][0].aggregatorName).to.equal('Sum')
+ expect(wrapper.emitted().input[8][0].rendererName).to.equal('Custom chart')
+ expect(wrapper.emitted().input[8][0].rendererOptions.customChartComponent)
+ .to.not.equal(undefined)
+ expect(wrapper.emitted().input[8][0].vals).to.eql(['foo'])
+ })
+})
diff --git a/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/pivotHelper.spec.js b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/pivotHelper.spec.js
new file mode 100644
index 0000000..581668e
--- /dev/null
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/Pivot/PivotUi/pivotHelper.spec.js
@@ -0,0 +1,56 @@
+import { expect } from 'chai'
+import { _getDataSources } from '@/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/pivotHelper'
+
+describe('pivotHelper.js', () => {
+ it('_getDataSources returns data sources', () => {
+ /*
+ +---+---+---------+---------+
+ | | x | 5 | 10 |
+ | +---+----+----+----+----+
+ | | z | 2 | 3 | 1 | 6 |
+ +---+---+ | | | |
+ | y | | | | | |
+ +---+---+----+----+----+----+
+ | 3 | 5 | 6 | 4 | 9 |
+ +-------+----+----+----+----+
+ | 6 | 8 | 9 | 7 | 12 |
+ +-------+----+----+----+----+
+ | 9 | 11 | 12 | 10 | 15 |
+ +-------+----+----+----+----+
+ */
+ const pivotData = {
+ rowAttrs: ['y'],
+ colAttrs: ['x', 'z'],
+ getRowKeys () {
+ return [[3], [6], [9]]
+ },
+ getColKeys () {
+ return [
+ [5, 2],
+ [5, 3],
+ [10, 1],
+ [10, 6]
+ ]
+ },
+ getAggregator (row, col) {
+ return {
+ value () {
+ return +row + +col[1]
+ }
+ }
+ }
+ }
+
+ expect(_getDataSources(pivotData)).to.eql({
+ 'Column keys': ['5-2', '5-3', '10-1', '10-6'],
+ 'Row keys': ['3', '6', '9'],
+ 'x-z:5-2': [5, 8, 11],
+ 'x-z:5-3': [6, 9, 12],
+ 'x-z:10-1': [4, 7, 10],
+ 'x-z:10-6': [9, 12, 15],
+ 'y:3': [5, 6, 4, 9],
+ 'y:6': [8, 9, 7, 12],
+ 'y:9': [11, 12, 10, 15]
+ })
+ })
+})
diff --git a/tests/views/MainView/Editor/Tabs/Tab/Chart/chartHelper.spec.js b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/chartHelper.spec.js
similarity index 68%
rename from tests/views/MainView/Editor/Tabs/Tab/Chart/chartHelper.spec.js
rename to tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/chartHelper.spec.js
index 5cc94d5..b35550c 100644
--- a/tests/views/MainView/Editor/Tabs/Tab/Chart/chartHelper.spec.js
+++ b/tests/views/Main/Workspace/Tabs/Tab/DataView/Chart/chartHelper.spec.js
@@ -1,6 +1,6 @@
import { expect } from 'chai'
import sinon from 'sinon'
-import * as chartHelper from '@/views/Main/Editor/Tabs/Tab/Chart/chartHelper'
+import * as chartHelper from '@/views/Main/Workspace/Tabs/Tab/DataView/Chart/chartHelper'
import * as dereference from 'react-chart-editor/lib/lib/dereference'
describe('chartHelper.js', () => {
@@ -8,22 +8,6 @@ describe('chartHelper.js', () => {
sinon.restore()
})
- it('getDataSourcesFromSqlResult', () => {
- const sqlResult = {
- columns: ['id', 'name'],
- values: [
- [1, 'foo'],
- [2, 'bar']
- ]
- }
-
- const ds = chartHelper.getDataSourcesFromSqlResult(sqlResult)
- expect(ds).to.eql({
- id: [1, 2],
- name: ['foo', 'bar']
- })
- })
-
it('getOptionsFromDataSources', () => {
const dataSources = {
id: [1, 2],
@@ -37,7 +21,7 @@ describe('chartHelper.js', () => {
])
})
- it('getChartStateForSave', () => {
+ it('getOptionsForSave', () => {
const state = {
data: {
foo: {},
@@ -53,7 +37,7 @@ describe('chartHelper.js', () => {
sinon.stub(dereference, 'default')
sinon.spy(JSON, 'parse')
- const ds = chartHelper.getChartStateForSave(state, dataSources)
+ const ds = chartHelper.getOptionsForSave(state, dataSources)
expect(dereference.default.calledOnce).to.equal(true)
diff --git a/tests/views/Main/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js b/tests/views/Main/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js
new file mode 100644
index 0000000..118b899
--- /dev/null
+++ b/tests/views/Main/Workspace/Tabs/Tab/SqlEditor/SqlEditor.spec.js
@@ -0,0 +1,44 @@
+import { expect } from 'chai'
+import { mount } from '@vue/test-utils'
+import Vuex from 'vuex'
+import SqlEditor from '@/views/Main/Workspace/Tabs/Tab/SqlEditor'
+
+describe('SqlEditor.vue', () => {
+ it('Emits input event when a query is changed', async () => {
+ // mock store state
+ const state = {
+ db: {}
+ }
+
+ const store = new Vuex.Store({ state })
+
+ const wrapper = mount(SqlEditor, { store })
+ await wrapper.findComponent({ name: 'codemirror' }).vm.$emit('input', 'SELECT * FROM foo')
+ expect(wrapper.emitted('input')[0]).to.eql(['SELECT * FROM foo'])
+ })
+
+ it('Run is disabled if there is no db or no query or is getting result set', async () => {
+ const state = {
+ db: null
+ }
+ const store = new Vuex.Store({ state })
+
+ const wrapper = mount(SqlEditor, { store, propsData: { isGettingResults: false } })
+ await wrapper.findComponent({ name: 'codemirror' }).vm.$emit('input', 'SELECT * FROM foo')
+ const runButton = wrapper.findComponent({ name: 'RunIcon' }).vm.$parent
+
+ expect(runButton.disabled).to.equal(true)
+
+ await wrapper.vm.$set(store.state, 'db', {})
+ expect(runButton.disabled).to.equal(false)
+
+ await wrapper.findComponent({ name: 'codemirror' }).vm.$emit('input', '')
+ expect(runButton.disabled).to.equal(true)
+
+ await wrapper.findComponent({ name: 'codemirror' }).vm.$emit('input', 'SELECT * FROM foo')
+ expect(runButton.disabled).to.equal(false)
+
+ await wrapper.setProps({ isGettingResults: true })
+ expect(runButton.disabled).to.equal(true)
+ })
+})
diff --git a/tests/views/MainView/Editor/Tabs/Tab/SqlEditor/hint.spec.js b/tests/views/Main/Workspace/Tabs/Tab/SqlEditor/hint.spec.js
similarity index 98%
rename from tests/views/MainView/Editor/Tabs/Tab/SqlEditor/hint.spec.js
rename to tests/views/Main/Workspace/Tabs/Tab/SqlEditor/hint.spec.js
index abe5ec6..81a74b9 100644
--- a/tests/views/MainView/Editor/Tabs/Tab/SqlEditor/hint.spec.js
+++ b/tests/views/Main/Workspace/Tabs/Tab/SqlEditor/hint.spec.js
@@ -1,7 +1,7 @@
import { expect } from 'chai'
import sinon from 'sinon'
import state from '@/store/state'
-import showHint, { getHints } from '@/views/Main/Editor/Tabs/Tab/SqlEditor/hint'
+import showHint, { getHints } from '@/views/Main/Workspace/Tabs/Tab/SqlEditor/hint'
import CM from 'codemirror'
describe('hint.js', () => {
diff --git a/tests/views/MainView/Editor/Tabs/Tab/Tab.spec.js b/tests/views/Main/Workspace/Tabs/Tab/Tab.spec.js
similarity index 65%
rename from tests/views/MainView/Editor/Tabs/Tab/Tab.spec.js
rename to tests/views/Main/Workspace/Tabs/Tab/Tab.spec.js
index 87ab756..d9a0441 100644
--- a/tests/views/MainView/Editor/Tabs/Tab/Tab.spec.js
+++ b/tests/views/Main/Workspace/Tabs/Tab/Tab.spec.js
@@ -1,13 +1,21 @@
import { expect } from 'chai'
import sinon from 'sinon'
-import { mount } from '@vue/test-utils'
+import { mount, createWrapper } from '@vue/test-utils'
import mutations from '@/store/mutations'
import Vuex from 'vuex'
-import Tab from '@/views/Main/Editor/Tabs/Tab'
+import Tab from '@/views/Main/Workspace/Tabs/Tab'
+
+let place
describe('Tab.vue', () => {
+ beforeEach(() => {
+ place = document.createElement('div')
+ document.body.appendChild(place)
+ })
+
afterEach(() => {
sinon.restore()
+ place.remove()
})
it('Renders passed query', () => {
@@ -19,21 +27,24 @@ describe('Tab.vue', () => {
// mount the component
const wrapper = mount(Tab, {
+ attachTo: place,
store,
stubs: ['chart'],
propsData: {
id: 1,
initName: 'foo',
initQuery: 'SELECT * FROM foo',
- initChart: [],
+ initViewType: 'chart',
+ initViewOptions: [],
tabIndex: 0,
isPredefined: false
}
})
+
expect(wrapper.find('.tab-content-container').isVisible()).to.equal(true)
- expect(wrapper.find('.table-view').isVisible()).to.equal(true)
- expect(wrapper.find('.table-view .result-before').isVisible()).to.equal(true)
- expect(wrapper.find('.query-editor').text()).to.equal('SELECT * FROM foo')
+ expect(wrapper.find('.bottomPane .run-result-panel').exists()).to.equal(true)
+ expect(wrapper.find('.run-result-panel .result-before').isVisible()).to.equal(true)
+ expect(wrapper.find('.above .sql-editor-panel .codemirror-container').text()).to.equal('SELECT * FROM foo')
})
it("Doesn't render tab when it's not active", () => {
@@ -54,29 +65,6 @@ describe('Tab.vue', () => {
expect(wrapper.find('.tab-content-container').isVisible()).to.equal(false)
})
- it("Shows chart when view equals 'chart'", async () => {
- // mock store state
- const state = {
- currentTabId: 1
- }
-
- const store = new Vuex.Store({ state, mutations })
-
- // mount the component
- const wrapper = mount(Tab, {
- store,
- stubs: ['chart'],
- propsData: {
- id: 1
- }
- })
-
- expect(wrapper.findComponent({ ref: 'chart' }).vm.visible).to.equal(false)
- await wrapper.setData({ view: 'chart' })
- expect(wrapper.find('.table-view').isVisible()).to.equal(false)
- expect(wrapper.findComponent({ ref: 'chart' }).vm.visible).to.equal(true)
- })
-
it('Is not visible when not active', async () => {
// mock store state
const state = {
@@ -123,7 +111,7 @@ describe('Tab.vue', () => {
// mock store state
const state = {
tabs: [
- { id: 1, name: 'foo', query: 'SELECT * FROM foo', chart: [], isUnsaved: false }
+ { id: 1, name: 'foo', query: 'SELECT * FROM foo', chart: [], isSaved: true }
],
currentTabId: 1
}
@@ -138,13 +126,14 @@ describe('Tab.vue', () => {
id: 1,
initName: 'foo',
initQuery: 'SELECT * FROM foo',
- initChart: [],
+ initViewOptions: [],
+ initViewType: 'chart',
tabIndex: 0,
isPredefined: false
}
})
await wrapper.findComponent({ name: 'SqlEditor' }).vm.$emit('input', ' limit 100')
- expect(state.tabs[0].isUnsaved).to.equal(true)
+ expect(state.tabs[0].isSaved).to.equal(false)
})
it('Shows .result-in-progress message when executing query', async () => {
@@ -165,7 +154,8 @@ describe('Tab.vue', () => {
id: 1,
initName: 'foo',
initQuery: 'SELECT * FROM foo',
- initChart: [],
+ initViewOptions: [],
+ initViewType: 'chart',
tabIndex: 0,
isPredefined: false
}
@@ -173,8 +163,7 @@ describe('Tab.vue', () => {
wrapper.vm.execute()
await wrapper.vm.$nextTick()
- expect(wrapper.find('.table-view .result-before').isVisible()).to.equal(false)
- expect(wrapper.find('.table-view .result-in-progress').isVisible()).to.equal(true)
+ expect(wrapper.find('.run-result-panel .result-in-progress').isVisible()).to.equal(true)
})
it('Shows error when executing query ends with error', async () => {
@@ -196,26 +185,24 @@ describe('Tab.vue', () => {
id: 1,
initName: 'foo',
initQuery: 'SELECT * FROM foo',
- initChart: [],
+ initViewOptions: [],
+ initViewType: 'chart',
tabIndex: 0,
isPredefined: false
}
})
await wrapper.vm.execute()
- expect(wrapper.find('.table-view .result-before').isVisible()).to.equal(false)
- expect(wrapper.find('.table-view .result-in-progress').exists()).to.equal(false)
+ expect(wrapper.find('.run-result-panel .result-before').isVisible()).to.equal(false)
+ expect(wrapper.find('.run-result-panel .result-in-progress').exists()).to.equal(false)
expect(wrapper.findComponent({ name: 'logs' }).isVisible()).to.equal(true)
expect(wrapper.findComponent({ name: 'logs' }).text()).to.include('There is no table foo')
})
it('Passes result to sql-table component', async () => {
const result = {
- columns: ['id', 'name'],
- values: [
- [1, 'foo'],
- [2, 'bar']
- ]
+ id: [1, 2],
+ name: ['foo', 'bar']
}
// mock store state
const state = {
@@ -236,23 +223,24 @@ describe('Tab.vue', () => {
id: 1,
initName: 'foo',
initQuery: 'SELECT * FROM foo',
- initChart: [],
+ initViewOptions: [],
+ initViewType: 'chart',
tabIndex: 0,
isPredefined: false
}
})
await wrapper.vm.execute()
- expect(wrapper.find('.table-view .result-before').isVisible()).to.equal(false)
- expect(wrapper.find('.table-view .result-in-progress').exists()).to.equal(false)
+ expect(wrapper.find('.run-result-panel .result-before').isVisible()).to.equal(false)
+ expect(wrapper.find('.run-result-panel .result-in-progress').exists()).to.equal(false)
expect(wrapper.findComponent({ name: 'logs' }).exists()).to.equal(false)
expect(wrapper.findComponent({ name: 'SqlTable' }).vm.dataSet).to.eql(result)
})
it('Updates schema after query execution', async () => {
const result = {
- columns: ['id', 'name'],
- values: []
+ id: [],
+ name: []
}
// mock store state
@@ -275,7 +263,8 @@ describe('Tab.vue', () => {
id: 1,
initName: 'foo',
initQuery: 'SELECT * FROM foo; CREATE TABLE bar(a,b);',
- initChart: [],
+ initViewOptions: [],
+ initViewType: 'chart',
tabIndex: 0,
isPredefined: false
}
@@ -284,4 +273,52 @@ describe('Tab.vue', () => {
await wrapper.vm.execute()
expect(state.db.refreshSchema.calledOnce).to.equal(true)
})
+
+ it('Switches views', async () => {
+ const state = {
+ currentTabId: 1,
+ db: {}
+ }
+
+ const store = new Vuex.Store({ state, mutations })
+
+ const wrapper = mount(Tab, {
+ attachTo: place,
+ store,
+ stubs: ['chart'],
+ propsData: {
+ id: 1,
+ initName: 'foo',
+ initQuery: 'SELECT * FROM foo; CREATE TABLE bar(a,b);',
+ initViewOptions: [],
+ initViewType: 'chart',
+ tabIndex: 0,
+ isPredefined: false
+ }
+ })
+
+ let tableBtn = createWrapper(wrapper.find('.above .side-tool-bar').findComponent({ name: 'tableIcon' }).vm.$parent)
+ await tableBtn.trigger('click')
+
+ expect(wrapper.find('.bottomPane .sql-editor-panel').exists()).to.equal(true)
+ expect(wrapper.find('.above .run-result-panel').exists()).to.equal(true)
+
+ const dataViewBtn = createWrapper(wrapper.find('.above .side-tool-bar').findComponent({ name: 'dataViewIcon' }).vm.$parent)
+ await dataViewBtn.trigger('click')
+
+ expect(wrapper.find('.bottomPane .sql-editor-panel').exists()).to.equal(true)
+ expect(wrapper.find('.above .data-view-panel').exists()).to.equal(true)
+
+ const sqlEditorBtn = createWrapper(wrapper.find('.above .side-tool-bar').findComponent({ name: 'sqlEditorIcon' }).vm.$parent)
+ await sqlEditorBtn.trigger('click')
+
+ expect(wrapper.find('.above .sql-editor-panel').exists()).to.equal(true)
+ expect(wrapper.find('.bottomPane .data-view-panel').exists()).to.equal(true)
+
+ tableBtn = createWrapper(wrapper.find('.bottomPane .side-tool-bar').findComponent({ name: 'tableIcon' }).vm.$parent)
+ await tableBtn.trigger('click')
+
+ expect(wrapper.find('.above .sql-editor-panel').exists()).to.equal(true)
+ expect(wrapper.find('.bottomPane .run-result-panel').exists()).to.equal(true)
+ })
})
diff --git a/tests/views/MainView/Editor/Tabs/Tabs.spec.js b/tests/views/Main/Workspace/Tabs/Tabs.spec.js
similarity index 90%
rename from tests/views/MainView/Editor/Tabs/Tabs.spec.js
rename to tests/views/Main/Workspace/Tabs/Tabs.spec.js
index 479f4f6..edc1522 100644
--- a/tests/views/MainView/Editor/Tabs/Tabs.spec.js
+++ b/tests/views/Main/Workspace/Tabs/Tabs.spec.js
@@ -3,7 +3,7 @@ import sinon from 'sinon'
import { shallowMount, mount, createWrapper } from '@vue/test-utils'
import mutations from '@/store/mutations'
import Vuex from 'vuex'
-import Tabs from '@/views/Main/Editor/Tabs'
+import Tabs from '@/views/Main/Workspace/Tabs'
describe('Tabs.vue', () => {
afterEach(() => {
@@ -31,8 +31,8 @@ describe('Tabs.vue', () => {
// mock store state
const state = {
tabs: [
- { id: 1, name: 'foo', query: 'select * from foo', chart: [], isUnsaved: false },
- { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isUnsaved: true }
+ { id: 1, name: 'foo', query: 'select * from foo', chart: [], isSaved: true },
+ { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isSaved: false }
],
currentTabId: 2
}
@@ -65,8 +65,8 @@ describe('Tabs.vue', () => {
// mock store state
const state = {
tabs: [
- { id: 1, name: 'foo', query: 'select * from foo', chart: [], isUnsaved: false },
- { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isUnsaved: true }
+ { id: 1, name: 'foo', query: 'select * from foo', chart: [], isSaved: true },
+ { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isSaved: false }
],
currentTabId: 2
}
@@ -94,8 +94,8 @@ describe('Tabs.vue', () => {
// mock store state
const state = {
tabs: [
- { id: 1, name: 'foo', query: 'select * from foo', chart: [], isUnsaved: false },
- { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isUnsaved: true }
+ { id: 1, name: 'foo', query: 'select * from foo', chart: [], isSaved: true },
+ { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isSaved: false }
],
currentTabId: 2
}
@@ -125,8 +125,8 @@ describe('Tabs.vue', () => {
// mock store state
const state = {
tabs: [
- { id: 1, name: 'foo', query: 'select * from foo', chart: [], isUnsaved: false },
- { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isUnsaved: true }
+ { id: 1, name: 'foo', query: 'select * from foo', chart: [], isSaved: true },
+ { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isSaved: false }
],
currentTabId: 2
}
@@ -166,8 +166,8 @@ describe('Tabs.vue', () => {
// mock store state
const state = {
tabs: [
- { id: 1, name: 'foo', query: 'select * from foo', chart: [], isUnsaved: false },
- { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isUnsaved: true }
+ { id: 1, name: 'foo', query: 'select * from foo', chart: [], isSaved: true },
+ { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isSaved: false }
],
currentTabId: 2
}
@@ -199,9 +199,9 @@ describe('Tabs.vue', () => {
expect(firstTab.find('.star').isVisible()).to.equal(false)
expect(firstTab.classes()).to.include('tab-selected')
- // check that 'saveQuery' event was not emited
+ // check that 'saveInquiry' event was not emited
const rootWrapper = createWrapper(wrapper.vm.$root)
- expect(rootWrapper.emitted('saveQuery')).to.equal(undefined)
+ expect(rootWrapper.emitted('saveInquiry')).to.equal(undefined)
// check that the dialog is closed
expect(wrapper.find('[data-modal="close-warn"]').exists()).to.equal(false)
@@ -211,8 +211,8 @@ describe('Tabs.vue', () => {
// mock store state
const state = {
tabs: [
- { id: 1, name: 'foo', query: 'select * from foo', chart: [], isUnsaved: false },
- { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isUnsaved: true }
+ { id: 1, name: 'foo', query: 'select * from foo', chart: [], isSaved: true },
+ { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isSaved: false }
],
currentTabId: 2
}
@@ -237,8 +237,8 @@ describe('Tabs.vue', () => {
// click 'Save and close' in the dialog
await closeBtn.trigger('click')
- // pretend like saving is completed - trigger 'querySaved' on $root
- await wrapper.vm.$root.$emit('querySaved')
+ // pretend like saving is completed - trigger 'inquirySaved' on $root
+ await wrapper.vm.$root.$emit('inquirySaved')
// check that tab is closed
expect(wrapper.findAllComponents({ name: 'Tab' })).to.have.lengthOf(1)
@@ -247,20 +247,20 @@ describe('Tabs.vue', () => {
expect(firstTab.find('.star').isVisible()).to.equal(false)
expect(firstTab.classes()).to.include('tab-selected')
- // check that 'saveQuery' event was emited
+ // check that 'saveInquiry' event was emited
const rootWrapper = createWrapper(wrapper.vm.$root)
- expect(rootWrapper.emitted('saveQuery')).to.have.lengthOf(1)
+ expect(rootWrapper.emitted('saveInquiry')).to.have.lengthOf(1)
// check that the dialog is closed
expect(wrapper.find('[data-modal="close-warn"]').exists()).to.equal(false)
})
- it('Prevents closing a tab of a browser if there is unsaved query', () => {
+ it('Prevents closing a tab of a browser if there is unsaved inquiry', () => {
// mock store state
const state = {
tabs: [
- { id: 1, name: 'foo', query: 'select * from foo', chart: [], isUnsaved: false },
- { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isUnsaved: true }
+ { id: 1, name: 'foo', query: 'select * from foo', chart: [], isSaved: true },
+ { id: 2, name: null, tempName: 'Untitled', query: '', chart: [], isSaved: false }
],
currentTabId: 2
}
@@ -280,11 +280,11 @@ describe('Tabs.vue', () => {
expect(event.preventDefault.calledOnce).to.equal(true)
})
- it("Doesn't prevent closing a tab of a browser if there is unsaved query", () => {
+ it("Doesn't prevent closing a tab of a browser if there is unsaved inquiry", () => {
// mock store state
const state = {
tabs: [
- { id: 1, name: 'foo', query: 'select * from foo', chart: [], isUnsaved: false }
+ { id: 1, name: 'foo', query: 'select * from foo', chart: [], isSaved: true }
],
currentTabId: 1
}
diff --git a/tests/views/MainView/Editor/Tabs/Tab/Chart/Chart.spec.js b/tests/views/MainView/Editor/Tabs/Tab/Chart/Chart.spec.js
deleted file mode 100644
index 115cb3d..0000000
--- a/tests/views/MainView/Editor/Tabs/Tab/Chart/Chart.spec.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { expect } from 'chai'
-import sinon from 'sinon'
-import { mount, shallowMount } from '@vue/test-utils'
-import Chart from '@/views/Main/Editor/Tabs/Tab/Chart'
-import chartHelper from '@/views/Main/Editor/Tabs/Tab/Chart/chartHelper'
-import * as dereference from 'react-chart-editor/lib/lib/dereference'
-
-describe('Chart.vue', () => {
- afterEach(() => {
- sinon.restore()
- })
-
- it('getChartStateForSave called with proper arguments', () => {
- // mount the component
- const wrapper = shallowMount(Chart)
- const vm = wrapper.vm
- const stub = sinon.stub(chartHelper, 'getChartStateForSave').returns('result')
- const chartData = vm.getChartStateForSave()
- expect(stub.calledOnceWith(vm.state, vm.dataSources)).to.equal(true)
- expect(chartData).to.equal('result')
- })
-
- it('is not visible when visible is false', () => {
- // mount the component
- const wrapper = shallowMount(Chart, {
- propsData: { visible: false }
- })
-
- expect(wrapper.find('.chart-container').isVisible()).to.equal(false)
- })
-
- it('is visible when visible is true', () => {
- // mount the component
- const wrapper = shallowMount(Chart, {
- propsData: { visible: true }
- })
-
- expect(wrapper.find('.chart-container').isVisible()).to.equal(true)
- })
-
- it('emits update when plotly updates', async () => {
- // mount the component
- const wrapper = mount(Chart)
- wrapper.findComponent({ ref: 'plotlyEditor' }).vm.$emit('onUpdate')
- expect(wrapper.emitted('update')).to.have.lengthOf(1)
- })
-
- it('calls dereference when sqlResult is changed', async () => {
- sinon.stub(dereference, 'default')
- const sqlResult = {
- columns: ['id', 'name'],
- values: [[1, 'foo']]
- }
-
- // mount the component
- const wrapper = shallowMount(Chart, {
- propsData: { sqlResult: sqlResult }
- })
-
- const newSqlResult = {
- columns: ['id', 'name'],
- values: [[2, 'bar']]
- }
-
- await wrapper.setProps({ sqlResult: newSqlResult })
- expect(dereference.default.called).to.equal(true)
- })
-})
diff --git a/tests/views/MainView/Editor/Tabs/Tab/SqlEditor/SqlEditor.spec.js b/tests/views/MainView/Editor/Tabs/Tab/SqlEditor/SqlEditor.spec.js
deleted file mode 100644
index 2ed2b88..0000000
--- a/tests/views/MainView/Editor/Tabs/Tab/SqlEditor/SqlEditor.spec.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { expect } from 'chai'
-import { mount } from '@vue/test-utils'
-import SqlEditor from '@/views/Main/Editor/Tabs/Tab/SqlEditor'
-
-describe('SqlEditor.vue', () => {
- it('Emits input event when a query is changed', async () => {
- const wrapper = mount(SqlEditor)
- await wrapper.findComponent({ name: 'codemirror' }).vm.$emit('input', 'SELECT * FROM foo')
- expect(wrapper.emitted('input')[0]).to.eql(['SELECT * FROM foo'])
- })
-})
diff --git a/vue.config.js b/vue.config.js
index 325dba8..b9de711 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -15,7 +15,7 @@ module.exports = {
{ from: 'LICENSE', to: './' }
]),
new WorkboxPlugin.GenerateSW({
- exclude: [/\.map$/, 'LICENSE', 'queries.json'],
+ exclude: [/\.map$/, 'LICENSE', 'inquiries.json'],
clientsClaim: true,
skipWaiting: false,
maximumFileSizeToCacheInBytes: 40000000