Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 32 deletions

diff --git a/spec/frontend/admin/analytics/devops_score/components/devops_score_spec.js b/spec/frontend/admin/analytics/devops_score/components/devops_score_spec.js
index 824eb033671..3087792521c 100644
--- a/spec/frontend/admin/analytics/devops_score/components/devops_score_spec.js
+++ b/spec/frontend/admin/analytics/devops_score/components/devops_score_spec.js
@@ -1,4 +1,4 @@
-import { GlTable, GlBadge, GlEmptyState } from '@gitlab/ui';
+import { GlTableLite, GlBadge, GlEmptyState } from '@gitlab/ui';
 import { GlSingleStat } from '@gitlab/ui/dist/charts';
 import { mount } from '@vue/test-utils';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
@@ -20,7 +20,7 @@ describe('DevopsScore', () => {
     );
   };
 
-  const findTable = () => wrapper.findComponent(GlTable);
+  const findTable = () => wrapper.findComponent(GlTableLite);
   const findEmptyState = () => wrapper.findComponent(GlEmptyState);
   const findCol = (testId) => findTable().find(`[data-testid="${testId}"]`);
   const findUsageCol = () => findCol('usageCol');
@@ -124,11 +124,11 @@ describe('DevopsScore', () => {
 
         describe('table columns', () => {
           describe('Your usage', () => {
-            it('displays the corrrect value', () => {
+            it('displays the correct value', () => {
               expect(findUsageCol().text()).toContain('3.2');
             });
 
-            it('displays the corrrect badge', () => {
+            it('displays the correct badge', () => {
               const badge = findUsageCol().find(GlBadge);
 
               expect(badge.exists()).toBe(true);
diff --git a/spec/services/groups/transfer_service_spec.rb b/spec/services/groups/transfer_service_spec.rb
index 59ec78bf9ec..3a696228382 100644
--- a/spec/services/groups/transfer_service_spec.rb
+++ b/spec/services/groups/transfer_service_spec.rb
@@ -814,20 +814,6 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
           expect(unrelated_pending_build.namespace_id).to eq(other_project.namespace_id)
           expect(unrelated_pending_build.namespace_traversal_ids).to eq(other_project.namespace.traversal_ids)
         end
-
-        context 'when ci_pending_builds_async_update is disabled' do
-          let(:update_pending_build_service) { instance_double(::Ci::PendingBuilds::UpdateGroupWorker) }
-
-          before do
-            stub_feature_flags(ci_pending_builds_async_update: false)
-          end
-
-          it 'does not call the new worker' do
-            expect(::Ci::PendingBuilds::UpdateGroupWorker).not_to receive(:perform_async)
-
-            transfer_service.execute(new_parent_group)
-          end
-        end
       end
     end
 
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index 93b7ce56247..ddd16100b40 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -189,20 +189,6 @@ RSpec.describe Projects::TransferService do
         expect(unrelated_pending_build.namespace_id).to eq(other_project.namespace_id)
         expect(unrelated_pending_build.namespace_traversal_ids).to eq(other_project.namespace.traversal_ids)
       end
-
-      context 'when ci_pending_builds_async_update is disabled' do
-        let(:update_pending_build_service) { instance_double(::Ci::PendingBuilds::UpdateProjectWorker) }
-
-        before do
-          stub_feature_flags(ci_pending_builds_async_update: false)
-        end
-
-        it 'does not call the new worker' do
-          expect(::Ci::PendingBuilds::UpdateProjectWorker).not_to receive(:perform_async)
-
-          execute_transfer
-        end
-      end
     end
   end