Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/features/snippets/user_creates_snippet_spec.rb b/spec/features/snippets/user_creates_snippet_spec.rb
index c4279bdb212..62054c1f491 100644
--- a/spec/features/snippets/user_creates_snippet_spec.rb
+++ b/spec/features/snippets/user_creates_snippet_spec.rb
@@ -79,7 +79,7 @@ shared_examples_for 'snippet editor' do
   end
 
   context 'when the git operation fails' do
-    let(:error) { 'This is a git error' }
+    let(:error) { 'Error creating the snippet' }
 
     before do
       allow_next_instance_of(Snippets::CreateService) do |instance|
diff --git a/spec/features/snippets/user_edits_snippet_spec.rb b/spec/features/snippets/user_edits_snippet_spec.rb
index 98f0f75c818..40b0113cf39 100644
--- a/spec/features/snippets/user_edits_snippet_spec.rb
+++ b/spec/features/snippets/user_edits_snippet_spec.rb
@@ -73,7 +73,7 @@ describe 'User edits snippet', :js do
   context 'when the git operation fails' do
     before do
       allow_next_instance_of(Snippets::UpdateService) do |instance|
-        allow(instance).to receive(:create_commit).and_raise(StandardError)
+        allow(instance).to receive(:create_commit).and_raise(StandardError, 'Error Message')
       end
 
       fill_in 'personal_snippet_title', with: 'New Snippet Title'
@@ -83,7 +83,7 @@ describe 'User edits snippet', :js do
     end
 
     it 'renders edit page and displays the error' do
-      expect(page.find('.flash-container span').text).to eq('Error updating the snippet')
+      expect(page.find('.flash-container span').text).to eq('Error updating the snippet - Error Message')
       expect(page).to have_content('Edit Snippet')
     end
   end