Add latest changes from gitlab-org/gitlab@master

3 files changed, 47 insertions, 0 deletions

diff --git a/spec/services/groups/deploy_tokens/destroy_service_spec.rb b/spec/services/groups/deploy_tokens/destroy_service_spec.rb
new file mode 100644
index 00000000000..d4ef5963558
--- /dev/null
+++ b/spec/services/groups/deploy_tokens/destroy_service_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Groups::DeployTokens::DestroyService do
+  it_behaves_like 'a deploy token deletion service' do
+    let_it_be(:entity) { create(:group) }
+    let_it_be(:deploy_token_class) { GroupDeployToken }
+    let_it_be(:deploy_token) { create(:deploy_token, :group, groups: [entity]) }
+  end
+end
diff --git a/spec/services/projects/deploy_tokens/destroy_service_spec.rb b/spec/services/projects/deploy_tokens/destroy_service_spec.rb
new file mode 100644
index 00000000000..24407f46615
--- /dev/null
+++ b/spec/services/projects/deploy_tokens/destroy_service_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Projects::DeployTokens::DestroyService do
+  it_behaves_like 'a deploy token deletion service' do
+    let_it_be(:entity) { create(:project) }
+    let_it_be(:deploy_token_class) { ProjectDeployToken }
+    let_it_be(:deploy_token) { create(:deploy_token, projects: [entity]) }
+  end
+end
diff --git a/spec/services/resource_events/synthetic_milestone_notes_builder_service_spec.rb b/spec/services/resource_events/synthetic_milestone_notes_builder_service_spec.rb
new file mode 100644
index 00000000000..e98b8bd00dc
--- /dev/null
+++ b/spec/services/resource_events/synthetic_milestone_notes_builder_service_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ResourceEvents::SyntheticMilestoneNotesBuilderService do
+  describe '#execute' do
+    let_it_be(:user) { create(:user) }
+    let_it_be(:issue) { create(:issue, author: user) }
+
+    before do
+      create_list(:resource_milestone_event, 3, issue: issue)
+
+      stub_feature_flags(track_resource_milestone_change_events: false)
+    end
+
+    context 'when resource milestone events are disabled' do
+      # https://gitlab.com/gitlab-org/gitlab/-/issues/212985
+      it 'still builds notes for existing resource milestone events' do
+        notes = described_class.new(issue, user).execute
+
+        expect(notes.size).to eq(3)
+      end
+    end
+  end
+end