1 files changed, 106 insertions, 91 deletions
diff --git a/spec/features/snippets/user_creates_snippet_spec.rb b/spec/features/snippets/user_creates_snippet_spec.rb
index f4c6536d6d3..eabca028b8c 100644
--- a/spec/features/snippets/user_creates_snippet_spec.rb
+++ b/spec/features/snippets/user_creates_snippet_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe 'User creates snippet', :js do
   include DropzoneHelper
+  include Spec::Support::Helpers::Features::SnippetSpecHelpers
 
   let_it_be(:user) { create(:user) }
 
@@ -12,149 +13,163 @@ RSpec.describe 'User creates snippet', :js do
   let(:md_description) { 'My Snippet **Description**' }
   let(:description) { 'My Snippet Description' }
   let(:created_snippet) { Snippet.last }
-
-  before do
-    stub_feature_flags(snippets_vue: false)
-    stub_feature_flags(snippets_edit_vue: false)
-    sign_in(user)
-  end
+  let(:snippet_title_field) { 'personal_snippet_title' }
 
   def description_field
     find('.js-description-input').find('input,textarea')
   end
 
-  def fill_form
-    fill_in 'personal_snippet_title', with: title
-
-    # Click placeholder first to expand full description field
-    description_field.click
-    fill_in 'personal_snippet_description', with: md_description
-
-    page.within('.file-editor') do
-      el = find('.inputarea')
-      el.send_keys file_content
+  shared_examples 'snippet creation' do
+    def fill_form
+      snippet_fill_in_form(title: title, content: file_content, description: md_description)
     end
-  end
-
-  it 'Authenticated user creates a snippet' do
-    visit new_snippet_path
 
-    fill_form
+    it 'Authenticated user creates a snippet' do
+      fill_form
 
-    click_button('Create snippet')
-    wait_for_requests
+      click_button('Create snippet')
+      wait_for_requests
 
-    expect(page).to have_content(title)
-    page.within('.snippet-header .description') do
-      expect(page).to have_content(description)
-      expect(page).to have_selector('strong')
+      expect(page).to have_content(title)
+      page.within(snippet_description_view_selector) do
+        expect(page).to have_content(description)
+        expect(page).to have_selector('strong')
+      end
+      expect(page).to have_content(file_content)
     end
-    expect(page).to have_content(file_content)
-  end
 
-  it 'previews a snippet with file' do
-    visit new_snippet_path
+    it 'uploads a file when dragging into textarea' do
+      fill_form
+      dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
 
-    # Click placeholder first to expand full description field
-    description_field.click
-    fill_in 'personal_snippet_description', with: 'My Snippet'
-    dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
-    find('.js-md-preview-button').click
+      expect(snippet_description_value).to have_content('banana_sample')
 
-    page.within('#new_personal_snippet .md-preview-holder') do
-      expect(page).to have_content('My Snippet')
+      click_button('Create snippet')
+      wait_for_requests
 
       link = find('a.no-attachment-icon img.js-lazy-loaded[alt="banana_sample"]')['src']
-      expect(link).to match(%r{/uploads/-/system/user/#{user.id}/\h{32}/banana_sample\.gif\z})
+      expect(link).to match(%r{/uploads/-/system/personal_snippet/#{Snippet.last.id}/\h{32}/banana_sample\.gif\z})
 
-      # Adds a cache buster for checking if the image exists as Selenium is now handling the cached requests
-      # not anymore as requests when they come straight from memory cache.
       reqs = inspect_requests { visit("#{link}?ran=#{SecureRandom.base64(20)}") }
       expect(reqs.first.status_code).to eq(200)
     end
-  end
 
-  it 'uploads a file when dragging into textarea' do
-    visit new_snippet_path
+    context 'when the git operation fails' do
+      let(:error) { 'Error creating the snippet' }
 
-    fill_form
+      before do
+        allow_next_instance_of(Snippets::CreateService) do |instance|
+          allow(instance).to receive(:create_commit).and_raise(StandardError, error)
+        end
 
-    dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
+        fill_form
+        click_button('Create snippet')
+        wait_for_requests
+      end
+
+      it 'renders the new page and displays the error' do
+        expect(page).to have_content(error)
+        expect(page).to have_content('New Snippet')
 
-    expect(page.find_field("personal_snippet_description").value).to have_content('banana_sample')
+        action = find('form.snippet-form')['action']
+        expect(action).to include("/snippets")
+      end
+    end
 
-    click_button('Create snippet')
-    wait_for_requests
+    context 'when snippets default visibility level is restricted' do
+      before do
+        stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PRIVATE],
+                                 default_snippet_visibility: Gitlab::VisibilityLevel::PRIVATE)
+      end
 
-    link = find('a.no-attachment-icon img.js-lazy-loaded[alt="banana_sample"]')['src']
-    expect(link).to match(%r{/uploads/-/system/personal_snippet/#{Snippet.last.id}/\h{32}/banana_sample\.gif\z})
+      it 'creates a snippet using the lowest available visibility level as default' do
+        visit new_snippet_path
 
-    reqs = inspect_requests { visit("#{link}?ran=#{SecureRandom.base64(20)}") }
-    expect(reqs.first.status_code).to eq(200)
-  end
+        fill_form
 
-  context 'when the git operation fails' do
-    let(:error) { 'Error creating the snippet' }
+        click_button('Create snippet')
+        wait_for_requests
 
-    before do
-      allow_next_instance_of(Snippets::CreateService) do |instance|
-        allow(instance).to receive(:create_commit).and_raise(StandardError, error)
+        expect(find('.blob-content')).to have_content(file_content)
+        expect(Snippet.last.visibility_level).to eq(Gitlab::VisibilityLevel::INTERNAL)
       end
+    end
 
-      visit new_snippet_path
+    it_behaves_like 'personal snippet with references' do
+      let(:container) { snippet_description_view_selector }
+      let(:md_description) { references }
 
-      fill_form
+      subject do
+        fill_form
+        click_button('Create snippet')
 
-      click_button('Create snippet')
-      wait_for_requests
+        wait_for_requests
+      end
     end
+  end
+
+  context 'Vue application' do
+    let(:snippet_description_field) { 'snippet-description' }
+    let(:snippet_description_view_selector) { '.snippet-header .snippet-description' }
 
-    it 'renders the new page and displays the error' do
-      expect(page).to have_content(error)
-      expect(page).to have_content('New Snippet')
+    before do
+      sign_in(user)
 
-      action = find('form.snippet-form')['action']
-      expect(action).to match(%r{/snippets\z})
+      visit new_snippet_path
     end
-  end
 
-  it 'validation fails for the first time' do
-    visit new_snippet_path
+    it_behaves_like 'snippet creation'
 
-    fill_in 'personal_snippet_title', with: title
-    click_button('Create snippet')
+    it 'validation fails for the first time' do
+      fill_in snippet_title_field, with: title
 
-    expect(page).to have_selector('#error_explanation')
+      expect(page).not_to have_button('Create snippet')
+
+      snippet_fill_in_form(title: title, content: file_content)
+      expect(page).to have_button('Create snippet')
+    end
   end
 
-  context 'when snippets default visibility level is restricted' do
+  context 'non-Vue application' do
+    let(:snippet_description_field) { 'personal_snippet_description' }
+    let(:snippet_description_view_selector) { '.snippet-header .description' }
+
     before do
-      stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PRIVATE],
-                              default_snippet_visibility: Gitlab::VisibilityLevel::PRIVATE)
-    end
+      stub_feature_flags(snippets_vue: false)
+      stub_feature_flags(snippets_edit_vue: false)
+
+      sign_in(user)
 
-    it 'creates a snippet using the lowest available visibility level as default' do
       visit new_snippet_path
+    end
 
-      fill_form
+    it_behaves_like 'snippet creation'
 
+    it 'validation fails for the first time' do
+      fill_in snippet_title_field, with: title
       click_button('Create snippet')
-      wait_for_requests
 
-      expect(created_snippet.visibility_level).to eq(Gitlab::VisibilityLevel::INTERNAL)
+      expect(page).to have_selector('#error_explanation')
     end
-  end
 
-  it_behaves_like 'personal snippet with references' do
-    let(:container) { '.snippet-header .description' }
-    let(:md_description) { references }
+    it 'previews a snippet with file' do
+      # Click placeholder first to expand full description field
+      description_field.click
+      fill_in snippet_description_field, with: 'My Snippet'
+      dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
+      find('.js-md-preview-button').click
 
-    subject do
-      visit new_snippet_path
-      fill_form
-      click_button('Create snippet')
+      page.within('.md-preview-holder') do
+        expect(page).to have_content('My Snippet')
 
-      wait_for_requests
+        link = find('a.no-attachment-icon img.js-lazy-loaded[alt="banana_sample"]')['src']
+        expect(link).to match(%r{/uploads/-/system/user/#{user.id}/\h{32}/banana_sample\.gif\z})
+
+        # Adds a cache buster for checking if the image exists as Selenium is now handling the cached requests
+        # not anymore as requests when they come straight from memory cache.
+        reqs = inspect_requests { visit("#{link}?ran=#{SecureRandom.base64(20)}") }
+        expect(reqs.first.status_code).to eq(200)
+      end
     end
   end
 end