summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-24 11:40:48 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-24 11:40:48 +0200
commit2be714dcf61842e41d0432fae3abdf1a09215012 (patch)
treeae1576456b28a39c8e284a8e51c02b073c568944 /features
parent9c4307e287cade71c180c4c37fb14a018cf9fe28 (diff)
downloadgitlab-ce-2be714dcf61842e41d0432fae3abdf1a09215012.tar.gz
Show CI status on commit pagebuild-status-on-commit-page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r--features/project/commits/commits.feature5
-rw-r--r--features/steps/project/commits/commits.rb9
2 files changed, 14 insertions, 0 deletions
diff --git a/features/project/commits/commits.feature b/features/project/commits/commits.feature
index 3ebc8a39aae..34161b81d44 100644
--- a/features/project/commits/commits.feature
+++ b/features/project/commits/commits.feature
@@ -16,6 +16,11 @@ Feature: Project Commits
Then I see commit info
And I see side-by-side diff button
+ Scenario: I browse commit with ci from list
+ Given commit has ci status
+ And I click on commit link
+ Then I see commit ci info
+
Scenario: I browse commit with side-by-side diff view
Given I click on commit link
And I click side-by-side diff button
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index 23e67371f96..56f1f06fb06 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -101,4 +101,13 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
step 'I click side-by-side diff button' do
find('#parallel-diff-btn').click
end
+
+ step 'commit has ci status' do
+ @project.enable_ci(@user)
+ create :ci_commit, project: @project.gitlab_ci_project, sha: sample_commit.id
+ end
+
+ step 'I see commit ci info' do
+ expect(page).to have_content "build: skipped"
+ end
end