Add latest changes from gitlab-org/gitlab@master

spec/javascripts/sidebar/subscriptions_spec.js

@@ -76,4 +76,25 @@ describe('Subscriptions', function() {
     expect(vm.$emit).toHaveBeenCalledWith('toggleSidebar');
   });
+
+  describe('given project emails are disabled', () => {
+    const subscribeDisabledDescription = 'Notifications have been disabled';
+
+    beforeEach(() => {
+      vm = mountComponent(Subscriptions, {
+        subscribed: false,
+        projectEmailsDisabled: true,
+        subscribeDisabledDescription,
+      });
+    });
+
+    it('sets the correct display text', () => {
+      expect(vm.$el.textContent).toContain(subscribeDisabledDescription);
+      expect(vm.$refs.tooltip.dataset.originalTitle).toBe(subscribeDisabledDescription);
+    });
+
+    it('does not render the toggle button', () => {
+      expect(vm.$refs.toggleButton).toBeUndefined();
+    });
+  });
 });

spec/lib/gitlab/import_export/all_models.yml

@@ -30,6 +30,8 @@ issues:
 - prometheus_alert_events
 - self_managed_prometheus_alert_events
 - zoom_meetings
+- vulnerability_links
+- related_vulnerabilities
 events:
 - author
 - project

spec/lib/gitlab/import_export/group_tree_saver_spec.rb

@@ -39,12 +39,16 @@ describe Gitlab::ImportExport::GroupTreeSaver do
       end
       context 'when :export_fast_serialize feature is enabled' do
+        let(:serializer) { instance_double(Gitlab::ImportExport::FastHashSerializer) }
+
         before do
           stub_feature_flags(export_fast_serialize: true)
+
+          expect(Gitlab::ImportExport::FastHashSerializer).to receive(:new).with(group, group_tree).and_return(serializer)
         end
         it 'uses FastHashSerializer' do
-          expect_any_instance_of(Gitlab::ImportExport::FastHashSerializer).to receive(:execute).and_call_original
+          expect(serializer).to receive(:execute)
           group_tree_saver.save
         end
@@ -103,6 +107,18 @@ describe Gitlab::ImportExport::GroupTreeSaver do
         expect(saved_group_json['badges']).not_to be_empty
       end
+      context 'group children' do
+        let(:children) { group.children }
+
+        it 'exports group children' do
+          expect(saved_group_json['children'].length).to eq(children.count)
+        end
+
+        it 'exports group children of children' do
+          expect(saved_group_json['children'].first['children'].length).to eq(children.first.children.count)
+        end
+      end
+
       context 'group members' do
         let(:user2) { create(:user, email: 'group@member.com') }
         let(:member_emails) do
@@ -146,6 +162,8 @@ describe Gitlab::ImportExport::GroupTreeSaver do
   def setup_group
     group = create(:group, description: 'description')
+    sub_group = create(:group, description: 'description', parent: group)
+    create(:group, description: 'description', parent: sub_group)
     create(:milestone, group: group)
     create(:group_badge, group: group)
     group_label = create(:group_label, group: group)

spec/models/environment_spec.rb

@@ -744,6 +744,12 @@ describe Environment, :use_clean_rails_memory_store_caching do
       allow(environment).to receive(:deployment_platform).and_return(double)
     end
+    context 'reactive cache configuration' do
+      it 'does not continue to spawn jobs' do
+        expect(described_class.reactive_cache_lifetime).to be < described_class.reactive_cache_refresh_interval
+      end
+    end
+
     context 'reactive cache is empty' do
       before do
         stub_reactive_cache(environment, nil)

spec/requests/user_avatar_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'Loading a user avatar' do
-  let(:user) { create(:user, :with_avatar) }
-
-  context 'when logged in' do
-    # The exact query count will vary depending on the 2FA settings of the
-    # instance, group, and user. Removing those extra 2FA queries in this case
-    # may not be a good idea, so we just set up the ideal case.
-    before do
-      stub_application_setting(require_two_factor_authentication: true)
-
-      login_as(create(:user, :two_factor))
-    end
-
-    # One each for: current user, avatar user, and upload record
-    it 'only performs three SQL queries' do
-      get user.avatar_url # Skip queries on first application load
-
-      expect(response).to have_gitlab_http_status(200)
-      expect { get user.avatar_url }.not_to exceed_query_limit(3)
-    end
-  end
-
-  context 'when logged out' do
-    # One each for avatar user and upload record
-    it 'only performs two SQL queries' do
-      get user.avatar_url # Skip queries on first application load
-
-      expect(response).to have_gitlab_http_status(200)
-      expect { get user.avatar_url }.not_to exceed_query_limit(2)
-    end
-  end
-end

spec/serializers/issuable_sidebar_extras_entity_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe IssuableSidebarExtrasEntity do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :repository) }
+  let(:resource) { create(:issue, project: project) }
+  let(:request) { double('request', current_user: user) }
+
+  subject { described_class.new(resource, request: request).as_json }
+
+  it 'have subscribe attributes' do
+    expect(subject).to include(:participants,
+                               :project_emails_disabled,
+                               :subscribe_disabled_description,
+                               :subscribed,
+                               :assignees)
+  end
+end

spec/services/merge_requests/ff_merge_service_spec.rb

@@ -24,33 +24,63 @@ describe MergeRequests::FfMergeService do
     context 'valid params' do
       let(:service) { described_class.new(project, user, valid_merge_params) }
-      before do
-        allow(service).to receive(:execute_hooks)
-
+      def execute_ff_merge
         perform_enqueued_jobs do
           service.execute(merge_request)
         end
       end
+      before do
+        allow(service).to receive(:execute_hooks)
+      end
+
       it "does not create merge commit" do
+        execute_ff_merge
+
         source_branch_sha = merge_request.source_project.repository.commit(merge_request.source_branch).sha
         target_branch_sha = merge_request.target_project.repository.commit(merge_request.target_branch).sha
+
         expect(source_branch_sha).to eq(target_branch_sha)
       end
-      it { expect(merge_request).to be_valid }
-      it { expect(merge_request).to be_merged }
+      it 'keeps the merge request valid' do
+        expect { execute_ff_merge }
+          .not_to change { merge_request.valid? }
+      end
+
+      it 'updates the merge request to merged' do
+        expect { execute_ff_merge }
+          .to change { merge_request.merged? }
+          .from(false)
+          .to(true)
+      end
       it 'sends email to user2 about merge of new merge_request' do
+        execute_ff_merge
+
         email = ActionMailer::Base.deliveries.last
         expect(email.to.first).to eq(user2.email)
         expect(email.subject).to include(merge_request.title)
       end
       it 'creates system note about merge_request merge' do
+        execute_ff_merge
+
         note = merge_request.notes.last
         expect(note.note).to include 'merged'
       end
+
+      it 'does not update squash_commit_sha if it is not a squash' do
+        expect { execute_ff_merge }.not_to change { merge_request.squash_commit_sha }
+      end
+
+      it 'updates squash_commit_sha if it is a squash' do
+        merge_request.update!(squash: true)
+
+        expect { execute_ff_merge }
+          .to change { merge_request.squash_commit_sha }
+          .from(nil)
+      end
     end
     context 'error handling' do
@@ -83,6 +113,16 @@ describe MergeRequests::FfMergeService do
         expect(merge_request.merge_error).to include(error_message)
         expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
       end
+
+      it 'does not update squash_commit_sha if squash merge is not successful' do
+        merge_request.update!(squash: true)
+
+        expect(project.repository.raw).to receive(:ff_merge) do
+          raise 'Merge error'
+        end
+
+        expect { service.execute(merge_request) }.not_to change { merge_request.squash_commit_sha }
+      end
     end
   end
 end

spec/spec_helper.rb

@@ -66,6 +66,11 @@ RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
   config.full_backtrace = !!ENV['CI']
+  unless ENV['CI']
+    # Re-run failures locally with `--only-failures`
+    config.example_status_persistence_file_path = './spec/examples.txt'
+  end
+
   config.define_derived_metadata(file_path: %r{(ee)?/spec/.+_spec\.rb\z}) do |metadata|
     location = metadata[:location]