1 files changed, 79 insertions, 52 deletions
diff --git a/spec/features/snippets/user_edits_snippet_spec.rb b/spec/features/snippets/user_edits_snippet_spec.rb
index 5773904dedf..9a83eb58b63 100644
--- a/spec/features/snippets/user_edits_snippet_spec.rb
+++ b/spec/features/snippets/user_edits_snippet_spec.rb
@@ -4,87 +4,114 @@ require 'spec_helper'
 
 RSpec.describe 'User edits snippet', :js do
   include DropzoneHelper
+  include Spec::Support::Helpers::Features::SnippetSpecHelpers
 
   let_it_be(:file_name) { 'test.rb' }
   let_it_be(:content) { 'puts "test"' }
   let_it_be(:user) { create(:user) }
   let_it_be(:snippet, reload: true) { create(:personal_snippet, :repository, :public, file_name: file_name, content: content, author: user) }
 
-  before do
-    stub_feature_flags(snippets_vue: false)
-    stub_feature_flags(snippets_edit_vue: false)
+  let(:snippet_title_field) { 'personal_snippet_title' }
 
-    sign_in(user)
+  shared_examples 'snippet editing' do
+    it 'displays the snippet blob path and content' do
+      blob = snippet.blobs.first
 
-    visit edit_snippet_path(snippet)
-    wait_for_all_requests
-  end
+      aggregate_failures do
+        expect(snippet_get_first_blob_path).to eq blob.path
+        expect(snippet_get_first_blob_value).to have_content(blob.data.strip)
+      end
+    end
 
-  it 'displays the snippet blob path and content' do
-    blob = snippet.blobs.first
+    it 'updates the snippet' do
+      fill_in snippet_title_field, with: 'New Snippet Title'
 
-    aggregate_failures do
-      expect(page.find_field('personal_snippet_file_name').value).to eq blob.path
-      expect(page.find('.file-content')).to have_content(blob.data.strip)
-      expect(page.find('.snippet-file-content', visible: false).value).to eq blob.data
+      click_button('Save changes')
+      wait_for_requests
+
+      expect(page).to have_content('New Snippet Title')
     end
-  end
 
-  it 'updates the snippet' do
-    fill_in 'personal_snippet_title', with: 'New Snippet Title'
+    it 'updates the snippet with files attached' do
+      dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
+      expect(snippet_description_value).to have_content('banana_sample')
 
-    click_button('Save changes')
-    wait_for_requests
+      click_button('Save changes')
+      wait_for_requests
 
-    expect(page).to have_content('New Snippet Title')
-  end
+      link = find('a.no-attachment-icon img:not(.lazy)[alt="banana_sample"]')['src']
+      expect(link).to match(%r{/uploads/-/system/personal_snippet/#{snippet.id}/\h{32}/banana_sample\.gif\z})
+    end
 
-  it 'updates the snippet with files attached' do
-    dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
-    expect(page.find_field('personal_snippet_description').value).to have_content('banana_sample')
+    it 'updates the snippet to make it internal' do
+      choose 'Internal'
 
-    click_button('Save changes')
-    wait_for_requests
+      click_button 'Save changes'
+      wait_for_requests
 
-    link = find('a.no-attachment-icon img:not(.lazy)[alt="banana_sample"]')['src']
-    expect(link).to match(%r{/uploads/-/system/personal_snippet/#{snippet.id}/\h{32}/banana_sample\.gif\z})
-  end
+      expect(page).to have_no_selector('[data-testid="lock-icon"]')
+      expect(page).to have_selector('[data-testid="shield-icon"]')
+    end
 
-  it 'updates the snippet to make it internal' do
-    choose 'Internal'
+    it 'updates the snippet to make it public' do
+      choose 'Public'
 
-    click_button 'Save changes'
-    wait_for_requests
+      click_button 'Save changes'
+      wait_for_requests
 
-    expect(page).to have_no_selector('[data-testid="lock-icon"]')
-    expect(page).to have_selector('[data-testid="shield-icon"]')
-  end
+      expect(page).to have_no_selector('[data-testid="lock-icon"]')
+      expect(page).to have_selector('[data-testid="earth-icon"]')
+    end
 
-  it 'updates the snippet to make it public' do
-    choose 'Public'
+    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, 'Error Message')
+        end
 
-    click_button 'Save changes'
-    wait_for_requests
+        fill_in snippet_title_field, with: 'New Snippet Title'
+        fill_in snippet_blob_path_field, with: 'new_file_name', match: :first
 
-    expect(page).to have_no_selector('[data-testid="lock-icon"]')
-    expect(page).to have_selector('[data-testid="earth-icon"]')
-  end
+        click_button('Save changes')
+      end
 
-  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, 'Error Message')
+      it 'renders edit page and displays the error' do
+        expect(page.find('.flash-container')).to have_content('Error updating the snippet - Error Message')
+        expect(page).to have_content('Edit Snippet')
       end
+    end
+  end
 
-      fill_in 'personal_snippet_title', with: 'New Snippet Title'
-      fill_in 'personal_snippet_file_name', with: 'new_file_name'
+  context 'Vue application' do
+    it_behaves_like 'snippet editing' do
+      let(:snippet_blob_path_field) { 'snippet_file_name' }
+      let(:snippet_blob_content_selector) { '.file-content' }
+      let(:snippet_description_field) { 'snippet-description' }
 
-      click_button('Save changes')
+      before do
+        sign_in(user)
+
+        visit edit_snippet_path(snippet)
+        wait_for_all_requests
+      end
     end
+  end
+
+  context 'non-Vue application' do
+    it_behaves_like 'snippet editing' do
+      let(:snippet_blob_path_field) { 'personal_snippet_file_name' }
+      let(:snippet_blob_content_selector) { '.file-content' }
+      let(:snippet_description_field) { 'personal_snippet_description' }
 
-    it 'renders edit page and displays the error' do
-      expect(page.find('.flash-container span').text).to eq('Error updating the snippet - Error Message')
-      expect(page).to have_content('Edit Snippet')
+      before do
+        stub_feature_flags(snippets_vue: false)
+        stub_feature_flags(snippets_edit_vue: false)
+
+        sign_in(user)
+
+        visit edit_snippet_path(snippet)
+        wait_for_all_requests
+      end
     end
   end
 end