From eee31ac5debab9dc0ef1252156420577d5f93d31 Mon Sep 17 00:00:00 2001 From: Justin Sherrill Date: Fri, 3 Jul 2015 10:34:58 -0400 Subject: [PATCH] fixes #10996 - ignore content view histories without tasks --- app/models/katello/content_view_version.rb | 2 +- test/models/content_view_version_test.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/katello/content_view_version.rb b/app/models/katello/content_view_version.rb index 9d41219e830..d0f959699d7 100644 --- a/app/models/katello/content_view_version.rb +++ b/app/models/katello/content_view_version.rb @@ -85,7 +85,7 @@ def to_s delegate :organization, to: :content_view def active_history - self.history.select { |history| history.task.pending } + self.history.select { |history| history.task.try(:pending) } end def last_event diff --git a/test/models/content_view_version_test.rb b/test/models/content_view_version_test.rb index 0c22b8fac6c..be9f0b8cf77 100644 --- a/test/models/content_view_version_test.rb +++ b/test/models/content_view_version_test.rb @@ -70,6 +70,11 @@ def test_docker_count assert_equal tag_count, cvv.docker_tag_count end + def test_active_history_nil_task + @cvv.history = [ContentViewHistory.new(:status => ContentViewHistory::IN_PROGRESS, :user => 'admin')] + assert_empty @cvv.active_history + end + def test_search_equal_version assert_includes ContentViewVersion.search_for("version = 1.0"), @cvv query = ContentViewVersion.search_for("version = 1")