From 65d67e16a3ddf9ead79a805dbe37bb69425ea9f6 Mon Sep 17 00:00:00 2001
From: Martin Lensment <mlensment@gmail.com>
Date: Mon, 10 Aug 2015 17:36:14 +0300
Subject: [PATCH] Fix tests #2845

---
 db/structure.sql           |  8 ++++----
 spec/models/domain_spec.rb | 25 +++++++++++++++++++++----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/db/structure.sql b/db/structure.sql
index f4627c3d2..62d98a861 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -93,7 +93,7 @@ CREATE FUNCTION generate_zonefile(i_origin character varying) RETURNS text
             FROM domains d
             JOIN nameservers ns ON ns.domain_id = d.id
             WHERE d.name LIKE include_filter AND d.name NOT LIKE exclude_filter
-            AND NOT ('{serverHold}' && d.statuses)
+            AND NOT ('{serverHold,clientHold}' && d.statuses)
             ORDER BY d.name
           ),
           chr(10)
@@ -115,7 +115,7 @@ CREATE FUNCTION generate_zonefile(i_origin character varying) RETURNS text
             AND ns.hostname LIKE '%.' || d.name
             AND d.name <> i_origin
             AND ns.ipv4 IS NOT NULL AND ns.ipv4 <> ''
-            AND NOT ('{serverHold}' && d.statuses)
+            AND NOT ('{serverHold,clientHold}' && d.statuses)
           ), chr(10)
         ) INTO tmp_var;
 
@@ -135,7 +135,7 @@ CREATE FUNCTION generate_zonefile(i_origin character varying) RETURNS text
             AND ns.hostname LIKE '%.' || d.name
             AND d.name <> i_origin
             AND ns.ipv6 IS NOT NULL AND ns.ipv6 <> ''
-            AND NOT ('{serverHold}' && d.statuses)
+            AND NOT ('{serverHold,clientHold}' && d.statuses)
           ), chr(10)
         ) INTO tmp_var;
 
@@ -151,7 +151,7 @@ CREATE FUNCTION generate_zonefile(i_origin character varying) RETURNS text
             FROM domains d
             JOIN dnskeys dk ON dk.domain_id = d.id
             WHERE d.name LIKE include_filter AND d.name NOT LIKE exclude_filter AND dk.flags = 257
-            AND NOT ('{serverHold}' && d.statuses)
+            AND NOT ('{serverHold,clientHold}' && d.statuses)
             ),
           chr(10)
         ) INTO tmp_var;
diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb
index 0befd7e09..1b9f7568f 100644
--- a/spec/models/domain_spec.rb
+++ b/spec/models/domain_spec.rb
@@ -236,7 +236,10 @@ describe Domain do
         DomainStatus::PENDING_TRANSFER,
         DomainStatus::PENDING_RENEW,
         DomainStatus::PENDING_CREATE,
-        DomainStatus::CLIENT_HOLD
+        DomainStatus::CLIENT_HOLD,
+        DomainStatus::EXPIRED,
+        DomainStatus::SERVER_HOLD,
+        DomainStatus::DELETE_CANDIDATE,
       ]
 
       @domain.save
@@ -244,18 +247,32 @@ describe Domain do
       @domain.set_force_delete
 
       @domain.statuses.should match_array([
+        "clientHold",
+        "deleteCandidate",
+        "expired",
         "forceDelete",
         "pendingDelete",
+        "serverHold",
         "serverManualInzone",
         "serverRenewProhibited",
         "serverTransferProhibited",
-        "serverUpdateProhibited",
-        "clientHold"
+        "serverUpdateProhibited"
       ])
 
       @domain.unset_force_delete
 
-      @domain.statuses.should == ['clientHold']
+      @domain.statuses.should match_array([
+        "clientDeleteProhibited",
+        "clientHold",
+        "deleteCandidate",
+        "expired",
+        "pendingCreate",
+        "pendingRenew",
+        "pendingTransfer",
+        "pendingUpdate",
+        "serverDeleteProhibited",
+        "serverHold"
+      ])
     end
 
     it 'should set expired status and update outzone_at and delete_at' do