From 2831af469a29c6e4b8894683e6c0736cc1935a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 9 Mar 2019 01:54:25 +0100 Subject: [PATCH] Remove all code related to vue-portal --- components/ModalTestbed.vue | 19 ------------------- components/ReportModal.spec.js | 13 +++++-------- layouts/default.vue | 3 --- nuxt.config.js | 3 +-- package.json | 1 - 5 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 components/ModalTestbed.vue diff --git a/components/ModalTestbed.vue b/components/ModalTestbed.vue deleted file mode 100644 index fc3e26729..000000000 --- a/components/ModalTestbed.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/components/ReportModal.spec.js b/components/ReportModal.spec.js index e94fe4b15..a23df3baa 100644 --- a/components/ReportModal.spec.js +++ b/components/ReportModal.spec.js @@ -1,17 +1,14 @@ import { shallowMount, render, mount, createLocalVue } from '@vue/test-utils' import ReportModal from './ReportModal.vue' -import ModalTestbed from './ModalTestbed.vue' import Vue from 'vue' import Vuex from 'vuex' import { getters, mutations } from '../store/modal' import Styleguide from '@human-connection/styleguide' -import portal from 'portal-vue' const localVue = createLocalVue() localVue.use(Vuex) localVue.use(Styleguide) -localVue.use(portal) describe('ReportModal.vue', () => { let Wrapper @@ -50,7 +47,7 @@ describe('ReportModal.vue', () => { 'modal/SET_OPEN': mutations.SET_OPEN } }) - return mount(ModalTestbed, { store, mocks, localVue }) + return mount(ReportModal, { store, mocks, localVue }) } beforeEach(() => { @@ -77,8 +74,8 @@ describe('ReportModal.vue', () => { describe('by default', () => { it('buttons enabled', () => { const expected = { disabled: 'disabled' } - const cancelButton = wrapper.findAll('#portal footer button').at(0) - const confirmButton = wrapper.findAll('#portal footer button').at(1) + const cancelButton = wrapper.findAll('footer button').at(0) + const confirmButton = wrapper.findAll('footer button').at(1) expect(cancelButton.attributes().disabled).toBeUndefined() expect(confirmButton.attributes().disabled).toBeUndefined() }) @@ -105,8 +102,8 @@ describe('ReportModal.vue', () => { // problem here. I made a workaround by checking the inital // in a separate test case above. clickAction() - const cancelButton = wrapper.findAll('#portal footer button').at(0) - const confirmButton = wrapper.findAll('#portal footer button').at(1) + const cancelButton = wrapper.findAll('footer button').at(0) + const confirmButton = wrapper.findAll('footer button').at(1) expect(cancelButton.attributes()).toEqual( expect.objectContaining(expected) ) diff --git a/layouts/default.vue b/layouts/default.vue index 7283bf308..00d33d6e8 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -92,9 +92,6 @@
- - - diff --git a/nuxt.config.js b/nuxt.config.js index dfe6ceef8..744768aab 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -116,8 +116,7 @@ module.exports = { 'cookie-universal-nuxt', '@nuxtjs/apollo', '@nuxtjs/axios', - '@nuxtjs/style-resources', - 'portal-vue/nuxt' + '@nuxtjs/style-resources' ], /* diff --git a/package.json b/package.json index 57b2d402b..4269a29ec 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,6 @@ "linkify-it": "~2.1.0", "nuxt": "~2.4.5", "nuxt-env": "~0.1.0", - "portal-vue": "~1.5.1", "string-hash": "^1.1.3", "tiptap": "^1.14.0", "tiptap-extensions": "^1.13.0",