diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-24 03:09:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-24 03:09:00 +0300 |
commit | 3b0fd281ca3a8b1d88f3bbfc00a4d3e56a1c3870 (patch) | |
tree | 6307b832a1aa941084e07e248a0ac91ba9b088ba /spec | |
parent | 17bb9dd270c78fad45851c6cc6ec6e6fdb3d23bf (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/metrics/exporter/base_exporter_spec.rb | 2 | ||||
-rw-r--r-- | spec/migrations/20230907155247_queue_backfill_has_merge_request_of_vulnerability_reads_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/metrics/exporter/base_exporter_spec.rb b/spec/lib/gitlab/metrics/exporter/base_exporter_spec.rb index 844c3b54587..c7eac42c0e0 100644 --- a/spec/lib/gitlab/metrics/exporter/base_exporter_spec.rb +++ b/spec/lib/gitlab/metrics/exporter/base_exporter_spec.rb @@ -166,7 +166,7 @@ RSpec.describe Gitlab::Metrics::Exporter::BaseExporter, feature_category: :cloud end describe '#start' do - it "doesn't start running server" do + it "doesn't start running server", quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/438765' do expect(::WEBrick::HTTPServer).not_to receive(:new) exporter.start diff --git a/spec/migrations/20230907155247_queue_backfill_has_merge_request_of_vulnerability_reads_spec.rb b/spec/migrations/20230907155247_queue_backfill_has_merge_request_of_vulnerability_reads_spec.rb index 7214e0114d4..519e81cc933 100644 --- a/spec/migrations/20230907155247_queue_backfill_has_merge_request_of_vulnerability_reads_spec.rb +++ b/spec/migrations/20230907155247_queue_backfill_has_merge_request_of_vulnerability_reads_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' require_migration! RSpec.describe QueueBackfillHasMergeRequestOfVulnerabilityReads, feature_category: :database do - let!(:batched_migration) { described_class::MIGRATION_NAME } + let!(:batched_migration) { described_class::MIGRATION } it 'schedules a new batched migration' do reversible_migration do |migration| |