From fd985906593bcae66142a08e816ea4aa086f68e9 Mon Sep 17 00:00:00 2001 From: Brock Date: Wed, 21 Mar 2018 09:15:58 +0000 Subject: [PATCH 1/5] update version of croppie to match version in monorepo --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index cc8bf97..7413a0e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3222,8 +3222,8 @@ create-react-class@^15.5.1, create-react-class@^15.6.0: object-assign "^4.1.1" croppie@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/croppie/-/croppie-2.5.0.tgz#f730a29add1fd1e576437234bd047606864cc48e" + version "2.6.2" + resolved "https://registry.yarnpkg.com/croppie/-/croppie-2.6.2.tgz#d605ceeffb4aea281f72a63c9a0a305db0a46e50" cross-env@^3.1.4: version "3.2.4" From 7935b8677431c532022d490175a89b9339d844a8 Mon Sep 17 00:00:00 2001 From: Brock Date: Wed, 21 Mar 2018 09:16:27 +0000 Subject: [PATCH 2/5] Only attempt to build copy button if it is supported --- src/components/shared/buttons/CopyButton.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/shared/buttons/CopyButton.vue b/src/components/shared/buttons/CopyButton.vue index cd6db59..5e9ebfc 100644 --- a/src/components/shared/buttons/CopyButton.vue +++ b/src/components/shared/buttons/CopyButton.vue @@ -49,6 +49,8 @@ }, mounted() { + if (!this.isSupported) return + this.clipboard = new Clipboard(this.$refs.button) this.clipboard.on('success', (e) => { From c45e5185d185dbdd9da817a4ae87f5450f0f14c6 Mon Sep 17 00:00:00 2001 From: Brock Date: Wed, 21 Mar 2018 09:17:38 +0000 Subject: [PATCH 3/5] Fix test prop --- test/unit/misc/Status.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unit/misc/Status.spec.js b/test/unit/misc/Status.spec.js index e600552..cf18646 100644 --- a/test/unit/misc/Status.spec.js +++ b/test/unit/misc/Status.spec.js @@ -4,6 +4,7 @@ import Status from '../../../src/components/shared/misc/Status' const Constructor = Vue.extend(Status) const context = { + status: 'test', contextual_status: { status: 'in progress', colour: 'yellow', From 670bfb3813202d704d8faf8a58d8ef07112e559e Mon Sep 17 00:00:00 2001 From: Brock Date: Wed, 21 Mar 2018 09:19:43 +0000 Subject: [PATCH 4/5] Fix test to include required prop --- test/unit/buttons/ExportButton.spec.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/unit/buttons/ExportButton.spec.js b/test/unit/buttons/ExportButton.spec.js index a3e8d3b..be08f56 100644 --- a/test/unit/buttons/ExportButton.spec.js +++ b/test/unit/buttons/ExportButton.spec.js @@ -3,7 +3,11 @@ import ExportButton from '../../../src/components/shared/buttons/ExportButton' const Constructor = Vue.extend(ExportButton) -const vm = new Constructor().$mount() +const vm = new Constructor({ + propsData: { + url: 'http://test.com/api', + }, +}).$mount() describe('Export Button', () => { it('should match the snapshot', () => { From 09e05c5cad054129fb48c1ef8afa19f4872657a5 Mon Sep 17 00:00:00 2001 From: Brock Date: Wed, 21 Mar 2018 09:21:55 +0000 Subject: [PATCH 5/5] Add required prop --- test/unit/misc/SummarisedMultiSelector.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unit/misc/SummarisedMultiSelector.spec.js b/test/unit/misc/SummarisedMultiSelector.spec.js index de17dc3..e5a10ff 100644 --- a/test/unit/misc/SummarisedMultiSelector.spec.js +++ b/test/unit/misc/SummarisedMultiSelector.spec.js @@ -9,6 +9,7 @@ const Constructor = Vue.extend(SummarisedMultiSelector) const vm = new Constructor({ propsData: { + value: '', readOnly: false, options: [ { id: 1, name: 'PPC' },