diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-06 21:41:37 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-06 21:41:37 +0200 |
commit | 82b6a17ca70a20015e654b4a0fdb8aec6d244f95 (patch) | |
tree | 98b9229c66aa6605147ee9200635ce756bbd7562 /spec | |
parent | 27b75b2b2d9c274fca005949f645d97ce9333d71 (diff) | |
download | gitlab-ce-82b6a17ca70a20015e654b4a0fdb8aec6d244f95.tar.gz |
Fix ci build routing and few testsci-build-page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/ci/builds_spec.rb | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/spec/features/ci/builds_spec.rb b/spec/features/ci/builds_spec.rb index 07f76e4065c..aa0df59c04d 100644 --- a/spec/features/ci/builds_spec.rb +++ b/spec/features/ci/builds_spec.rb @@ -1,33 +1,31 @@ require 'spec_helper' describe "Builds" do - context :private_project do + before do + login_as(:user) + @commit = FactoryGirl.create :ci_commit + @build = FactoryGirl.create :ci_build, commit: @commit + @gl_project = @commit.project.gl_project + @gl_project.team << [@user, :master] + end + + describe "GET /:project/builds/:id/cancel" do before do - @commit = FactoryGirl.create :ci_commit - @build = FactoryGirl.create :ci_build, commit: @commit - login_as :user - @commit.project.gl_project.team << [@user, :master] + @build.run! + visit cancel_ci_project_build_path(@commit.project, @build) end - describe "GET /:project/builds/:id/cancel" do - before do - @build.run! - visit cancel_ci_project_build_path(@commit.project, @build) - end + it { expect(page).to have_content 'canceled' } + it { expect(page).to have_content 'Retry' } + end - it { expect(page).to have_content 'canceled' } - it { expect(page).to have_content 'Retry' } + describe "POST /:project/builds/:id/retry" do + before do + visit cancel_ci_project_build_path(@commit.project, @build) + click_link 'Retry' end - describe "POST /:project/builds/:id/retry" do - before do - @build.cancel! - visit ci_project_build_path(@commit.project, @build) - click_link 'Retry' - end - - it { expect(page).to have_content 'pending' } - it { expect(page).to have_content 'Cancel' } - end + it { expect(page).to have_content 'pending' } + it { expect(page).to have_content 'Cancel' } end end |