1 files changed, 52 insertions, 28 deletions

diff --git a/spec/features/projects/snippets/user_updates_snippet_spec.rb b/spec/features/projects/snippets/user_updates_snippet_spec.rb
index a40113bd93e..193eaa9576a 100644
--- a/spec/features/projects/snippets/user_updates_snippet_spec.rb
+++ b/spec/features/projects/snippets/user_updates_snippet_spec.rb
@@ -3,57 +3,81 @@
 require 'spec_helper'
 
 RSpec.describe 'Projects > Snippets > User updates a snippet', :js do
+  include Spec::Support::Helpers::Features::SnippetSpecHelpers
+
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, namespace: user.namespace) }
   let_it_be(:snippet, reload: true) { create(:project_snippet, :repository, project: project, author: user) }
 
-  before do
-    stub_feature_flags(snippets_vue: false)
-    stub_feature_flags(snippets_edit_vue: false)
+  let(:snippet_title_field) { 'project_snippet_title' }
 
+  def bootstrap_snippet
     project.add_maintainer(user)
     sign_in(user)
 
-    visit(project_snippet_path(project, snippet))
+    page.visit(edit_project_snippet_path(project, snippet))
 
-    page.within('.detail-page-header') do
-      first(:link, 'Edit').click
-    end
     wait_for_all_requests
   end
 
-  it 'displays the snippet blob path and content' do
-    blob = snippet.blobs.first
+  shared_examples 'snippet update' do
+    it 'displays the snippet blob path and content' do
+      blob = snippet.blobs.first
 
-    aggregate_failures do
-      expect(page.find_field('project_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
+      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
-  end
 
-  it 'updates a snippet' do
-    fill_in('project_snippet_title', with: 'Snippet new title')
-    click_button('Save')
+    it 'updates a snippet' do
+      fill_in('project_snippet_title', with: 'Snippet new title')
+      click_button('Save')
+
+      expect(page).to have_content('Snippet new title')
+    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')
+        end
+
+        fill_in(snippet_title_field, with: 'Snippet new title')
+        fill_in(snippet_blob_path_field, match: :first, with: 'new_file_name')
+
+        click_button('Save')
+      end
 
-    expect(page).to have_content('Snippet new title')
+      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
 
-  context 'when the git operation fails' do
+  context 'Vue application' do
     before do
-      allow_next_instance_of(Snippets::UpdateService) do |instance|
-        allow(instance).to receive(:create_commit).and_raise(StandardError, 'Error Message')
-      end
+      bootstrap_snippet
+    end
 
-      fill_in('project_snippet_title', with: 'Snippet new title')
-      fill_in('project_snippet_file_name', with: 'new_file_name')
+    it_behaves_like 'snippet update' do
+      let(:snippet_blob_path_field) { 'snippet_file_name' }
+      let(:snippet_blob_content_selector) { '.file-content' }
+    end
+  end
 
-      click_button('Save')
+  context 'non-Vue application' do
+    before do
+      stub_feature_flags(snippets_vue: false)
+      stub_feature_flags(snippets_edit_vue: false)
+
+      bootstrap_snippet
     end
 
-    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')
+    it_behaves_like 'snippet update' do
+      let(:snippet_blob_path_field) { 'project_snippet_file_name' }
+      let(:snippet_blob_content_selector) { '.file-content' }
     end
   end
 end