From 534ef9c49288ec762e67cbda1eec309832a75787 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 12 Dec 2018 14:32:22 +0100
Subject: [PATCH] Hides process on index if draft dates match with date current

---
 app/models/legislation/process.rb       |  4 +--
 spec/models/legislation/process_spec.rb | 44 ++++++++++++++++++-------
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb
index c1ef33430..28e0b35c3 100644
--- a/app/models/legislation/process.rb
+++ b/app/models/legislation/process.rb
@@ -50,8 +50,8 @@ class Legislation::Process < ActiveRecord::Base
 
   scope :published, -> { where(published: true) }
   scope :not_in_draft, -> { where("draft_phase_enabled = false or (draft_start_date IS NOT NULL and
-                                   draft_end_date IS NOT NULL and (draft_start_date >= ? or
-                                   draft_end_date <= ?))", Date.current, Date.current) }
+                                   draft_end_date IS NOT NULL and (draft_start_date > ? or
+                                   draft_end_date < ?))", Date.current, Date.current) }
 
   def draft_phase
     Legislation::Process::Phase.new(draft_start_date, draft_end_date, draft_phase_enabled)
diff --git a/spec/models/legislation/process_spec.rb b/spec/models/legislation/process_spec.rb
index a7f1a49b0..b921ffcdb 100644
--- a/spec/models/legislation/process_spec.rb
+++ b/spec/models/legislation/process_spec.rb
@@ -99,14 +99,6 @@ describe Legislation::Process do
                                               end_date: Date.current + 3.days) }
     let!(:process_3) { create(:legislation_process, start_date: Date.current - 4.days,
                                               end_date: Date.current - 3.days) }
-    let!(:process_4) { create(:legislation_process, draft_start_date: Date.current - 3.days,
-                                              draft_end_date: Date.current - 2.days) }
-    let!(:process_5) { create(:legislation_process, draft_start_date: Date.current - 2.days,
-                                              draft_end_date: Date.current + 2.days,
-                                              draft_phase_enabled: false) }
-    let!(:process_6) { create(:legislation_process, draft_start_date: Date.current - 2.days,
-                                              draft_end_date: Date.current + 2.days,
-                                              draft_phase_enabled: true) }
 
     it "filters open" do
       open_processes = ::Legislation::Process.open
@@ -117,11 +109,39 @@ describe Legislation::Process do
     end
 
     it "filters draft phase" do
-      draft_processes = ::Legislation::Process.not_in_draft
+      process_before_draft = create(
+        :legislation_process,
+        draft_start_date: Date.current - 3.days,
+        draft_end_date: Date.current - 2.days
+      )
 
-      expect(draft_processes).to include(process_4)
-      expect(draft_processes).to include(process_5)
-      expect(draft_processes).not_to include(process_6)
+      process_with_draft_disabled = create(
+        :legislation_process,
+        draft_start_date: Date.current - 2.days,
+        draft_end_date: Date.current + 2.days,
+        draft_phase_enabled: false
+      )
+
+      process_with_draft_enabled = create(
+        :legislation_process,
+        draft_start_date: Date.current - 2.days,
+        draft_end_date: Date.current + 2.days,
+        draft_phase_enabled: true
+      )
+
+      process_with_draft_only_today = create(
+        :legislation_process,
+        draft_start_date: Date.current,
+        draft_end_date: Date.current,
+        draft_phase_enabled: true
+      )
+
+      processes_not_in_draft = ::Legislation::Process.not_in_draft
+
+      expect(processes_not_in_draft).to include(process_before_draft)
+      expect(processes_not_in_draft).to include(process_with_draft_disabled)
+      expect(processes_not_in_draft).not_to include(process_with_draft_enabled)
+      expect(processes_not_in_draft).not_to include(process_with_draft_only_today)
     end
 
     it "filters next" do