From 84ec7137c5599e9f35ad083670a9778fe8b79b19 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Fri, 2 Nov 2018 11:32:45 +0000
Subject: [PATCH] Remove ci_enable_scheduled_build feature flag

---
 app/models/ci/build.rb                        |  3 +-
 ...ci_enable_scheduled_build-feature-flag.yml |  5 +++
 spec/models/ci/build_spec.rb                  | 12 -----
 .../services/ci/process_build_service_spec.rb | 44 ++++---------------
 .../ci/run_scheduled_build_service_spec.rb    |  4 --
 5 files changed, 14 insertions(+), 54 deletions(-)
 create mode 100644 changelogs/unreleased/remove-ci_enable_scheduled_build-feature-flag.yml

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index d73c02ba5d7..bb5d52fc78d 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -259,8 +259,7 @@ module Ci
     end
 
     def schedulable?
-      Feature.enabled?('ci_enable_scheduled_build', default_enabled: true) &&
-        self.when == 'delayed' && options[:start_in].present?
+      self.when == 'delayed' && options[:start_in].present?
     end
 
     def options_scheduled_at
diff --git a/changelogs/unreleased/remove-ci_enable_scheduled_build-feature-flag.yml b/changelogs/unreleased/remove-ci_enable_scheduled_build-feature-flag.yml
new file mode 100644
index 00000000000..ce52a487551
--- /dev/null
+++ b/changelogs/unreleased/remove-ci_enable_scheduled_build-feature-flag.yml
@@ -0,0 +1,5 @@
+---
+title: Remove `ci_enable_scheduled_build` feature flag
+merge_request: 22742
+author:
+type: other
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 65e06f27f35..13a4aaa8936 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -216,14 +216,6 @@ describe Ci::Build do
       let(:build) { create(:ci_build, :created, :schedulable, project: project) }
 
       it { expect(subject).to be_truthy }
-
-      context 'when feature flag is diabled' do
-        before do
-          stub_feature_flags(ci_enable_scheduled_build: false)
-        end
-
-        it { expect(subject).to be_falsy }
-      end
     end
 
     context 'when build is not schedulable' do
@@ -327,10 +319,6 @@ describe Ci::Build do
   describe '#enqueue_scheduled' do
     subject { build.enqueue_scheduled }
 
-    before do
-      stub_feature_flags(ci_enable_scheduled_build: true)
-    end
-
     context 'when build is scheduled and the right time has not come yet' do
       let(:build) { create(:ci_build, :scheduled, pipeline: pipeline) }
 
diff --git a/spec/services/ci/process_build_service_spec.rb b/spec/services/ci/process_build_service_spec.rb
index 9a53b32394d..704685417bb 100644
--- a/spec/services/ci/process_build_service_spec.rb
+++ b/spec/services/ci/process_build_service_spec.rb
@@ -98,47 +98,19 @@ describe Ci::ProcessBuildService, '#execute' do
 
     let(:build) { create(:ci_build, :created, :schedulable, user: user, project: project) }
 
-    context 'when ci_enable_scheduled_build is enabled' do
-      before do
-        stub_feature_flags(ci_enable_scheduled_build: true)
-      end
+    context 'when current status is success' do
+      let(:current_status) { 'success' }
 
-      context 'when current status is success' do
-        let(:current_status) { 'success' }
-
-        it 'changes the build status' do
-          expect { subject }.to change { build.status }.to('scheduled')
-        end
-      end
-
-      context 'when current status is failed' do
-        let(:current_status) { 'failed' }
-
-        it 'does not change the build status' do
-          expect { subject }.to change { build.status }.to('skipped')
-        end
+      it 'changes the build status' do
+        expect { subject }.to change { build.status }.to('scheduled')
       end
     end
 
-    context 'when ci_enable_scheduled_build is disabled' do
-      before do
-        stub_feature_flags(ci_enable_scheduled_build: false)
-      end
+    context 'when current status is failed' do
+      let(:current_status) { 'failed' }
 
-      context 'when current status is success' do
-        let(:current_status) { 'success' }
-
-        it 'changes the build status' do
-          expect { subject }.to change { build.status }.to('manual')
-        end
-      end
-
-      context 'when current status is failed' do
-        let(:current_status) { 'failed' }
-
-        it 'does not change the build status' do
-          expect { subject }.to change { build.status }.to('skipped')
-        end
+      it 'does not change the build status' do
+        expect { subject }.to change { build.status }.to('skipped')
       end
     end
   end
diff --git a/spec/services/ci/run_scheduled_build_service_spec.rb b/spec/services/ci/run_scheduled_build_service_spec.rb
index 2c921dac238..be2aad33ef4 100644
--- a/spec/services/ci/run_scheduled_build_service_spec.rb
+++ b/spec/services/ci/run_scheduled_build_service_spec.rb
@@ -7,10 +7,6 @@ describe Ci::RunScheduledBuildService do
 
   subject { described_class.new(project, user).execute(build) }
 
-  before do
-    stub_feature_flags(ci_enable_scheduled_build: true)
-  end
-
   context 'when user can update build' do
     before do
       project.add_developer(user)