From 70cf9562106d88dd195f850de0147e3bfc939bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Thu, 18 Feb 2021 20:34:24 +0100
Subject: [PATCH] Extract method to check the current phase

---
 app/components/budgets/phases_component.html.erb | 2 +-
 app/models/budget/phase.rb                       | 4 ++++
 app/views/admin/budgets/_form.html.erb           | 2 +-
 spec/system/admin/budgets_spec.rb                | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/components/budgets/phases_component.html.erb b/app/components/budgets/phases_component.html.erb
index 6f2d0596a..fa0db2ffa 100644
--- a/app/components/budgets/phases_component.html.erb
+++ b/app/components/budgets/phases_component.html.erb
@@ -1,6 +1,6 @@
 <ul class="no-bullet budget-phases">
   <% budget.published_phases.each do |phase| %>
-    <li class="phase <%= "is-active" if phase == budget.current_phase %>">
+    <li class="phase <%= "is-active" if phase.current? %>">
       <h3><%= t("budgets.phase.#{phase.kind}") %></h3>
       <span>
         <%= l(phase.starts_at.to_date, format: :long) if phase.starts_at.present? %>
diff --git a/app/models/budget/phase.rb b/app/models/budget/phase.rb
index d8b59207f..022937ce1 100644
--- a/app/models/budget/phase.rb
+++ b/app/models/budget/phase.rb
@@ -62,6 +62,10 @@ class Budget
       in_phase_or_later?("balloting")
     end
 
+    def current?
+      budget.current_phase == self
+    end
+
     private
 
       def adjust_date_ranges
diff --git a/app/views/admin/budgets/_form.html.erb b/app/views/admin/budgets/_form.html.erb
index 4702a7ae2..990dfecc5 100644
--- a/app/views/admin/budgets/_form.html.erb
+++ b/app/views/admin/budgets/_form.html.erb
@@ -60,7 +60,7 @@
           <tr id="<%= dom_id(phase) %>" class="phase">
             <td>
               <%= t("budgets.phase.#{phase.kind}") %>
-              <% if @budget.current_phase == phase %>
+              <% if phase.current? %>
                 <span class="label success"><strong><%= t("admin.budgets.edit.active") %></strong></span>
               <% end %>
             </td>
diff --git a/spec/system/admin/budgets_spec.rb b/spec/system/admin/budgets_spec.rb
index 0fb597c31..f98142389 100644
--- a/spec/system/admin/budgets_spec.rb
+++ b/spec/system/admin/budgets_spec.rb
@@ -273,7 +273,7 @@ describe "Admin budgets", :admin do
             expect(page).to have_content("#{phase.starts_at.to_date} - #{phase.ends_at.to_date}")
             expect(page).to have_css(".budget-phase-enabled.enabled")
             expect(page).to have_link("Edit phase", href: edit_phase_link)
-            expect(page).to have_content("Active") if budget.current_phase == phase
+            expect(page).to have_content("Active") if phase.current?
           end
         end
       end