1 files changed, 50 insertions, 84 deletions
diff --git a/spec/features/projects/snippets/create_snippet_spec.rb b/spec/features/projects/snippets/create_snippet_spec.rb
index 503246bbdcf..28fe0a0b7e1 100644
--- a/spec/features/projects/snippets/create_snippet_spec.rb
+++ b/spec/features/projects/snippets/create_snippet_spec.rb
@@ -17,115 +17,81 @@ RSpec.describe 'Projects > Snippets > Create Snippet', :js do
   let(:file_content) { 'Hello World!' }
   let(:md_description) { 'My Snippet **Description**' }
   let(:description) { 'My Snippet Description' }
-  let(:snippet_title_field) { 'project_snippet_title' }
 
-  shared_examples 'snippet creation' do
-    def fill_form
-      snippet_fill_in_form(title: title, content: file_content, description: md_description)
-    end
-
-    it 'shows collapsible description input' do
-      collapsed = description_field
+  def fill_form
+    snippet_fill_in_form(title: title, content: file_content, description: md_description)
+  end
 
-      expect(page).not_to have_field(snippet_description_field)
-      expect(collapsed).to be_visible
+  before do
+    sign_in(user)
 
-      collapsed.click
+    visit new_project_snippet_path(project)
+  end
 
-      expect(page).to have_field(snippet_description_field)
-      expect(collapsed).not_to be_visible
-    end
+  it 'shows collapsible description input' do
+    collapsed = snippet_description_field_collapsed
 
-    it 'creates a new snippet' do
-      fill_form
-      click_button('Create snippet')
-      wait_for_requests
+    expect(page).not_to have_field(snippet_description_locator)
+    expect(collapsed).to be_visible
 
-      expect(page).to have_content(title)
-      expect(page).to have_content(file_content)
-      page.within(snippet_description_view_selector) do
-        expect(page).to have_content(description)
-        expect(page).to have_selector('strong')
-      end
-    end
+    collapsed.click
 
-    it 'uploads a file when dragging into textarea' do
-      fill_form
-      dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
-
-      expect(snippet_description_value).to have_content('banana_sample')
+    expect(page).to have_field(snippet_description_locator)
+    expect(collapsed).not_to be_visible
+  end
 
-      click_button('Create snippet')
-      wait_for_requests
+  it 'creates a new snippet' do
+    fill_form
+    click_button('Create snippet')
+    wait_for_requests
 
-      link = find('a.no-attachment-icon img[alt="banana_sample"]')['src']
-      expect(link).to match(%r{/#{Regexp.escape(project.full_path)}/uploads/\h{32}/banana_sample\.gif\z})
+    expect(page).to have_content(title)
+    expect(page).to have_content(file_content)
+    page.within('.snippet-header .snippet-description') do
+      expect(page).to have_content(description)
+      expect(page).to have_selector('strong')
     end
+  end
 
-    context 'when the git operation fails' do
-      let(:error) { 'Error creating the snippet' }
-
-      before do
-        allow_next_instance_of(Snippets::CreateService) do |instance|
-          allow(instance).to receive(:create_commit).and_raise(StandardError, error)
-        end
+  it 'uploads a file when dragging into textarea' do
+    fill_form
+    dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
 
-        fill_form
+    expect(snippet_description_value).to have_content('banana_sample')
 
-        click_button('Create snippet')
-        wait_for_requests
-      end
+    click_button('Create snippet')
+    wait_for_requests
 
-      it 'renders the new page and displays the error' do
-        expect(page).to have_content(error)
-        expect(page).to have_content('New Snippet')
-      end
-    end
+    link = find('a.no-attachment-icon img[alt="banana_sample"]')['src']
+    expect(link).to match(%r{/#{Regexp.escape(project.full_path)}/uploads/\h{32}/banana_sample\.gif\z})
   end
 
-  context 'Vue application' do
-    let(:snippet_description_field) { 'snippet-description' }
-    let(:snippet_description_view_selector) { '.snippet-header .snippet-description' }
+  context 'when the git operation fails' do
+    let(:error) { 'Error creating the snippet' }
 
     before do
-      sign_in(user)
-
-      visit new_project_snippet_path(project)
-    end
-
-    it_behaves_like 'snippet creation'
-
-    it 'does not allow submitting the form without title and content' do
-      fill_in snippet_title_field, with: title
+      allow_next_instance_of(Snippets::CreateService) do |instance|
+        allow(instance).to receive(:create_commit).and_raise(StandardError, error)
+      end
 
-      expect(page).not_to have_button('Create snippet')
+      fill_form
 
-      snippet_fill_in_form(title: title, content: file_content)
-      expect(page).to have_button('Create snippet')
+      click_button('Create snippet')
+      wait_for_requests
     end
-  end
-
-  context 'non-Vue application' do
-    let(:snippet_description_field) { 'project_snippet_description' }
-    let(:snippet_description_view_selector) { '.snippet-header .description' }
-
-    before do
-      stub_feature_flags(snippets_vue: false)
-      stub_feature_flags(snippets_edit_vue: false)
-
-      sign_in(user)
 
-      visit new_project_snippet_path(project)
+    it 'renders the new page and displays the error' do
+      expect(page).to have_content(error)
+      expect(page).to have_content('New Snippet')
     end
+  end
 
-    it_behaves_like 'snippet creation'
+  it 'does not allow submitting the form without title and content' do
+    snippet_fill_in_title(title)
 
-    it 'displays validation errors' do
-      fill_in snippet_title_field, with: title
-      click_button('Create snippet')
-      wait_for_requests
+    expect(page).not_to have_button('Create snippet')
 
-      expect(page).to have_selector('#error_explanation')
-    end
+    snippet_fill_in_form(title: title, content: file_content)
+    expect(page).to have_button('Create snippet')
   end
 end