Show CI status on commit pagebuild-status-on-commit-page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3 files changed, 15 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index b1e61ddf8e7..4a34a3835a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ v 8.1.0 (unreleased)
   - Move CI charts to project graphs area
   - Fix cases where Markdown did not render links in activity feed (Stan Hu)
   - Add first and last to pagination (Zeger-Jan van de Weg)
+  - Show CI status on commit page
 
 v 8.0.2 (unreleased)
   - Skip check_initd_configured_correctly on omnibus installs
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