Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/features/projects/files/user_edits_files_spec.rb b/spec/features/projects/files/user_edits_files_spec.rb
index d7460538be9..ad96f6b6239 100644
--- a/spec/features/projects/files/user_edits_files_spec.rb
+++ b/spec/features/projects/files/user_edits_files_spec.rb
@@ -102,6 +102,21 @@ RSpec.describe 'Projects > Files > User edits files', :js do
       expect(page).to have_content('*.rbca')
     end
 
+    it 'shows loader on commit changes' do
+      set_default_button('edit')
+      click_link('.gitignore')
+      click_link_or_button('Edit')
+
+      # why: We don't want the form to actually submit, so that we can assert the button's changed state
+      page.execute_script("document.querySelector('.js-edit-blob-form').addEventListener('submit', e => e.preventDefault())")
+
+      find('.file-editor', match: :first)
+      editor_set_value('*.rbca')
+      click_button('Commit changes')
+
+      expect(page).to have_button('Commit changes', disabled: true, class: 'js-commit-button-loading')
+    end
+
     it 'shows the diff of an edited file' do
       set_default_button('edit')
       click_link('.gitignore')