Merge branch 'winh-unify-modals' into 'master'

Unify dialog modal/popup dialog/confirmation dialog/modal to modal

See merge request gitlab-org/gitlab-ce!15865

7 files changed, 25 insertions, 25 deletions

diff --git a/spec/features/profile_spec.rb b/spec/features/profile_spec.rb
index c60883911f7..0848857ed1e 100644
--- a/spec/features/profile_spec.rb
+++ b/spec/features/profile_spec.rb
@@ -25,7 +25,7 @@ describe 'Profile account page', :js do
 
       fill_in 'password', with: '12345678'
 
-      page.within '.popup-dialog' do
+      page.within '.modal' do
         click_button 'Delete account'
       end
 
@@ -38,7 +38,7 @@ describe 'Profile account page', :js do
 
       fill_in 'password', with: 'testing123'
 
-      page.within '.popup-dialog' do
+      page.within '.modal' do
         click_button 'Delete account'
       end
 
diff --git a/spec/features/projects/tree/create_directory_spec.rb b/spec/features/projects/tree/create_directory_spec.rb
index 156293289dd..8f06328962e 100644
--- a/spec/features/projects/tree/create_directory_spec.rb
+++ b/spec/features/projects/tree/create_directory_spec.rb
@@ -20,7 +20,7 @@ feature 'Multi-file editor new directory', :js do
 
     click_link('New directory')
 
-    page.within('.popup-dialog') do
+    page.within('.modal') do
       find('.form-control').set('foldername')
 
       click_button('Create directory')
diff --git a/spec/features/projects/tree/create_file_spec.rb b/spec/features/projects/tree/create_file_spec.rb
index 8fb8476e631..bdebc12ef47 100644
--- a/spec/features/projects/tree/create_file_spec.rb
+++ b/spec/features/projects/tree/create_file_spec.rb
@@ -20,7 +20,7 @@ feature 'Multi-file editor new file', :js do
 
     click_link('New file')
 
-    page.within('.popup-dialog') do
+    page.within('.modal') do
       find('.form-control').set('filename')
 
       click_button('Create file')
diff --git a/spec/javascripts/groups/components/item_actions_spec.js b/spec/javascripts/groups/components/item_actions_spec.js
index 2ce1a749a96..7a5c1da4d1d 100644
--- a/spec/javascripts/groups/components/item_actions_spec.js
+++ b/spec/javascripts/groups/components/item_actions_spec.js
@@ -36,27 +36,27 @@ describe('ItemActionsComponent', () => {
 
   describe('methods', () => {
     describe('onLeaveGroup', () => {
-      it('should change `dialogStatus` prop to `true` which shows confirmation dialog', () => {
-        expect(vm.dialogStatus).toBeFalsy();
+      it('should change `modalStatus` prop to `true` which shows confirmation dialog', () => {
+        expect(vm.modalStatus).toBeFalsy();
         vm.onLeaveGroup();
-        expect(vm.dialogStatus).toBeTruthy();
+        expect(vm.modalStatus).toBeTruthy();
       });
     });
 
     describe('leaveGroup', () => {
-      it('should change `dialogStatus` prop to `false` and emit `leaveGroup` event with required params when called with `leaveConfirmed` as `true`', () => {
+      it('should change `modalStatus` prop to `false` and emit `leaveGroup` event with required params when called with `leaveConfirmed` as `true`', () => {
         spyOn(eventHub, '$emit');
-        vm.dialogStatus = true;
+        vm.modalStatus = true;
         vm.leaveGroup(true);
-        expect(vm.dialogStatus).toBeFalsy();
+        expect(vm.modalStatus).toBeFalsy();
         expect(eventHub.$emit).toHaveBeenCalledWith('leaveGroup', vm.group, vm.parentGroup);
       });
 
-      it('should change `dialogStatus` prop to `false` and should NOT emit `leaveGroup` event when called with `leaveConfirmed` as `false`', () => {
+      it('should change `modalStatus` prop to `false` and should NOT emit `leaveGroup` event when called with `leaveConfirmed` as `false`', () => {
         spyOn(eventHub, '$emit');
-        vm.dialogStatus = true;
+        vm.modalStatus = true;
         vm.leaveGroup(false);
-        expect(vm.dialogStatus).toBeFalsy();
+        expect(vm.modalStatus).toBeFalsy();
         expect(eventHub.$emit).not.toHaveBeenCalled();
       });
     });
@@ -99,9 +99,9 @@ describe('ItemActionsComponent', () => {
       newVm.$destroy();
     });
 
-    it('should show modal dialog when `dialogStatus` is set to `true`', () => {
-      vm.dialogStatus = true;
-      const modalDialogEl = vm.$el.querySelector('.modal.popup-dialog');
+    it('should show modal dialog when `modalStatus` is set to `true`', () => {
+      vm.modalStatus = true;
+      const modalDialogEl = vm.$el.querySelector('.modal');
       expect(modalDialogEl).toBeDefined();
       expect(modalDialogEl.querySelector('.modal-title').innerText.trim()).toBe('Are you sure?');
       expect(modalDialogEl.querySelector('.btn.btn-warning').innerText.trim()).toBe('Leave');
diff --git a/spec/javascripts/issue_show/components/app_spec.js b/spec/javascripts/issue_show/components/app_spec.js
index 729c3c29f22..7159148f8fa 100644
--- a/spec/javascripts/issue_show/components/app_spec.js
+++ b/spec/javascripts/issue_show/components/app_spec.js
@@ -272,10 +272,10 @@ describe('Issuable output', () => {
     });
   });
 
-  it('opens recaptcha dialog if update rejected as spam', (done) => {
+  it('opens recaptcha modal if update rejected as spam', (done) => {
     function mockScriptSrc() {
       const recaptchaChild = vm.$children
-        .find(child => child.$options._componentTag === 'recaptcha-dialog'); // eslint-disable-line no-underscore-dangle
+        .find(child => child.$options._componentTag === 'recaptcha-modal'); // eslint-disable-line no-underscore-dangle
 
       recaptchaChild.scriptSrc = '//scriptsrc';
     }
@@ -302,7 +302,7 @@ describe('Issuable output', () => {
       .then(promise)
       .then(() => setTimeoutPromise())
       .then(() => {
-        modal = vm.$el.querySelector('.js-recaptcha-dialog');
+        modal = vm.$el.querySelector('.js-recaptcha-modal');
 
         expect(modal.style.display).not.toEqual('none');
         expect(modal.querySelector('.g-recaptcha').textContent).toEqual('recaptcha_html');
diff --git a/spec/javascripts/issue_show/components/description_spec.js b/spec/javascripts/issue_show/components/description_spec.js
index 2e000a1063f..0da25bdca9c 100644
--- a/spec/javascripts/issue_show/components/description_spec.js
+++ b/spec/javascripts/issue_show/components/description_spec.js
@@ -54,7 +54,7 @@ describe('Description component', () => {
   it('opens recaptcha dialog if update rejected as spam', (done) => {
     let modal;
     const recaptchaChild = vm.$children
-      .find(child => child.$options._componentTag === 'recaptcha-dialog'); // eslint-disable-line no-underscore-dangle
+      .find(child => child.$options._componentTag === 'recaptcha-modal'); // eslint-disable-line no-underscore-dangle
 
     recaptchaChild.scriptSrc = '//scriptsrc';
 
@@ -64,7 +64,7 @@ describe('Description component', () => {
 
     vm.$nextTick()
       .then(() => {
-        modal = vm.$el.querySelector('.js-recaptcha-dialog');
+        modal = vm.$el.querySelector('.js-recaptcha-modal');
 
         expect(modal.style.display).not.toEqual('none');
         expect(modal.querySelector('.g-recaptcha').textContent).toEqual('recaptcha_html');
diff --git a/spec/javascripts/vue_shared/components/popup_dialog_spec.js b/spec/javascripts/vue_shared/components/modal_spec.js
index 5c1d2a196f4..721f4044659 100644
--- a/spec/javascripts/vue_shared/components/popup_dialog_spec.js
+++ b/spec/javascripts/vue_shared/components/modal_spec.js
@@ -1,11 +1,11 @@
 import Vue from 'vue';
-import PopupDialog from '~/vue_shared/components/popup_dialog.vue';
+import modal from '~/vue_shared/components/modal.vue';
 import mountComponent from '../../helpers/vue_mount_component_helper';
 
-describe('PopupDialog', () => {
+describe('Modal', () => {
   it('does not render a primary button if no primaryButtonLabel', () => {
-    const popupDialog = Vue.extend(PopupDialog);
-    const vm = mountComponent(popupDialog);
+    const modalComponent = Vue.extend(modal);
+    const vm = mountComponent(modalComponent);
 
     expect(vm.$el.querySelector('.js-primary-button')).toBeNull();
   });