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:
authorRémy Coutable <remy@rymai.me>2016-06-10 15:41:38 +0300
committerRémy Coutable <remy@rymai.me>2016-06-10 15:41:38 +0300
commit3579edba1f0d27095502775c64bdd73a3927dca7 (patch)
treeaab16f576eff2927448e85adc41d2de2b04c566b /spec/features
parent5324c9364346f74ea73c6be27785704e8e2281f8 (diff)
Rename ci_commit -> pipeline
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb b/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
index 52612c91824..65e9185ec24 100644
--- a/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
+++ b/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
@@ -19,7 +19,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
end
context 'when project has CI enabled' do
- let(:ci_commit) { create(:ci_empty_pipeline, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
+ let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
context 'when merge requests can only be merged if the build succeeds' do
before do
@@ -27,7 +27,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
end
context 'when CI is running' do
- before { ci_commit.update_column(:status, :running) }
+ before { pipeline.update_column(:status, :running) }
it 'does not allow to merge immediately' do
visit_merge_request(merge_request)
@@ -38,7 +38,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
end
context 'when CI failed' do
- before { ci_commit.update_column(:status, :failed) }
+ before { pipeline.update_column(:status, :failed) }
it 'does not allow MR to be merged' do
visit_merge_request(merge_request)
@@ -49,7 +49,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
end
context 'when CI succeeded' do
- before { ci_commit.update_column(:status, :success) }
+ before { pipeline.update_column(:status, :success) }
it 'allows MR to be merged' do
visit_merge_request(merge_request)
@@ -65,7 +65,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
end
context 'when CI is running' do
- before { ci_commit.update_column(:status, :running) }
+ before { pipeline.update_column(:status, :running) }
it 'allows MR to be merged immediately', js: true do
visit_merge_request(merge_request)
@@ -78,7 +78,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
end
context 'when CI failed' do
- before { ci_commit.update_column(:status, :failed) }
+ before { pipeline.update_column(:status, :failed) }
it 'allows MR to be merged' do
visit_merge_request(merge_request)
@@ -88,7 +88,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
end
context 'when CI succeeded' do
- before { ci_commit.update_column(:status, :success) }
+ before { pipeline.update_column(:status, :success) }
it 'allows MR to be merged' do
visit_merge_request(merge_request)