diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-12-04 19:24:21 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2018-12-04 19:24:21 +0900 |
commit | e1449df7a2eccbdaeb807d60a1c67b249d6ec03e (patch) | |
tree | bdf46ae564f55fd0946d2520c005c18e8e83738e /spec/models/ci | |
parent | 5b24739eb30b6505ef652b526c7502bd961c5bc2 (diff) | |
download | gitlab-ce-e1449df7a2eccbdaeb807d60a1c67b249d6ec03e.tar.gz |
Fix coding offence
Diffstat (limited to 'spec/models/ci')
-rw-r--r-- | spec/models/ci/build_metadata_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/ci/build_trace_chunk_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/ci/job_artifact_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/ci/pipeline_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/ci/stage_spec.rb | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/spec/models/ci/build_metadata_spec.rb b/spec/models/ci/build_metadata_spec.rb index 37227469fcc..519968b9e48 100644 --- a/spec/models/ci/build_metadata_spec.rb +++ b/spec/models/ci/build_metadata_spec.rb @@ -1,8 +1,6 @@ require 'spec_helper' describe Ci::BuildMetadata do - it_behaves_like 'having unique enum values' - set(:user) { create(:user) } set(:group) { create(:group, :access_requestable) } set(:project) { create(:project, :repository, group: group, build_timeout: 2000) } @@ -17,6 +15,8 @@ describe Ci::BuildMetadata do let(:build) { create(:ci_build, pipeline: pipeline) } let(:build_metadata) { build.metadata } + it_behaves_like 'having unique enum values' + describe '#update_timeout_state' do subject { build_metadata } diff --git a/spec/models/ci/build_trace_chunk_spec.rb b/spec/models/ci/build_trace_chunk_spec.rb index 86a1f614eea..d214fdf369a 100644 --- a/spec/models/ci/build_trace_chunk_spec.rb +++ b/spec/models/ci/build_trace_chunk_spec.rb @@ -3,8 +3,6 @@ require 'spec_helper' describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do include ExclusiveLeaseHelpers - it_behaves_like 'having unique enum values' - set(:build) { create(:ci_build, :running) } let(:chunk_index) { 0 } let(:data_store) { :redis } @@ -14,6 +12,8 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do described_class.new(build: build, chunk_index: chunk_index, data_store: data_store, raw_data: raw_data) end + it_behaves_like 'having unique enum values' + before do stub_feature_flags(ci_enable_live_trace: true) stub_artifacts_object_storage diff --git a/spec/models/ci/job_artifact_spec.rb b/spec/models/ci/job_artifact_spec.rb index a5ab577b9b1..c68ba02b8de 100644 --- a/spec/models/ci/job_artifact_spec.rb +++ b/spec/models/ci/job_artifact_spec.rb @@ -1,8 +1,6 @@ require 'spec_helper' describe Ci::JobArtifact do - it_behaves_like 'having unique enum values' - let(:artifact) { create(:ci_job_artifact, :archive) } describe "Associations" do @@ -17,6 +15,8 @@ describe Ci::JobArtifact do it { is_expected.to delegate_method(:open).to(:file) } it { is_expected.to delegate_method(:exists?).to(:file) } + it_behaves_like 'having unique enum values' + describe '.test_reports' do subject { described_class.test_reports } diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index ebde70776ad..3fe351e78d5 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -1,8 +1,6 @@ require 'spec_helper' describe Ci::Pipeline, :mailer do - it_behaves_like 'having unique enum values' - let(:user) { create(:user) } set(:project) { create(:project) } @@ -10,6 +8,8 @@ describe Ci::Pipeline, :mailer do create(:ci_empty_pipeline, status: :created, project: project) end + it_behaves_like 'having unique enum values' + it { is_expected.to belong_to(:project) } it { is_expected.to belong_to(:user) } it { is_expected.to belong_to(:auto_canceled_by) } diff --git a/spec/models/ci/stage_spec.rb b/spec/models/ci/stage_spec.rb index 7559c533804..3228c400155 100644 --- a/spec/models/ci/stage_spec.rb +++ b/spec/models/ci/stage_spec.rb @@ -1,10 +1,10 @@ require 'spec_helper' describe Ci::Stage, :models do - it_behaves_like 'having unique enum values' - let(:stage) { create(:ci_stage_entity) } + it_behaves_like 'having unique enum values' + describe 'associations' do before do create(:ci_build, stage_id: stage.id) |