Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc20210223090520

21 files changed, 279 insertions, 69 deletions

diff --git a/spec/features/commit_spec.rb b/spec/features/commit_spec.rb
index 02754cc803e..80a30ab01b2 100644
--- a/spec/features/commit_spec.rb
+++ b/spec/features/commit_spec.rb
@@ -35,9 +35,8 @@ RSpec.describe 'Commit' do
       end
     end
 
-    context "pagination enabled" do
+    describe "pagination" do
       before do
-        stub_feature_flags(paginate_commit_view: true)
         stub_const("Projects::CommitController::COMMIT_DIFFS_PER_PAGE", 1)
 
         visit project_commit_path(project, commit)
@@ -61,18 +60,5 @@ RSpec.describe 'Commit' do
         expect(page).to have_selector(".files ##{files[1].file_hash}")
       end
     end
-
-    context "pagination disabled" do
-      before do
-        stub_feature_flags(paginate_commit_view: false)
-
-        visit project_commit_path(project, commit)
-      end
-
-      it "shows both diffs on the page" do
-        expect(page).to have_selector(".files ##{files[0].file_hash}")
-        expect(page).to have_selector(".files ##{files[1].file_hash}")
-      end
-    end
   end
 end
diff --git a/spec/features/groups/members/manage_members_spec.rb b/spec/features/groups/members/manage_members_spec.rb
index c27d0afba6f..3b637a10abe 100644
--- a/spec/features/groups/members/manage_members_spec.rb
+++ b/spec/features/groups/members/manage_members_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Groups > Members > Manage members' do
     sign_in(user1)
   end
 
-  shared_examples 'includes the correct Invite Members link' do |should_include, should_not_include|
+  shared_examples 'includes the correct Invite link' do |should_include, should_not_include|
     it 'includes either the form or the modal trigger' do
       group.add_owner(user1)
 
@@ -31,15 +31,13 @@ RSpec.describe 'Groups > Members > Manage members' do
       stub_feature_flags(invite_members_group_modal: true)
     end
 
-    it_behaves_like 'includes the correct Invite Members link', '.js-invite-members-trigger', '.invite-users-form'
+    it_behaves_like 'includes the correct Invite link', '.js-invite-members-trigger', '.invite-users-form'
+    it_behaves_like 'includes the correct Invite link', '.js-invite-group-trigger', '.invite-group-form'
   end
 
   context 'when Invite Members modal is disabled' do
-    before do
-      stub_feature_flags(invite_members_group_modal: false)
-    end
-
-    it_behaves_like 'includes the correct Invite Members link', '.invite-users-form', '.js-invite-members-trigger'
+    it_behaves_like 'includes the correct Invite link', '.invite-users-form', '.js-invite-members-trigger'
+    it_behaves_like 'includes the correct Invite link', '.invite-group-form', '.js-invite-group-trigger'
   end
 
   it 'update user to owner level', :js do
diff --git a/spec/features/groups/settings/user_searches_in_settings_spec.rb b/spec/features/groups/settings/user_searches_in_settings_spec.rb
new file mode 100644
index 00000000000..819d0c4faba
--- /dev/null
+++ b/spec/features/groups/settings/user_searches_in_settings_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'User searches group settings', :js do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:project, :repository, namespace: group) }
+
+  before do
+    group.add_owner(user)
+    sign_in(user)
+  end
+
+  context 'in general settings page' do
+    let(:visit_path) { edit_group_path(group) }
+
+    it_behaves_like 'can search settings with feature flag check', 'Naming', 'Permissions'
+  end
+
+  context 'in Repository page' do
+    before do
+      visit group_settings_repository_path(group)
+    end
+
+    it_behaves_like 'can search settings', 'Deploy tokens', 'Default initial branch name'
+  end
+
+  context 'in CI/CD page' do
+    before do
+      visit group_settings_ci_cd_path(group)
+    end
+
+    it_behaves_like 'can search settings', 'Variables', 'Runners'
+  end
+end
diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb
index e2087868035..eb3d0f223db 100644
--- a/spec/features/issues/gfm_autocomplete_spec.rb
+++ b/spec/features/issues/gfm_autocomplete_spec.rb
@@ -994,7 +994,7 @@ RSpec.describe 'GFM autocomplete', :js do
   end
 
   def start_and_cancel_discussion
-    click_button('Reply...')
+    find_field('Reply…').click
 
     fill_in('note_note', with: 'Whoops!')
 
diff --git a/spec/features/merge_request/batch_comments_spec.rb b/spec/features/merge_request/batch_comments_spec.rb
index c8fc23bebf9..25f2707146d 100644
--- a/spec/features/merge_request/batch_comments_spec.rb
+++ b/spec/features/merge_request/batch_comments_spec.rb
@@ -223,7 +223,7 @@ end
 
 def write_reply_to_discussion(button_text: 'Start a review', text: 'Line is wrong', resolve: false, unresolve: false)
   page.within(first('.diff-files-holder .discussion-reply-holder')) do
-    click_button('Reply...')
+    find_field('Reply…', match: :first).click
 
     fill_in('note_note', with: text)
 
diff --git a/spec/features/merge_request/user_posts_diff_notes_spec.rb b/spec/features/merge_request/user_posts_diff_notes_spec.rb
index 794dfd7c8da..163ce10132e 100644
--- a/spec/features/merge_request/user_posts_diff_notes_spec.rb
+++ b/spec/features/merge_request/user_posts_diff_notes_spec.rb
@@ -192,7 +192,7 @@ RSpec.describe 'Merge request > User posts diff notes', :js do
       it 'adds as discussion' do
         should_allow_commenting(find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_22_22"]'), asset_form_reset: false)
         expect(page).to have_css('.notes_holder .note.note-discussion', count: 1)
-        expect(page).to have_button('Reply...')
+        expect(page).to have_field('Reply…')
       end
     end
   end
diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
index b86586d53e2..caa04059469 100644
--- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
+++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
@@ -149,7 +149,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do
 
           it 'allows user to comment' do
             page.within '.diff-content' do
-              click_button 'Reply...'
+              find_field('Reply…').click
 
               find(".js-unresolve-checkbox").set false
               find('.js-note-text').set 'testing'
@@ -179,7 +179,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do
 
           it 'allows user to comment & unresolve thread' do
             page.within '.diff-content' do
-              click_button 'Reply...'
+              find_field('Reply…').click
 
               find('.js-note-text').set 'testing'
 
@@ -208,7 +208,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do
 
       it 'allows user to comment & resolve thread' do
         page.within '.diff-content' do
-          click_button 'Reply...'
+          find_field('Reply…').click
 
           find('.js-note-text').set 'testing'
 
@@ -442,7 +442,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do
 
       it 'allows user to comment & resolve thread' do
         page.within '.diff-content' do
-          click_button 'Reply...'
+          find_field('Reply…').click
 
           find('.js-note-text').set 'testing'
 
@@ -461,7 +461,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do
         page.within '.diff-content' do
           click_button 'Resolve thread'
 
-          click_button 'Reply...'
+          find_field('Reply…').click
 
           find('.js-note-text').set 'testing'
 
diff --git a/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb b/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb
index d15d5b3bc73..90cdc28d1bd 100644
--- a/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb
+++ b/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb
@@ -37,7 +37,7 @@ RSpec.describe 'Merge request > User sees avatars on diff notes', :js do
     end
 
     it 'does not render avatars after commenting on discussion tab' do
-      click_button 'Reply...'
+      find_field('Reply…').click
 
       page.within('.js-discussion-note-form') do
         find('.note-textarea').native.send_keys('Test comment')
@@ -132,7 +132,7 @@ RSpec.describe 'Merge request > User sees avatars on diff notes', :js do
       end
 
       it 'adds avatar when commenting' do
-        click_button 'Reply...'
+        find_field('Reply…', match: :first).click
 
         page.within '.js-discussion-note-form' do
           find('.js-note-text').native.send_keys('Test')
@@ -151,7 +151,7 @@ RSpec.describe 'Merge request > User sees avatars on diff notes', :js do
 
       it 'adds multiple comments' do
         3.times do
-          click_button 'Reply...'
+          find_field('Reply…', match: :first).click
 
           page.within '.js-discussion-note-form' do
             find('.js-note-text').native.send_keys('Test')
diff --git a/spec/features/merge_request/user_sees_discussions_spec.rb b/spec/features/merge_request/user_sees_discussions_spec.rb
index 289c861739f..d79763ba5e0 100644
--- a/spec/features/merge_request/user_sees_discussions_spec.rb
+++ b/spec/features/merge_request/user_sees_discussions_spec.rb
@@ -60,7 +60,7 @@ RSpec.describe 'Merge request > User sees threads', :js do
 
       it 'can be replied to' do
         within(".discussion[data-discussion-id='#{discussion_id}']") do
-          click_button 'Reply...'
+          find_field('Reply…').click
           fill_in 'note[note]', with: 'Test!'
           click_button 'Comment'
 
diff --git a/spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb b/spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb
index 20c45a1d652..ea46ae06329 100644
--- a/spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb
+++ b/spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe 'Merge request > User sees notes from forked project', :js do
     expect(page).to have_content('A commit comment')
 
     page.within('.discussion-notes') do
-      find('.btn-text-field').click
+      find_field('Reply…').click
       scroll_to(page.find('#note_note', visible: false))
       find('#note_note').send_keys('A reply comment')
       find('.js-comment-button').click
diff --git a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
index bbeb91bbd19..dbc88d0cce2 100644
--- a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
+++ b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
@@ -83,7 +83,7 @@ RSpec.describe 'User comments on a diff', :js do
 
       wait_for_requests
 
-      click_button 'Reply...'
+      find_field('Reply…', match: :first).click
 
       find('.js-suggestion-btn').click
 
diff --git a/spec/features/projects/files/gitlab_ci_syntax_yml_dropdown_spec.rb b/spec/features/projects/files/gitlab_ci_syntax_yml_dropdown_spec.rb
index ca6f03472dd..cd796d45aba 100644
--- a/spec/features/projects/files/gitlab_ci_syntax_yml_dropdown_spec.rb
+++ b/spec/features/projects/files/gitlab_ci_syntax_yml_dropdown_spec.rb
@@ -5,11 +5,13 @@ require 'spec_helper'
 RSpec.describe 'Projects > Files > User wants to add a .gitlab-ci.yml file' do
   include Spec::Support::Helpers::Features::EditorLiteSpecHelpers
 
+  let_it_be(:namespace) { create(:namespace) }
+  let(:project) { create(:project, :repository, namespace: namespace) }
+
   before do
-    project = create(:project, :repository)
     sign_in project.owner
-    stub_experiment(ci_syntax_templates: experiment_active)
-    stub_experiment_for_subject(ci_syntax_templates: in_experiment_group)
+    stub_experiment(ci_syntax_templates_b: experiment_active)
+    stub_experiment_for_subject(ci_syntax_templates_b: in_experiment_group)
 
     visit project_new_blob_path(project, 'master', file_name: '.gitlab-ci.yml')
   end
@@ -23,35 +25,45 @@ RSpec.describe 'Projects > Files > User wants to add a .gitlab-ci.yml file' do
     end
   end
 
-  context 'when experiment is active and the user is in the control group' do
+  context 'when experiment is active' do
     let(:experiment_active) { true }
-    let(:in_experiment_group) { false }
 
-    it 'does not show the "Learn CI/CD syntax" template dropdown' do
-      expect(page).not_to have_css('.gitlab-ci-syntax-yml-selector')
+    context 'when the user is in the control group' do
+      let(:in_experiment_group) { false }
+
+      it 'does not show the "Learn CI/CD syntax" template dropdown' do
+        expect(page).not_to have_css('.gitlab-ci-syntax-yml-selector')
+      end
     end
-  end
 
-  context 'when experiment is active and the user is in the experimental group' do
-    let(:experiment_active) { true }
-    let(:in_experiment_group) { true }
+    context 'when the user is in the experimental group' do
+      let(:in_experiment_group) { true }
+
+      it 'allows the user to pick a "Learn CI/CD syntax" template from the dropdown', :js do
+        expect(page).to have_css('.gitlab-ci-syntax-yml-selector')
 
-    it 'allows the user to pick a "Learn CI/CD syntax" template from the dropdown', :js do
-      expect(page).to have_css('.gitlab-ci-syntax-yml-selector')
+        find('.js-gitlab-ci-syntax-yml-selector').click
 
-      find('.js-gitlab-ci-syntax-yml-selector').click
+        wait_for_requests
 
-      wait_for_requests
+        within '.gitlab-ci-syntax-yml-selector' do
+          find('.dropdown-input-field').set('Artifacts example')
+          find('.dropdown-content .is-focused', text: 'Artifacts example').click
+        end
 
-      within '.gitlab-ci-syntax-yml-selector' do
-        find('.dropdown-input-field').set('Artifacts example')
-        find('.dropdown-content .is-focused', text: 'Artifacts example').click
+        wait_for_requests
+
+        expect(page).to have_css('.gitlab-ci-syntax-yml-selector .dropdown-toggle-text', text: 'Learn CI/CD syntax')
+        expect(editor_get_value).to have_content('You can use artifacts to pass data to jobs in later stages.')
       end
 
-      wait_for_requests
+      context 'when the group is created longer than 90 days ago' do
+        let(:namespace) { create(:namespace, created_at: 91.days.ago) }
 
-      expect(page).to have_css('.gitlab-ci-syntax-yml-selector .dropdown-toggle-text', text: 'Learn CI/CD syntax')
-      expect(editor_get_value).to have_content('You can use artifacts to pass data to jobs in later stages.')
+        it 'does not show the "Learn CI/CD syntax" template dropdown' do
+          expect(page).not_to have_css('.gitlab-ci-syntax-yml-selector')
+        end
+      end
     end
   end
 end
diff --git a/spec/features/projects/pages/user_edits_settings_spec.rb b/spec/features/projects/pages/user_edits_settings_spec.rb
index 3649fae17ce..6156b5243de 100644
--- a/spec/features/projects/pages/user_edits_settings_spec.rb
+++ b/spec/features/projects/pages/user_edits_settings_spec.rb
@@ -140,7 +140,7 @@ RSpec.describe 'Pages edits pages settings', :js do
 
       before do
         allow(Projects::UpdateService).to receive(:new).and_return(service)
-        allow(service).to receive(:execute).and_return(status: :error, message: 'Some error has occured')
+        allow(service).to receive(:execute).and_return(status: :error, message: 'Some error has occurred')
       end
 
       it 'tries to change the setting' do
@@ -150,7 +150,7 @@ RSpec.describe 'Pages edits pages settings', :js do
 
         click_button 'Save'
 
-        expect(page).to have_text('Some error has occured')
+        expect(page).to have_text('Some error has occurred')
       end
     end
 
diff --git a/spec/features/projects/services/user_activates_jira_spec.rb b/spec/features/projects/services/user_activates_jira_spec.rb
index 85afc54be48..3b8032e1d0d 100644
--- a/spec/features/projects/services/user_activates_jira_spec.rb
+++ b/spec/features/projects/services/user_activates_jira_spec.rb
@@ -6,12 +6,14 @@ RSpec.describe 'User activates Jira', :js do
   include_context 'project service activation'
   include_context 'project service Jira context'
 
+  before do
+    server_info = { key: 'value' }.to_json
+    stub_request(:get, test_url).to_return(body: server_info)
+  end
+
   describe 'user tests Jira Service' do
     context 'when Jira connection test succeeds' do
       before do
-        server_info = { key: 'value' }.to_json
-        stub_request(:get, test_url).with(basic_auth: %w(username password)).to_return(body: server_info)
-
         visit_project_integration('Jira')
         fill_form
         click_test_then_save_integration(expect_test_to_fail: false)
@@ -81,4 +83,40 @@ RSpec.describe 'User activates Jira', :js do
       end
     end
   end
+
+  describe 'issue transition settings' do
+    it 'shows validation errors' do
+      visit_project_integration('Jira')
+
+      expect(page).to have_field('Move to Done', checked: true)
+
+      fill_form
+      choose 'Use custom transitions'
+      click_save_integration
+
+      within '[data-testid="issue-transition-settings"]' do
+        expect(page).to have_content('This field is required.')
+      end
+
+      fill_in 'service[jira_issue_transition_id]', with: '1, 2, 3'
+      click_save_integration
+
+      expect(page).to have_content('Jira settings saved and active.')
+      expect(project.reload.jira_service.jira_issue_transition_id).to eq('1, 2, 3')
+    end
+
+    it 'clears the transition IDs when using automatic transitions' do
+      create(:jira_service, project: project, jira_issue_transition_id: '1, 2, 3')
+      visit_project_integration('Jira')
+
+      expect(page).to have_field('Use custom transitions', checked: true)
+      expect(page).to have_field('service[jira_issue_transition_id]', with: '1, 2, 3')
+
+      choose 'Move to Done'
+      click_save_integration
+
+      expect(page).to have_content('Jira settings saved and active.')
+      expect(project.reload.jira_service.jira_issue_transition_id).to eq('')
+    end
+  end
 end
diff --git a/spec/features/projects/settings/service_desk_setting_spec.rb b/spec/features/projects/settings/service_desk_setting_spec.rb
index d31913d2dcf..50451075db5 100644
--- a/spec/features/projects/settings/service_desk_setting_spec.rb
+++ b/spec/features/projects/settings/service_desk_setting_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Service Desk Setting', :js do
+RSpec.describe 'Service Desk Setting', :js, :clean_gitlab_redis_cache do
   let(:project) { create(:project_empty_repo, :private, service_desk_enabled: false) }
   let(:presenter) { project.present(current_user: user) }
   let(:user) { create(:user) }
@@ -66,5 +66,48 @@ RSpec.describe 'Service Desk Setting', :js do
 
       expect(find('[data-testid="incoming-email"]').value).to eq('address-suffix@example.com')
     end
+
+    context 'issue description templates' do
+      let_it_be(:issuable_project_template_files) do
+        {
+          '.gitlab/issue_templates/project-issue-bar.md' => 'Project Issue Template Bar',
+          '.gitlab/issue_templates/project-issue-foo.md' => 'Project Issue Template Foo'
+        }
+      end
+
+      let_it_be(:issuable_group_template_files) do
+        {
+          '.gitlab/issue_templates/group-issue-bar.md' => 'Group Issue Template Bar',
+          '.gitlab/issue_templates/group-issue-foo.md' => 'Group Issue Template Foo'
+        }
+      end
+
+      let_it_be_with_reload(:group) { create(:group)}
+      let_it_be_with_reload(:project) { create(:project, :custom_repo, group: group, files: issuable_project_template_files) }
+      let_it_be(:group_template_repo) { create(:project, :custom_repo, group: group, files: issuable_group_template_files) }
+
+      before do
+        stub_licensed_features(custom_file_templates_for_namespace: false, custom_file_templates: false)
+        group.update_columns(file_template_project_id: group_template_repo.id)
+      end
+
+      context 'when inherited_issuable_templates enabled' do
+        before do
+          stub_feature_flags(inherited_issuable_templates: true)
+          visit edit_project_path(project)
+        end
+
+        it_behaves_like 'issue description templates from current project only'
+      end
+
+      context 'when inherited_issuable_templates disabled' do
+        before do
+          stub_feature_flags(inherited_issuable_templates: false)
+          visit edit_project_path(project)
+        end
+
+        it_behaves_like 'issue description templates from current project only'
+      end
+    end
   end
 end
diff --git a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
index e8e32d93f7b..397c334a2b8 100644
--- a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
+++ b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
@@ -133,7 +133,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do
     it 'when unchecked sets :remove_source_branch_after_merge to false' do
       uncheck('project_remove_source_branch_after_merge')
       within('.merge-request-settings-form') do
-        find('.qa-save-merge-request-changes')
+        find('.rspec-save-merge-request-changes')
         click_on('Save changes')
       end
 
@@ -157,7 +157,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do
       choose('project_project_setting_attributes_squash_option_default_on')
 
       within('.merge-request-settings-form') do
-        find('.qa-save-merge-request-changes')
+        find('.rspec-save-merge-request-changes')
         click_on('Save changes')
       end
 
@@ -172,7 +172,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do
       choose('project_project_setting_attributes_squash_option_always')
 
       within('.merge-request-settings-form') do
-        find('.qa-save-merge-request-changes')
+        find('.rspec-save-merge-request-changes')
         click_on('Save changes')
       end
 
@@ -187,7 +187,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do
       choose('project_project_setting_attributes_squash_option_never')
 
       within('.merge-request-settings-form') do
-        find('.qa-save-merge-request-changes')
+        find('.rspec-save-merge-request-changes')
         click_on('Save changes')
       end
 
diff --git a/spec/features/projects/settings/user_searches_in_settings_spec.rb b/spec/features/projects/settings/user_searches_in_settings_spec.rb
new file mode 100644
index 00000000000..563dff615d6
--- /dev/null
+++ b/spec/features/projects/settings/user_searches_in_settings_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'User searches project settings', :js do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :repository, namespace: user.namespace) }
+
+  before do
+    sign_in(user)
+  end
+
+  context 'in general settings page' do
+    let(:visit_path) { edit_project_path(project) }
+
+    it_behaves_like 'can search settings with feature flag check', 'Naming', 'Visibility'
+  end
+
+  context 'in Repository page' do
+    before do
+      visit project_settings_repository_path(project)
+    end
+
+    it_behaves_like 'can search settings', 'Deploy keys', 'Mirroring repositories'
+  end
+
+  context 'in CI/CD page' do
+    before do
+      visit project_settings_ci_cd_path(project)
+    end
+
+    it_behaves_like 'can search settings', 'General pipelines', 'Auto DevOps'
+  end
+
+  context 'in Operations page' do
+    before do
+      visit project_settings_operations_path(project)
+    end
+
+    it_behaves_like 'can search settings', 'Alerts', 'Incidents'
+  end
+end
diff --git a/spec/features/projects/show/user_uploads_files_spec.rb b/spec/features/projects/show/user_uploads_files_spec.rb
index 053598a528e..b7c5d324d93 100644
--- a/spec/features/projects/show/user_uploads_files_spec.rb
+++ b/spec/features/projects/show/user_uploads_files_spec.rb
@@ -33,4 +33,34 @@ RSpec.describe 'Projects > Show > User uploads files' do
 
     include_examples 'it uploads and commit a new file to a forked project'
   end
+
+  context 'with an empty repo' do
+    let(:project) { create(:project, :empty_repo, creator: user) }
+
+    context 'when in the empty_repo_upload experiment' do
+      before do
+        stub_experiments(empty_repo_upload: :candidate)
+
+        visit(project_path(project))
+      end
+
+      it 'uploads and commits a new text file', :js do
+        click_link('Upload file')
+
+        drop_in_dropzone(File.join(Rails.root, 'spec', 'fixtures', 'doc_sample.txt'))
+
+        page.within('#modal-upload-blob') do
+          fill_in(:commit_message, with: 'New commit message')
+        end
+
+        click_button('Upload file')
+
+        wait_for_requests
+
+        expect(page).to have_content('New commit message')
+        expect(page).to have_content('Lorem ipsum dolor sit amet')
+        expect(page).to have_content('Sed ut perspiciatis unde omnis')
+      end
+    end
+  end
 end
diff --git a/spec/features/sentry_js_spec.rb b/spec/features/sentry_js_spec.rb
index aa0ad17340a..1d277ba7b3c 100644
--- a/spec/features/sentry_js_spec.rb
+++ b/spec/features/sentry_js_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe 'Sentry' do
     expect(has_requested_sentry).to eq(false)
   end
 
-  xit 'loads sentry if sentry is enabled' do
+  it 'loads sentry if sentry is enabled' do
     stub_sentry_settings
 
     visit new_user_session_path
diff --git a/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb b/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb
index 31e29810c65..900cd72c17f 100644
--- a/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb
+++ b/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe 'User uploads avatar to profile' do
     expect(user.reload.avatar.file).to exist
   end
 
-  it 'their new avatar is immediately visible in the header', :js do
+  it 'their new avatar is immediately visible in the header and setting sidebar', :js do
     find('.js-user-avatar-input', visible: false).set(avatar_file_path)
 
     click_button 'Set new profile picture'
@@ -33,5 +33,6 @@ RSpec.describe 'User uploads avatar to profile' do
 
     data_uri = find('.avatar-image .avatar')['src']
     expect(page.find('.header-user-avatar')['src']).to eq data_uri
+    expect(page.find('[data-testid="sidebar-user-avatar"]')['src']).to eq data_uri
   end
 end
diff --git a/spec/features/user_can_display_performance_bar_spec.rb b/spec/features/user_can_display_performance_bar_spec.rb
index 9c67523f88f..b8f41925156 100644
--- a/spec/features/user_can_display_performance_bar_spec.rb
+++ b/spec/features/user_can_display_performance_bar_spec.rb
@@ -49,6 +49,10 @@ RSpec.describe 'User can display performance bar', :js do
 
   let(:group) { create(:group) }
 
+  before do
+    allow(GitlabPerformanceBarStatsWorker).to receive(:perform_in)
+  end
+
   context 'when user is logged-out' do
     before do
       visit root_path
@@ -97,6 +101,26 @@ RSpec.describe 'User can display performance bar', :js do
 
       it_behaves_like 'performance bar is enabled by default in development'
       it_behaves_like 'performance bar can be displayed'
+
+      it 'does not show Stats link by default' do
+        find('body').native.send_keys('pb')
+
+        expect(page).not_to have_link('Stats', visible: :all)
+      end
+
+      context 'when GITLAB_PERFORMANCE_BAR_STATS_URL environment variable is set' do
+        let(:stats_url) { 'https://log.gprd.gitlab.net/app/dashboards#/view/' }
+
+        before do
+          stub_env('GITLAB_PERFORMANCE_BAR_STATS_URL', stats_url)
+        end
+
+        it 'shows Stats link' do
+          find('body').native.send_keys('pb')
+
+          expect(page).to have_link('Stats', href: stats_url, visible: :all)
+        end
+      end
     end
   end
 end