Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-08-02 22:55:11 +0300
committerRobert Speicher <rspeicher@gmail.com>2017-08-03 00:47:31 +0300
commit72a7b30c9f363063449b28aa9efc3a26a1752f9f (patch)
tree173a716da52260e57a73c4a6d739fe055898d556 /spec/models/ci
parente2c3dca371f8dca8814a5924fe8ed271f0ec6399 (diff)
Change all `:empty_project` to `:project`
Diffstat (limited to 'spec/models/ci')
-rw-r--r--spec/models/ci/pipeline_spec.rb8
-rw-r--r--spec/models/ci/runner_spec.rb12
-rw-r--r--spec/models/ci/trigger_spec.rb2
3 files changed, 11 insertions, 11 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index b0efa689a07..f63ff19c2fc 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -4,7 +4,7 @@ describe Ci::Pipeline do
include EmailHelpers
let(:user) { create(:user) }
- let(:project) { create(:empty_project) }
+ let(:project) { create(:project) }
let(:pipeline) do
create(:ci_empty_pipeline, status: :created, project: project)
@@ -93,7 +93,7 @@ describe Ci::Pipeline do
end
describe "coverage" do
- let(:project) { create(:empty_project, build_coverage_regex: "/.*/") }
+ let(:project) { create(:project, build_coverage_regex: "/.*/") }
let(:pipeline) { create(:ci_empty_pipeline, project: project) }
it "calculates average when there are two builds with coverage" do
@@ -1147,7 +1147,7 @@ describe Ci::Pipeline do
end
describe "#merge_requests" do
- let(:project) { create(:empty_project) }
+ let(:project) { create(:project) }
let(:pipeline) { create(:ci_empty_pipeline, status: 'created', project: project, ref: 'master', sha: 'a288a022a53a5a944fae87bcec6efc87b7061808') }
it "returns merge requests whose `diff_head_sha` matches the pipeline's SHA" do
@@ -1172,7 +1172,7 @@ describe Ci::Pipeline do
end
describe "#all_merge_requests" do
- let(:project) { create(:empty_project) }
+ let(:project) { create(:project) }
let(:pipeline) { create(:ci_empty_pipeline, status: 'created', project: project, ref: 'master') }
it "returns all merge requests having the same source branch" do
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index 8d12a9c09ca..48f878bbee6 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -37,7 +37,7 @@ describe Ci::Runner do
end
describe '#assign_to' do
- let!(:project) { FactoryGirl.create :empty_project }
+ let!(:project) { FactoryGirl.create :project }
let!(:shared_runner) { FactoryGirl.create(:ci_runner, :shared) }
before do
@@ -339,8 +339,8 @@ describe Ci::Runner do
describe '.assignable_for' do
let(:runner) { create(:ci_runner) }
- let(:project) { create(:empty_project) }
- let(:another_project) { create(:empty_project) }
+ let(:project) { create(:project) }
+ let(:another_project) { create(:project) }
before do
project.runners << runner
@@ -400,8 +400,8 @@ describe Ci::Runner do
describe "belongs_to_one_project?" do
it "returns false if there are two projects runner assigned to" do
runner = FactoryGirl.create(:ci_runner)
- project = FactoryGirl.create(:empty_project)
- project1 = FactoryGirl.create(:empty_project)
+ project = FactoryGirl.create(:project)
+ project1 = FactoryGirl.create(:project)
project.runners << runner
project1.runners << runner
@@ -410,7 +410,7 @@ describe Ci::Runner do
it "returns true" do
runner = FactoryGirl.create(:ci_runner)
- project = FactoryGirl.create(:empty_project)
+ project = FactoryGirl.create(:project)
project.runners << runner
expect(runner.belongs_to_one_project?).to be_truthy
diff --git a/spec/models/ci/trigger_spec.rb b/spec/models/ci/trigger_spec.rb
index de51f4879fd..bd9c837402f 100644
--- a/spec/models/ci/trigger_spec.rb
+++ b/spec/models/ci/trigger_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Ci::Trigger do
- let(:project) { create :empty_project }
+ let(:project) { create :project }
describe 'associations' do
it { is_expected.to belong_to(:project) }