diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-09-26 15:13:39 +0900 |
---|---|---|
committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-10-02 17:08:11 +0200 |
commit | 6eee8d2d53a327051515ec18953726fd5606c000 (patch) | |
tree | eaa41f674dda46bf1407869645b1994198485f35 | |
parent | af4b85cef57c00f4cccdac7fde15d4c69d9e94fb (diff) | |
download | gitlab-ce-6eee8d2d53a327051515ec18953726fd5606c000.tar.gz |
Fix process build service spec
-rw-r--r-- | spec/factories/ci/builds.rb | 9 | ||||
-rw-r--r-- | spec/services/ci/enqueue_build_service_spec.rb | 16 | ||||
-rw-r--r-- | spec/services/ci/process_build_service_spec.rb | 61 |
3 files changed, 70 insertions, 16 deletions
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb index 9813190925b..aea6b5d6b2f 100644 --- a/spec/factories/ci/builds.rb +++ b/spec/factories/ci/builds.rb @@ -98,6 +98,15 @@ FactoryBot.define do success end + trait :schedulable do + self.when 'delayed' + options start_in: '1 minute' + end + + trait :actionable do + self.when 'manual' + end + trait :retried do retried true end diff --git a/spec/services/ci/enqueue_build_service_spec.rb b/spec/services/ci/enqueue_build_service_spec.rb deleted file mode 100644 index e41b8e4800b..00000000000 --- a/spec/services/ci/enqueue_build_service_spec.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true -require 'spec_helper' - -describe Ci::EnqueueBuildService, '#execute' do - let(:user) { create(:user) } - let(:project) { create(:project) } - let(:ci_build) { create(:ci_build, :created) } - - subject { described_class.new(project, user).execute(ci_build) } - - it 'enqueues the build' do - subject - - expect(ci_build.pending?).to be_truthy - end -end diff --git a/spec/services/ci/process_build_service_spec.rb b/spec/services/ci/process_build_service_spec.rb new file mode 100644 index 00000000000..74a81af75f2 --- /dev/null +++ b/spec/services/ci/process_build_service_spec.rb @@ -0,0 +1,61 @@ +# frozen_string_literal: true +require 'spec_helper' + +describe Ci::ProcessBuildService, '#execute' do + let(:user) { create(:user) } + let(:project) { create(:project) } + + subject { described_class.new(project, user).execute(build) } + + before do + project.add_maintainer(user) + end + + context 'when build is schedulable' do + let(:build) { create(:ci_build, :created, :schedulable, user: user, project: project) } + + context 'when ci_enable_scheduled_build feature flag is enabled' do + before do + stub_feature_flags(ci_enable_scheduled_build: true) + end + + it 'schedules the build' do + subject + + expect(build).to be_scheduled + end + end + + context 'when ci_enable_scheduled_build feature flag is disabled' do + before do + stub_feature_flags(ci_enable_scheduled_build: false) + end + + it 'enqueues the build' do + subject + + expect(build).to be_pending + end + end + end + + context 'when build is actionable' do + let(:build) { create(:ci_build, :created, :actionable, user: user, project: project) } + + it 'actionizes the build' do + subject + + expect(build).to be_manual + end + end + + context 'when build does not have any actions' do + let(:build) { create(:ci_build, :created, user: user, project: project) } + + it 'enqueues the build' do + subject + + expect(build).to be_pending + end + end +end |