Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

2 files changed, 22 insertions, 18 deletions

diff --git a/spec/services/git/branch_hooks_service_spec.rb b/spec/services/git/branch_hooks_service_spec.rb
index db25bb766c9..a5290f0be68 100644
--- a/spec/services/git/branch_hooks_service_spec.rb
+++ b/spec/services/git/branch_hooks_service_spec.rb
@@ -429,4 +429,26 @@ RSpec.describe Git::BranchHooksService do
       end
     end
   end
+
+  describe 'Metrics dashboard sync' do
+    context 'with feature flag enabled' do
+      before do
+        Feature.enable(:metrics_dashboards_sync)
+      end
+
+      it 'imports metrics to database' do
+        expect(Metrics::Dashboard::SyncDashboardsWorker).to receive(:perform_async)
+
+        service.execute
+      end
+    end
+
+    context 'with feature flag disabled' do
+      it 'imports metrics to database' do
+        expect(Metrics::Dashboard::SyncDashboardsWorker).to receive(:perform_async)
+
+        service.execute
+      end
+    end
+  end
 end
diff --git a/spec/services/git/wiki_push_service_spec.rb b/spec/services/git/wiki_push_service_spec.rb
index 816f20f0bc3..cd38f2e97fb 100644
--- a/spec/services/git/wiki_push_service_spec.rb
+++ b/spec/services/git/wiki_push_service_spec.rb
@@ -254,24 +254,6 @@ RSpec.describe Git::WikiPushService, services: true do
           service.execute
         end
       end
-
-      context 'the wiki_events_on_git_push feature is disabled' do
-        before do
-          stub_feature_flags(wiki_events_on_git_push: false)
-        end
-
-        it_behaves_like 'a no-op push'
-
-        context 'but is enabled for a given container' do
-          before do
-            stub_feature_flags(wiki_events_on_git_push: wiki.container)
-          end
-
-          it 'creates events' do
-            expect { process_changes { write_new_page } }.to change(Event, :count).by(1)
-          end
-        end
-      end
     end
   end