Add latest changes from gitlab-org/gitlab@master

3 files changed, 132 insertions, 217 deletions

diff --git a/spec/features/snippets/spam_snippets_spec.rb b/spec/features/snippets/spam_snippets_spec.rb
index 1483ba4bf8f..54a56ac962c 100644
--- a/spec/features/snippets/spam_snippets_spec.rb
+++ b/spec/features/snippets/spam_snippets_spec.rb
@@ -2,9 +2,11 @@
 
 require 'spec_helper'
 
-RSpec.shared_examples_for 'snippet editor' do
+RSpec.describe 'snippet editor with spam', skip: "Will be handled in https://gitlab.com/gitlab-org/gitlab/-/issues/217722" do
   include_context 'includes Spam constants'
 
+  let_it_be(:user) { create(:user) }
+
   def description_field
     find('.js-description-input').find('input,textarea')
   end
@@ -119,24 +121,3 @@ RSpec.shared_examples_for 'snippet editor' do
     end
   end
 end
-
-RSpec.describe 'User creates snippet', :js do
-  let_it_be(:user) { create(:user) }
-
-  context 'Vue application' do
-    before do
-      stub_feature_flags(snippets_edit_vue: false)
-    end
-
-    it_behaves_like "snippet editor"
-  end
-
-  context 'non-Vue application' do
-    before do
-      stub_feature_flags(snippets_vue: false)
-      stub_feature_flags(snippets_edit_vue: false)
-    end
-
-    it_behaves_like "snippet editor"
-  end
-end
diff --git a/spec/features/snippets/user_creates_snippet_spec.rb b/spec/features/snippets/user_creates_snippet_spec.rb
index eabca028b8c..1e51210c2b8 100644
--- a/spec/features/snippets/user_creates_snippet_spec.rb
+++ b/spec/features/snippets/user_creates_snippet_spec.rb
@@ -13,163 +13,127 @@ RSpec.describe 'User creates snippet', :js do
   let(:md_description) { 'My Snippet **Description**' }
   let(:description) { 'My Snippet Description' }
   let(:created_snippet) { Snippet.last }
-  let(:snippet_title_field) { 'personal_snippet_title' }
+  let(:snippet_title_field) { 'snippet-title' }
 
-  def description_field
-    find('.js-description-input').find('input,textarea')
+  before do
+    sign_in(user)
+
+    visit new_snippet_path
   end
 
-  shared_examples 'snippet creation' do
-    def fill_form
-      snippet_fill_in_form(title: title, content: file_content, description: md_description)
-    end
+  def fill_form
+    snippet_fill_in_form(title: title, content: file_content, description: md_description)
+  end
 
-    it 'Authenticated user creates a snippet' do
-      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_description_view_selector) do
-        expect(page).to have_content(description)
-        expect(page).to have_selector('strong')
-      end
-      expect(page).to have_content(file_content)
+    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
 
-    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')
-
-      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/personal_snippet/#{Snippet.last.id}/\h{32}/banana_sample\.gif\z})
+  it 'uploads a file when dragging into textarea' do
+    fill_form
+    dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
 
-      reqs = inspect_requests { visit("#{link}?ran=#{SecureRandom.base64(20)}") }
-      expect(reqs.first.status_code).to eq(200)
-    end
+    expect(snippet_description_value).to have_content('banana_sample')
 
-    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)
-        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})
 
-        fill_form
-        click_button('Create snippet')
-        wait_for_requests
-      end
+    reqs = inspect_requests { visit("#{link}?ran=#{SecureRandom.base64(20)}") }
+    expect(reqs.first.status_code).to eq(200)
+  end
 
-      it 'renders the new page and displays the error' do
-        expect(page).to have_content(error)
-        expect(page).to have_content('New Snippet')
+  context 'when the git operation fails' do
+    let(:error) { 'Error creating the snippet' }
 
-        action = find('form.snippet-form')['action']
-        expect(action).to include("/snippets")
-      end
-    end
-
-    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)
+    before do
+      allow_next_instance_of(Snippets::CreateService) do |instance|
+        allow(instance).to receive(:create_commit).and_raise(StandardError, error)
       end
 
-      it 'creates a snippet using the lowest available visibility level as default' do
-        visit new_snippet_path
-
-        fill_form
-
-        click_button('Create snippet')
-        wait_for_requests
-
-        expect(find('.blob-content')).to have_content(file_content)
-        expect(Snippet.last.visibility_level).to eq(Gitlab::VisibilityLevel::INTERNAL)
-      end
+      fill_form
+      click_button('Create snippet')
+      wait_for_requests
     end
 
-    it_behaves_like 'personal snippet with references' do
-      let(:container) { snippet_description_view_selector }
-      let(:md_description) { references }
+    it 'renders the new page and displays the error' do
+      expect(page).to have_content(error)
+      expect(page).to have_content('New Snippet')
 
-      subject do
-        fill_form
-        click_button('Create snippet')
-
-        wait_for_requests
-      end
+      action = find('form.snippet-form')['action']
+      expect(action).to include("/snippets")
     end
   end
 
-  context 'Vue application' do
-    let(:snippet_description_field) { 'snippet-description' }
-    let(:snippet_description_view_selector) { '.snippet-header .snippet-description' }
-
+  context 'when snippets default visibility level is restricted' do
     before do
-      sign_in(user)
-
-      visit new_snippet_path
+      stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PRIVATE],
+                                default_snippet_visibility: Gitlab::VisibilityLevel::PRIVATE)
     end
 
-    it_behaves_like 'snippet creation'
+    it 'creates a snippet using the lowest available visibility level as default' do
+      visit new_snippet_path
 
-    it 'validation fails for the first time' do
-      fill_in snippet_title_field, with: title
+      fill_form
 
-      expect(page).not_to have_button('Create snippet')
+      click_button('Create snippet')
+      wait_for_requests
 
-      snippet_fill_in_form(title: title, content: file_content)
-      expect(page).to have_button('Create snippet')
+      expect(find('.blob-content')).to have_content(file_content)
+      expect(Snippet.last.visibility_level).to eq(Gitlab::VisibilityLevel::INTERNAL)
     end
   end
 
-  context 'non-Vue application' do
-    let(:snippet_description_field) { 'personal_snippet_description' }
-    let(:snippet_description_view_selector) { '.snippet-header .description' }
+  it_behaves_like 'personal snippet with references' do
+    let(:container) { snippet_description_view_selector }
+    let(:md_description) { references }
 
-    before do
-      stub_feature_flags(snippets_vue: false)
-      stub_feature_flags(snippets_edit_vue: false)
-
-      sign_in(user)
+    subject do
+      fill_form
+      click_button('Create snippet')
 
-      visit new_snippet_path
+      wait_for_requests
     end
+  end
 
-    it_behaves_like 'snippet creation'
+  it 'validation fails for the first time' do
+    fill_in snippet_title_field, with: title
 
-    it 'validation fails for the first time' do
-      fill_in snippet_title_field, with: title
-      click_button('Create snippet')
+    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
 
-    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
+  it 'previews a snippet with file' do
+    # Click placeholder first to expand full description field
+    snippet_fill_in_description('My Snippet')
+    dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
+    find('.js-md-preview-button').click
 
-      page.within('.md-preview-holder') do
-        expect(page).to have_content('My Snippet')
+    page.within('.md-preview-holder') do
+      expect(page).to have_content('My Snippet')
 
-        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})
+      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
+      # 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.
+      # accept_confirm is needed because of https://gitlab.com/gitlab-org/gitlab/-/issues/262102
+      reqs = inspect_requests { accept_confirm { visit("#{link}?ran=#{SecureRandom.base64(20)}") } }
+      expect(reqs.first.status_code).to eq(200)
     end
   end
 end
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