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

3 files changed, 4 insertions, 4 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')