Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 4 deletions

diff --git a/spec/features/snippets/user_creates_snippet_spec.rb b/spec/features/snippets/user_creates_snippet_spec.rb
index 82fe895d397..c682ad06977 100644
--- a/spec/features/snippets/user_creates_snippet_spec.rb
+++ b/spec/features/snippets/user_creates_snippet_spec.rb
@@ -109,13 +109,22 @@ RSpec.describe 'User creates snippet', :js do
     end
   end
 
-  it 'validation fails for the first time' do
-    fill_in snippet_title_field, with: title
+  it 'shows validation errors' do
+    title_validation_message = _("This field is required.")
+    files_validation_message = _("Snippets can't contain empty files. Ensure all files have content, or delete them.")
 
-    expect(page).not_to have_button('Create snippet')
+    click_button('Create snippet')
+
+    expect(page).to have_content(title_validation_message)
+    expect(page).to have_content(files_validation_message)
+
+    snippet_fill_in_title(title)
+
+    expect(page).not_to have_content(title_validation_message)
 
     snippet_fill_in_form(title: title, content: file_content)
-    expect(page).to have_button('Create snippet')
+
+    expect(page).not_to have_content(files_validation_message)
   end
 
   it 'previews a snippet with file' do