diff options
author | Kushal Pandya <kushal@gitlab.com> | 2018-03-06 13:46:16 +0530 |
---|---|---|
committer | Kushal Pandya <kushal@gitlab.com> | 2018-03-06 13:46:47 +0530 |
commit | 4e747a2c9debac1a260015c4a8e73ec21342feec (patch) | |
tree | dc82376590a0509e75fcefcf94c6b0d47f24d075 | |
parent | 36d1c8001a4d40fb8567d107ed1cea91982be1b9 (diff) | |
download | gitlab-ce-43299-revert-bad-merge.tar.gz |
Use `v-if` to show modal43299-revert-bad-merge
-rw-r--r-- | app/assets/javascripts/groups/components/app.vue | 4 | ||||
-rw-r--r-- | spec/javascripts/groups/components/app_spec.js | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue index e035ba462db..0578f43d5af 100644 --- a/app/assets/javascripts/groups/components/app.vue +++ b/app/assets/javascripts/groups/components/app.vue @@ -208,9 +208,9 @@ export default { :page-info="pageInfo" /> <modal - v-show="showModal" - :primary-button-label="__('Leave')" + v-if="showModal" kind="warning" + :primary-button-label="__('Leave')" :title="__('Are you sure?')" :text="groupLeaveConfirmationMessage" @cancel="hideLeaveGroupModal" diff --git a/spec/javascripts/groups/components/app_spec.js b/spec/javascripts/groups/components/app_spec.js index 3b7e7ab0a5a..46c7b9f54f2 100644 --- a/spec/javascripts/groups/components/app_spec.js +++ b/spec/javascripts/groups/components/app_spec.js @@ -473,13 +473,16 @@ describe('AppComponent', () => { }); }); - it('renders modal confirmation dialog', () => { + it('renders modal confirmation dialog', (done) => { vm.groupLeaveConfirmationMessage = 'Are you sure you want to leave the "foo" group?'; vm.showModal = true; - const modalDialogEl = vm.$el.querySelector('.modal'); - expect(modalDialogEl).not.toBe(null); - expect(modalDialogEl.querySelector('.modal-title').innerText.trim()).toBe('Are you sure?'); - expect(modalDialogEl.querySelector('.btn.btn-warning').innerText.trim()).toBe('Leave'); + Vue.nextTick(() => { + const modalDialogEl = vm.$el.querySelector('.modal'); + expect(modalDialogEl).not.toBe(null); + expect(modalDialogEl.querySelector('.modal-title').innerText.trim()).toBe('Are you sure?'); + expect(modalDialogEl.querySelector('.btn.btn-warning').innerText.trim()).toBe('Leave'); + done(); + }); }); }); }); |