summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-02-10 16:14:18 -0600
committerEric Eastwood <contact@ericeastwood.com>2017-02-13 01:08:35 -0600
commitf2aa9b463086697771e2bf936a7d272307bcbd67 (patch)
tree197ce6117a976b10aa4de647cd8e47a5576c6fc8
parentb88e82ff0a1bca9687b5579208ba05a99e41a464 (diff)
downloadgitlab-ce-27939-fix-current-build-arrow.tar.gz
Fix current build arrow27939-fix-current-build-arrow
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27939
-rw-r--r--app/helpers/builds_helper.rb2
-rw-r--r--changelogs/unreleased/27939-fix-current-build-arrow.yml4
-rw-r--r--spec/features/projects/builds_spec.rb4
3 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/builds_helper.rb b/app/helpers/builds_helper.rb
index 9fc69e12266..ff937b5ebd2 100644
--- a/app/helpers/builds_helper.rb
+++ b/app/helpers/builds_helper.rb
@@ -1,7 +1,7 @@
module BuildsHelper
def sidebar_build_class(build, current_build)
build_class = ''
- build_class += ' active' if build == current_build
+ build_class += ' active' if build.id === current_build.id
build_class += ' retried' if build.retried?
build_class
end
diff --git a/changelogs/unreleased/27939-fix-current-build-arrow.yml b/changelogs/unreleased/27939-fix-current-build-arrow.yml
new file mode 100644
index 00000000000..280ab090f2c
--- /dev/null
+++ b/changelogs/unreleased/27939-fix-current-build-arrow.yml
@@ -0,0 +1,4 @@
+---
+title: Fix current build arrow indicator
+merge_request:
+author:
diff --git a/spec/features/projects/builds_spec.rb b/spec/features/projects/builds_spec.rb
index f7e0115643e..f1036b275f7 100644
--- a/spec/features/projects/builds_spec.rb
+++ b/spec/features/projects/builds_spec.rb
@@ -109,6 +109,10 @@ feature 'Builds', :feature do
expect(page).to have_content pipeline.git_commit_message
expect(page).to have_content pipeline.git_author_name
end
+
+ it 'shows active build' do
+ expect(page).to have_selector('.build-job.active')
+ end
end
context "Job from other project" do