Add latest changes from gitlab-org/gitlab@13-3-stable-ee

2 files changed, 86 insertions, 239 deletions

diff --git a/spec/features/projects/snippets/create_snippet_spec.rb b/spec/features/projects/snippets/create_snippet_spec.rb
index 73d033cbdb8..3db870f229a 100644
--- a/spec/features/projects/snippets/create_snippet_spec.rb
+++ b/spec/features/projects/snippets/create_snippet_spec.rb
@@ -2,9 +2,28 @@
 
 require 'spec_helper'
 
-RSpec.shared_examples_for 'snippet editor' do
+RSpec.describe 'Projects > Snippets > Create Snippet', :js do
+  include DropzoneHelper
+
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) do
+    create(:project, :public, creator: user).tap do |p|
+      p.add_maintainer(user)
+    end
+  end
+
+  let(:title) { 'My Snippet Title' }
+  let(:file_content) { 'Hello World!' }
+  let(:md_description) { 'My Snippet **Description**' }
+  let(:description) { 'My Snippet Description' }
+
   before do
+    stub_feature_flags(snippets_vue: false)
     stub_feature_flags(snippets_edit_vue: false)
+
+    sign_in(user)
+
+    visit new_project_snippet_path(project)
   end
 
   def description_field
@@ -12,137 +31,81 @@ RSpec.shared_examples_for 'snippet editor' do
   end
 
   def fill_form
-    fill_in 'project_snippet_title', with: 'My Snippet Title'
+    fill_in 'project_snippet_title', with: title
 
     # Click placeholder first to expand full description field
     description_field.click
-    fill_in 'project_snippet_description', with: 'My Snippet **Description**'
+    fill_in 'project_snippet_description', with: md_description
 
     page.within('.file-editor') do
       el = find('.inputarea')
-      el.send_keys 'Hello World!'
+      el.send_keys file_content
     end
   end
 
-  context 'when a user is authenticated' do
-    before do
-      stub_feature_flags(snippets_vue: false)
-      project.add_maintainer(user)
-      sign_in(user)
+  it 'shows collapsible description input' do
+    collapsed = description_field
 
-      visit project_snippets_path(project)
-
-      # Wait for the SVG to ensure the button location doesn't shift
-      within('.empty-state') { find('img.js-lazy-loaded') }
-      click_on('New snippet')
-      wait_for_requests
-    end
+    expect(page).not_to have_field('project_snippet_description')
+    expect(collapsed).to be_visible
 
-    it 'shows collapsible description input' do
-      collapsed = description_field
+    collapsed.click
 
-      expect(page).not_to have_field('project_snippet_description')
-      expect(collapsed).to be_visible
+    expect(page).to have_field('project_snippet_description')
+    expect(collapsed).not_to be_visible
+  end
 
-      collapsed.click
+  it 'creates a new snippet' do
+    fill_form
+    click_button('Create snippet')
+    wait_for_requests
 
-      expect(page).to have_field('project_snippet_description')
-      expect(collapsed).not_to be_visible
+    expect(page).to have_content(title)
+    expect(page).to have_content(file_content)
+    page.within('.snippet-header .description') do
+      expect(page).to have_content(description)
+      expect(page).to have_selector('strong')
     end
+  end
 
-    it 'creates a new snippet' do
-      fill_form
-      click_button('Create snippet')
-      wait_for_requests
+  it 'uploads a file when dragging into textarea' do
+    fill_form
+    dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
 
-      expect(page).to have_content('My Snippet Title')
-      expect(page).to have_content('Hello World!')
-      page.within('.snippet-header .description') do
-        expect(page).to have_content('My Snippet Description')
-        expect(page).to have_selector('strong')
-      end
-    end
+    expect(page.find_field('project_snippet_description').value).to have_content('banana_sample')
 
-    it 'uploads a file when dragging into textarea' do
-      fill_form
-      dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
+    click_button('Create snippet')
+    wait_for_requests
 
-      expect(page.find_field("project_snippet_description").value).to have_content('banana_sample')
+    link = find('a.no-attachment-icon img[alt="banana_sample"]')['src']
+    expect(link).to match(%r{/#{Regexp.escape(project.full_path)}/uploads/\h{32}/banana_sample\.gif\z})
+  end
 
-      click_button('Create snippet')
-      wait_for_requests
+  it 'displays validation errors' do
+    fill_in 'project_snippet_title', with: title
+    click_button('Create snippet')
+    wait_for_requests
 
-      link = find('a.no-attachment-icon img[alt="banana_sample"]')['src']
-      expect(link).to match(%r{/#{Regexp.escape(project.full_path)}/uploads/\h{32}/banana_sample\.gif\z})
-    end
+    expect(page).to have_selector('#error_explanation')
+  end
 
-    it 'creates a snippet when all required fields are filled in after validation failing' do
-      fill_in 'project_snippet_title', with: 'My Snippet Title'
-      click_button('Create snippet')
+  context 'when the git operation fails' do
+    let(:error) { 'Error creating the snippet' }
 
-      expect(page).to have_selector('#error_explanation')
+    before do
+      allow_next_instance_of(Snippets::CreateService) do |instance|
+        allow(instance).to receive(:create_commit).and_raise(StandardError, error)
+      end
 
       fill_form
-      dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
 
-      find("input[value='Create snippet']").send_keys(:return)
+      click_button('Create snippet')
       wait_for_requests
-
-      expect(page).to have_content('My Snippet Title')
-      expect(page).to have_content('Hello World!')
-      page.within('.snippet-header .description') do
-        expect(page).to have_content('My Snippet Description')
-        expect(page).to have_selector('strong')
-      end
-      link = find('a.no-attachment-icon img[alt="banana_sample"]')['src']
-      expect(link).to match(%r{/#{Regexp.escape(project.full_path)}/uploads/\h{32}/banana_sample\.gif\z})
-    end
-
-    context 'when the git operation fails' do
-      let(:error) { 'Error creating the snippet' }
-
-      before do
-        allow_next_instance_of(Snippets::CreateService) do |instance|
-          allow(instance).to receive(:create_commit).and_raise(StandardError, error)
-        end
-
-        fill_form
-
-        click_button('Create snippet')
-        wait_for_requests
-      end
-
-      it 'displays the error' do
-        expect(page).to have_content(error)
-      end
-
-      it 'renders new page' do
-        expect(page).to have_content('New Snippet')
-      end
     end
-  end
-
-  context 'when a user is not authenticated' do
-    before do
-      stub_feature_flags(snippets_vue: false)
-    end
-
-    it 'shows a public snippet on the index page but not the New snippet button' do
-      snippet = create(:project_snippet, :public, :repository, project: project)
-
-      visit project_snippets_path(project)
 
-      expect(page).to have_content(snippet.title)
-      expect(page).not_to have_content('New snippet')
+    it 'renders the new page and displays the error' do
+      expect(page).to have_content(error)
+      expect(page).to have_content('New Snippet')
     end
   end
 end
-
-RSpec.describe 'Projects > Snippets > Create Snippet', :js do
-  include DropzoneHelper
-
-  let_it_be(:user) { create(:user) }
-  let_it_be(:project) { create(:project, :public) }
-
-  it_behaves_like "snippet editor"
-end
diff --git a/spec/features/projects/snippets/show_spec.rb b/spec/features/projects/snippets/show_spec.rb
index 0f6429d49f6..8fded3cde80 100644
--- a/spec/features/projects/snippets/show_spec.rb
+++ b/spec/features/projects/snippets/show_spec.rb
@@ -3,157 +3,41 @@
 require 'spec_helper'
 
 RSpec.describe 'Projects > Snippets > Project snippet', :js do
-  let(:user) { create(:user) }
-  let(:project) { create(:project, :repository) }
-  let(:snippet) { create(:project_snippet, project: project, file_name: file_name, content: content) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) do
+    create(:project, creator: user).tap do |p|
+      p.add_maintainer(user)
+    end
+  end
+
+  let_it_be(:snippet) { create(:project_snippet, :repository, project: project, author: user) }
 
   before do
     stub_feature_flags(snippets_vue: false)
-    project.add_maintainer(user)
+
     sign_in(user)
   end
 
-  context 'Ruby file' do
-    let(:file_name) { 'popen.rb' }
-    let(:content) { project.repository.blob_at('master', 'files/ruby/popen.rb').data }
+  it_behaves_like 'show and render proper snippet blob' do
+    let(:anchor) { nil }
 
-    before do
-      visit project_snippet_path(project, snippet)
+    subject do
+      visit project_snippet_path(project, snippet, anchor: anchor)
 
       wait_for_requests
     end
-
-    it 'displays the blob' do
-      aggregate_failures do
-        # shows highlighted Ruby code
-        expect(page).to have_content("require 'fileutils'")
-
-        # does not show a viewer switcher
-        expect(page).not_to have_selector('.js-blob-viewer-switcher')
-
-        # shows an enabled copy button
-        expect(page).to have_selector('.js-copy-blob-source-btn:not(.disabled)')
-
-        # shows a raw button
-        expect(page).to have_link('Open raw')
-
-        # shows a download button
-        expect(page).to have_link('Download')
-      end
-    end
   end
 
-  context 'Markdown file' do
-    let(:file_name) { 'ruby-style-guide.md' }
-    let(:content) { project.repository.blob_at('master', 'files/markdown/ruby-style-guide.md').data }
-
-    context 'visiting directly' do
-      before do
-        visit project_snippet_path(project, snippet)
-
-        wait_for_requests
-      end
-
-      it 'displays the blob using the rich viewer' do
-        aggregate_failures do
-          # hides the simple viewer
-          expect(page).to have_selector('.blob-viewer[data-type="simple"]', visible: false)
-          expect(page).to have_selector('.blob-viewer[data-type="rich"]')
-
-          # shows rendered Markdown
-          expect(page).to have_link("PEP-8")
-
-          # shows a viewer switcher
-          expect(page).to have_selector('.js-blob-viewer-switcher')
-
-          # shows a disabled copy button
-          expect(page).to have_selector('.js-copy-blob-source-btn.disabled')
-
-          # shows a raw button
-          expect(page).to have_link('Open raw')
-
-          # shows a download button
-          expect(page).to have_link('Download')
-        end
-      end
-
-      context 'switching to the simple viewer' do
-        before do
-          find('.js-blob-viewer-switch-btn[data-viewer=simple]').click
-
-          wait_for_requests
-        end
-
-        it 'displays the blob using the simple viewer' do
-          aggregate_failures do
-            # hides the rich viewer
-            expect(page).to have_selector('.blob-viewer[data-type="simple"]')
-            expect(page).to have_selector('.blob-viewer[data-type="rich"]', visible: false)
-
-            # shows highlighted Markdown code
-            expect(page).to have_content("[PEP-8](http://www.python.org/dev/peps/pep-0008/)")
-
-            # shows an enabled copy button
-            expect(page).to have_selector('.js-copy-blob-source-btn:not(.disabled)')
-          end
-        end
-
-        context 'switching to the rich viewer again' do
-          before do
-            find('.js-blob-viewer-switch-btn[data-viewer=rich]').click
-
-            wait_for_requests
-          end
-
-          it 'displays the blob using the rich viewer' do
-            aggregate_failures do
-              # hides the simple viewer
-              expect(page).to have_selector('.blob-viewer[data-type="simple"]', visible: false)
-              expect(page).to have_selector('.blob-viewer[data-type="rich"]')
-
-              # shows an enabled copy button
-              expect(page).to have_selector('.js-copy-blob-source-btn:not(.disabled)')
-            end
-          end
-        end
-      end
-    end
-
-    context 'visiting with a line number anchor' do
-      before do
-        visit project_snippet_path(project, snippet, anchor: 'L1')
-
-        wait_for_requests
-      end
-
-      it 'displays the blob using the simple viewer' do
-        aggregate_failures do
-          # hides the rich viewer
-          expect(page).to have_selector('.blob-viewer[data-type="simple"]')
-          expect(page).to have_selector('.blob-viewer[data-type="rich"]', visible: false)
-
-          # highlights the line in question
-          expect(page).to have_selector('#LC1.hll')
-
-          # shows highlighted Markdown code
-          expect(page).to have_content("[PEP-8](http://www.python.org/dev/peps/pep-0008/)")
+  it_behaves_like 'showing user status' do
+    let(:file_path) { 'files/ruby/popen.rb' }
+    let(:user_with_status) { snippet.author }
 
-          # shows an enabled copy button
-          expect(page).to have_selector('.js-copy-blob-source-btn:not(.disabled)')
-        end
-      end
-    end
+    subject { visit project_snippet_path(project, snippet) }
   end
 
-  it_behaves_like 'showing user status' do
-    let(:file_name) { 'ruby-style-guide.md' }
-    let(:content) { project.repository.blob_at('master', 'files/markdown/ruby-style-guide.md').data }
-
-    let(:user_with_status) { snippet.author }
+  it_behaves_like 'does not show New Snippet button' do
+    let(:file_path) { 'files/ruby/popen.rb' }
 
-    subject do
-      visit project_snippet_path(project, snippet)
-      wait_for_requests
-    end
+    subject { visit project_snippet_path(project, snippet) }
   end
 end