Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 22 deletions

diff --git a/spec/workers/design_management/new_version_worker_spec.rb b/spec/workers/design_management/new_version_worker_spec.rb
index 76497dde464..ef7cd8de108 100644
--- a/spec/workers/design_management/new_version_worker_spec.rb
+++ b/spec/workers/design_management/new_version_worker_spec.rb
@@ -3,14 +3,6 @@
 require 'spec_helper'
 
 describe DesignManagement::NewVersionWorker do
-  # TODO a number of these tests are being temporarily skipped unless run in EE,
-  # as we are in the process of moving Design Management to FOSS in 13.0
-  # in steps. In the current step the services have not yet been moved, and
-  # certain services are called within these tests:
-  #  - `SystemNoteService`
-  #  - `DesignManagement::GenerateImageVersionsService`
-  #
-  # See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283.
   describe '#perform' do
     let(:worker) { described_class.new }
 
@@ -18,16 +10,12 @@ describe DesignManagement::NewVersionWorker do
       let(:version_id) { -1 }
 
       it 'does not create system notes' do
-        skip 'See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283' unless Gitlab.ee?
-
         expect(SystemNoteService).not_to receive(:design_version_added)
 
         worker.perform(version_id)
       end
 
       it 'does not invoke GenerateImageVersionsService' do
-        skip 'See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283' unless Gitlab.ee?
-
         expect(DesignManagement::GenerateImageVersionsService).not_to receive(:new)
 
         worker.perform(version_id)
@@ -45,14 +33,10 @@ describe DesignManagement::NewVersionWorker do
       let_it_be(:version) { create(:design_version, :with_lfs_file, designs_count: 2) }
 
       it 'creates a system note' do
-        skip 'See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283' unless Gitlab.ee?
-
         expect { worker.perform(version.id) }.to change { Note.system.count }.by(1)
       end
 
       it 'invokes GenerateImageVersionsService' do
-        skip 'See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283' unless Gitlab.ee?
-
         expect_next_instance_of(DesignManagement::GenerateImageVersionsService) do |service|
           expect(service).to receive(:execute)
         end
@@ -61,8 +45,6 @@ describe DesignManagement::NewVersionWorker do
       end
 
       it 'does not log anything' do
-        skip 'See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283' unless Gitlab.ee?
-
         expect(Sidekiq.logger).not_to receive(:warn)
 
         worker.perform(version.id)
@@ -77,14 +59,10 @@ describe DesignManagement::NewVersionWorker do
       end
 
       it 'creates two system notes' do
-        skip 'See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283' unless Gitlab.ee?
-
         expect { worker.perform(version.id) }.to change { Note.system.count }.by(2)
       end
 
       it 'calls design_version_added' do
-        skip 'See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283' unless Gitlab.ee?
-
         expect(SystemNoteService).to receive(:design_version_added).with(version)
 
         worker.perform(version.id)