1 files changed, 49 insertions, 79 deletions
diff --git a/spec/features/snippets/user_edits_snippet_spec.rb b/spec/features/snippets/user_edits_snippet_spec.rb
index 9a83eb58b63..a04c59b53d2 100644
--- a/spec/features/snippets/user_edits_snippet_spec.rb
+++ b/spec/features/snippets/user_edits_snippet_spec.rb
@@ -11,107 +11,77 @@ RSpec.describe 'User edits snippet', :js do
   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) }
 
-  let(:snippet_title_field) { 'personal_snippet_title' }
+  before do
+    sign_in(user)
 
-  shared_examples 'snippet editing' do
-    it 'displays the snippet blob path and content' do
-      blob = snippet.blobs.first
-
-      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 'updates the snippet' do
-      fill_in snippet_title_field, with: 'New Snippet Title'
-
-      click_button('Save changes')
-      wait_for_requests
-
-      expect(page).to have_content('New Snippet Title')
-    end
-
-    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')
+    visit edit_snippet_path(snippet)
+    wait_for_all_requests
+  end
 
-      click_button('Save changes')
-      wait_for_requests
+  it 'displays the snippet blob path and content' do
+    blob = snippet.blobs.first
 
-      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})
+    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 'updates the snippet to make it internal' do
-      choose 'Internal'
-
-      click_button 'Save changes'
-      wait_for_requests
+  it 'updates the snippet' do
+    snippet_fill_in_title('New Snippet Title')
+    expect(page).not_to have_selector('.gl-spinner')
 
-      expect(page).to have_no_selector('[data-testid="lock-icon"]')
-      expect(page).to have_selector('[data-testid="shield-icon"]')
-    end
+    click_button('Save changes')
+    wait_for_requests
 
-    it 'updates the snippet to make it public' do
-      choose 'Public'
+    expect(page).to have_content('New Snippet Title')
+  end
 
-      click_button 'Save changes'
-      wait_for_requests
+  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')
 
-      expect(page).to have_no_selector('[data-testid="lock-icon"]')
-      expect(page).to have_selector('[data-testid="earth-icon"]')
-    end
+    click_button('Save changes')
+    wait_for_requests
 
-    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
+    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
 
-        fill_in snippet_title_field, with: 'New Snippet Title'
-        fill_in snippet_blob_path_field, with: 'new_file_name', match: :first
+  it 'updates the snippet to make it internal' do
+    snippet_fill_in_visibility('Internal')
 
-        click_button('Save changes')
-      end
+    click_button 'Save changes'
+    wait_for_requests
 
-      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
+    expect(page).to have_no_selector('[data-testid="lock-icon"]')
+    expect(page).to have_selector('[data-testid="shield-icon"]')
   end
 
-  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' }
+  it 'updates the snippet to make it public' do
+    snippet_fill_in_visibility('Public')
 
-      before do
-        sign_in(user)
+    click_button 'Save changes'
+    wait_for_requests
 
-        visit edit_snippet_path(snippet)
-        wait_for_all_requests
-      end
-    end
+    expect(page).to have_no_selector('[data-testid="lock-icon"]')
+    expect(page).to have_selector('[data-testid="earth-icon"]')
   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' }
+  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
 
-      before do
-        stub_feature_flags(snippets_vue: false)
-        stub_feature_flags(snippets_edit_vue: false)
+      snippet_fill_in_form(title: 'New Snippet Title', file_name: 'new_file_name')
 
-        sign_in(user)
+      click_button('Save changes')
+    end
 
-        visit edit_snippet_path(snippet)
-        wait_for_all_requests
-      end
+    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