summaryrefslogtreecommitdiff
path: root/spec/features/admin
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-03 12:29:00 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-03 12:29:00 +0200
commit717fdd6d42f119dd1e0f457c40563cc35985fbae (patch)
treecdcb1a8167a809c8c203d50dcff65ef44d0eace2 /spec/features/admin
parentb2acebb4efdf8023f685cfd14489c49e56d126a7 (diff)
downloadgitlab-ce-717fdd6d42f119dd1e0f457c40563cc35985fbae.tar.gz
Rename Ci::Build commit to pipeline
Diffstat (limited to 'spec/features/admin')
-rw-r--r--spec/features/admin/admin_builds_spec.rb24
-rw-r--r--spec/features/admin/admin_runners_spec.rb2
2 files changed, 13 insertions, 13 deletions
diff --git a/spec/features/admin/admin_builds_spec.rb b/spec/features/admin/admin_builds_spec.rb
index 7bbe20fec43..f5aedcb0545 100644
--- a/spec/features/admin/admin_builds_spec.rb
+++ b/spec/features/admin/admin_builds_spec.rb
@@ -11,10 +11,10 @@ describe 'Admin Builds' do
context 'All tab' do
context 'when have builds' do
it 'shows all builds' do
- create(:ci_build, commit: commit, status: :pending)
- create(:ci_build, commit: commit, status: :running)
- create(:ci_build, commit: commit, status: :success)
- create(:ci_build, commit: commit, status: :failed)
+ create(:ci_build, pipeline: commit, status: :pending)
+ create(:ci_build, pipeline: commit, status: :running)
+ create(:ci_build, pipeline: commit, status: :success)
+ create(:ci_build, pipeline: commit, status: :failed)
visit admin_builds_path
@@ -39,9 +39,9 @@ describe 'Admin Builds' do
context 'Running tab' do
context 'when have running builds' do
it 'shows running builds' do
- build1 = create(:ci_build, commit: commit, status: :pending)
- build2 = create(:ci_build, commit: commit, status: :success)
- build3 = create(:ci_build, commit: commit, status: :failed)
+ build1 = create(:ci_build, pipeline: commit, status: :pending)
+ build2 = create(:ci_build, pipeline: commit, status: :success)
+ build3 = create(:ci_build, pipeline: commit, status: :failed)
visit admin_builds_path(scope: :running)
@@ -55,7 +55,7 @@ describe 'Admin Builds' do
context 'when have no builds running' do
it 'shows a message' do
- create(:ci_build, commit: commit, status: :success)
+ create(:ci_build, pipeline: commit, status: :success)
visit admin_builds_path(scope: :running)
@@ -69,9 +69,9 @@ describe 'Admin Builds' do
context 'Finished tab' do
context 'when have finished builds' do
it 'shows finished builds' do
- build1 = create(:ci_build, commit: commit, status: :pending)
- build2 = create(:ci_build, commit: commit, status: :running)
- build3 = create(:ci_build, commit: commit, status: :success)
+ build1 = create(:ci_build, pipeline: commit, status: :pending)
+ build2 = create(:ci_build, pipeline: commit, status: :running)
+ build3 = create(:ci_build, pipeline: commit, status: :success)
visit admin_builds_path(scope: :finished)
@@ -85,7 +85,7 @@ describe 'Admin Builds' do
context 'when have no builds finished' do
it 'shows a message' do
- create(:ci_build, commit: commit, status: :running)
+ create(:ci_build, pipeline: commit, status: :running)
visit admin_builds_path(scope: :finished)
diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
index 8ebd4a6808e..2c87a25913b 100644
--- a/spec/features/admin/admin_runners_spec.rb
+++ b/spec/features/admin/admin_runners_spec.rb
@@ -9,7 +9,7 @@ describe "Admin Runners" do
before do
runner = FactoryGirl.create(:ci_runner)
commit = FactoryGirl.create(:ci_commit)
- FactoryGirl.create(:ci_build, commit: commit, runner_id: runner.id)
+ FactoryGirl.create(:ci_build, pipeline: commit, runner_id: runner.id)
visit admin_runners_path
end