summaryrefslogtreecommitdiff
path: root/spec/features/ci
diff options
context:
space:
mode:
Diffstat (limited to 'spec/features/ci')
-rw-r--r--spec/features/ci/builds_spec.rb42
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