summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-12-17 17:51:22 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2015-12-17 17:51:22 +0100
commit742089ae04f60012a15564a3efc4d3152ff4bcdb (patch)
tree3d1b3d0e38b9e19a02af3eb17c57a70960b9e461 /spec
parent58a56a03967a407bf376f960809d3398a3153645 (diff)
downloadgitlab-ce-742089ae04f60012a15564a3efc4d3152ff4bcdb.tar.gz
Fix feature specs: we always show the build status if ci_commit is presentci-commit-status-skipped
Diffstat (limited to 'spec')
-rw-r--r--spec/features/commits_spec.rb29
1 files changed, 6 insertions, 23 deletions
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index ecc85376ffc..fe7f07f5b75 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -19,30 +19,13 @@ describe 'Commits' do
let!(:build) { FactoryGirl.create :ci_build, commit: commit }
describe 'Project commits' do
- context 'builds enabled' do
- context '.gitlab-ci.yml found' do
- before do
- visit namespace_project_commits_path(project.namespace, project, :master)
- end
-
- it 'should show build status' do
- page.within("//li[@id='commit-#{commit.short_sha}']") do
- expect(page).to have_css(".ci-status-link")
- end
- end
- end
+ before do
+ visit namespace_project_commits_path(project.namespace, project, :master)
+ end
- context 'no .gitlab-ci.yml found' do
- before do
- stub_ci_commit_yaml_file(nil)
- visit namespace_project_commits_path(project.namespace, project, :master)
- end
-
- it 'should not show build status' do
- page.within("//li[@id='commit-#{commit.short_sha}']") do
- expect(page).to have_no_css(".ci-status-link")
- end
- end
+ it 'should show build status' do
+ page.within("//li[@id='commit-#{commit.short_sha}']") do
+ expect(page).to have_css(".ci-status-link")
end
end
end