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: Remove ci_enable_scheduled_build feature flag

---
 spec/services/ci/process_build_service_spec.rb     | 44 ++++------------------
 .../ci/run_scheduled_build_service_spec.rb         |  4 --
 2 files changed, 8 insertions(+), 40 deletions(-)

(limited to 'spec/services/ci')

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' }
-
-        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' }
+    context 'when current status is success' do
+      let(:current_status) { 'success' }
 
-        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 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' }
+    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)
-- 
cgit v1.2.3