summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz.bizon@ntsn.pl>2015-12-14 14:25:18 +0100
committerGrzegorz Bizon <grzegorz.bizon@ntsn.pl>2015-12-14 14:25:18 +0100
commit9d2b8326b2c106389024a2c3e921fbb6283db748 (patch)
treefb6463b8403cdf45c2ff90fea0a297dcbb21d12a
parent32d83ee79fedc8760486ff40a2459ecb472fa51b (diff)
downloadgitlab-ce-9d2b8326b2c106389024a2c3e921fbb6283db748.tar.gz
Update commits spinach tests related to displaying build status
-rw-r--r--features/project/commits/commits.feature3
-rw-r--r--features/steps/project/commits/commits.rb4
2 files changed, 6 insertions, 1 deletions
diff --git a/features/project/commits/commits.feature b/features/project/commits/commits.feature
index 21367fd76a0..5bb2d0e976b 100644
--- a/features/project/commits/commits.feature
+++ b/features/project/commits/commits.feature
@@ -19,7 +19,8 @@ Feature: Project Commits
Scenario: I browse commit with ci from list
Given commit has ci status
- And I click on commit link
+ And repository contains ".gitlab-ci.yml" file
+ When I click on commit link
Then I see commit ci info
And I click status link
Then I see builds list
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index 101eb408ba1..a3141fe3be1 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -108,6 +108,10 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
create :ci_build, commit: ci_commit
end
+ step 'repository contains ".gitlab-ci.yml" file' do
+ allow_any_instance_of(Ci::Commit).to receive(:ci_yaml_file).and_return(String.new)
+ end
+
step 'I see commit ci info' do
expect(page).to have_content "build: pending"
end