Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 2 deletions

diff --git a/qa/qa/page/dashboard/snippet/new.rb b/qa/qa/page/dashboard/snippet/new.rb
index 4a8e65e20af..df4c2902b31 100644
--- a/qa/qa/page/dashboard/snippet/new.rb
+++ b/qa/qa/page/dashboard/snippet/new.rb
@@ -10,17 +10,25 @@ module QA
           end
 
           view 'app/views/shared/snippets/_form.html.haml' do
+            element :description_field
+            element :description_placeholder
             element :snippet_title
             element :snippet_file_name
             element :create_snippet_button
           end
 
+          view 'app/views/projects/_zen.html.haml' do
+            # This 'element' is here only to ensure the changes in the view source aren't mistakenly changed
+            element :_, "qa_selector = local_assigns.fetch(:qa_selector, '')" # rubocop:disable QA/ElementWithPattern
+          end
+
           def fill_title(title)
             fill_element :snippet_title, title
           end
 
           def fill_description(description)
-            fill_element :issuable_form_description, description
+            click_element :description_placeholder
+            fill_element :description_field, description
           end
 
           def set_visibility(visibility)
diff --git a/qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb b/qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb
index b0b511eb23a..277e7364ada 100644
--- a/qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  context 'Create', :smoke, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/issues/205511', type: :bug } do
+  context 'Create', :smoke do
     describe 'Snippet creation' do
       it 'User creates a snippet' do
         Flow::Login.sign_in