Add latest changes from gitlab-org/gitlab@master

5 files changed, 33 insertions, 39 deletions

diff --git a/spec/lib/gitlab/ci/templates/Pages/zola_gitlab_ci_yaml_spec.rb b/spec/lib/gitlab/ci/templates/Pages/zola_gitlab_ci_yaml_spec.rb
new file mode 100644
index 00000000000..4f80ae0054b
--- /dev/null
+++ b/spec/lib/gitlab/ci/templates/Pages/zola_gitlab_ci_yaml_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Pages/Zola.gitlab-ci.yml', feature_category: :pages do
+  subject(:template) { Gitlab::Template::GitlabCiYmlTemplate.find('Pages/Zola') }
+
+  describe 'the created pipeline' do
+    let_it_be(:project) { create(:project, :repository) }
+
+    let(:user) { project.first_owner }
+    let(:service) { Ci::CreatePipelineService.new(project, user, ref: project.default_branch) }
+    let(:pipeline) { service.execute(:push).payload }
+    let(:build_names) { pipeline.builds.pluck(:name) }
+
+    before do
+      stub_ci_pipeline_yaml_file(template.content)
+      allow(Ci::BuildScheduleWorker).to receive(:perform).and_return(true)
+    end
+
+    it 'creates "pages" job' do
+      expect(build_names).to include('pages')
+    end
+  end
+end
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index 49084e1d551..2a7a8d50895 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -170,13 +170,6 @@ RSpec.describe Deployment, feature_category: :continuous_delivery do
           deployment.run!
         end
       end
-
-      it 'does not execute Deployments::DropOlderDeploymentsWorker' do
-        expect(Deployments::DropOlderDeploymentsWorker)
-          .not_to receive(:perform_async).with(deployment.id)
-
-        deployment.run!
-      end
     end
 
     context 'when deployment succeeded' do
diff --git a/spec/requests/api/ci/jobs_spec.rb b/spec/requests/api/ci/jobs_spec.rb
index 25871beeb4f..ed0cec46a42 100644
--- a/spec/requests/api/ci/jobs_spec.rb
+++ b/spec/requests/api/ci/jobs_spec.rb
@@ -546,40 +546,18 @@ RSpec.describe API::Ci::Jobs, feature_category: :continuous_integration do
   describe 'GET /projects/:id/jobs rate limited' do
     let(:query) { {} }
 
-    context 'with the ci_enforce_rate_limits_jobs_api feature flag on' do
-      before do
-        stub_feature_flags(ci_enforce_rate_limits_jobs_api: true)
-
-        allow_next_instance_of(Gitlab::ApplicationRateLimiter::BaseStrategy) do |strategy|
-          threshold = Gitlab::ApplicationRateLimiter.rate_limits[:jobs_index][:threshold]
-          allow(strategy).to receive(:increment).and_return(threshold + 1)
-        end
-
-        get api("/projects/#{project.id}/jobs", api_user), params: query
+    before do
+      allow_next_instance_of(Gitlab::ApplicationRateLimiter::BaseStrategy) do |strategy|
+        threshold = Gitlab::ApplicationRateLimiter.rate_limits[:jobs_index][:threshold]
+        allow(strategy).to receive(:increment).and_return(threshold + 1)
       end
 
-      it 'enforces rate limits for the endpoint' do
-        expect(response).to have_gitlab_http_status :too_many_requests
-        expect(json_response['message']['error']).to eq('This endpoint has been requested too many times. Try again later.')
-      end
+      get api("/projects/#{project.id}/jobs", api_user), params: query
     end
 
-    context 'with the ci_enforce_rate_limits_jobs_api feature flag off' do
-      before do
-        stub_feature_flags(ci_enforce_rate_limits_jobs_api: false)
-
-        allow_next_instance_of(Gitlab::ApplicationRateLimiter::BaseStrategy) do |strategy|
-          threshold = Gitlab::ApplicationRateLimiter.rate_limits[:jobs_index][:threshold]
-          allow(strategy).to receive(:increment).and_return(threshold + 1)
-        end
-
-        get api("/projects/#{project.id}/jobs", api_user), params: query
-      end
-
-      it 'makes a successful request' do
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(response).to include_limited_pagination_headers
-      end
+    it 'enforces rate limits for the endpoint' do
+      expect(response).to have_gitlab_http_status :too_many_requests
+      expect(json_response['message']['error']).to eq('This endpoint has been requested too many times. Try again later.')
     end
   end
 
diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml
index 1d6620f0bc8..724f45524d1 100644
--- a/spec/support/rspec_order_todo.yml
+++ b/spec/support/rspec_order_todo.yml
@@ -10072,7 +10072,6 @@
 - './spec/workers/dependency_proxy/cleanup_manifest_worker_spec.rb'
 - './spec/workers/dependency_proxy/image_ttl_group_policy_worker_spec.rb'
 - './spec/workers/deployments/archive_in_project_worker_spec.rb'
-- './spec/workers/deployments/drop_older_deployments_worker_spec.rb'
 - './spec/workers/deployments/hooks_worker_spec.rb'
 - './spec/workers/deployments/link_merge_request_worker_spec.rb'
 - './spec/workers/deployments/update_environment_worker_spec.rb'
diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb
index 0c1e9da0fb1..4309ec24a9e 100644
--- a/spec/workers/every_sidekiq_worker_spec.rb
+++ b/spec/workers/every_sidekiq_worker_spec.rb
@@ -205,7 +205,6 @@ RSpec.describe 'Every Sidekiq worker', feature_category: :shared do
         'DependencyProxy::CleanupBlobWorker' => 3,
         'DependencyProxy::CleanupManifestWorker' => 3,
         'Deployments::AutoRollbackWorker' => 3,
-        'Deployments::DropOlderDeploymentsWorker' => 3,
         'Deployments::FinishedWorker' => 3,
         'Deployments::ForwardDeploymentWorker' => 3,
         'Deployments::LinkMergeRequestWorker' => 3,