Merge branch '104525314-domain-object-states' into staging to apply bug fixes

app/controllers/admin/domains_controller.rb

@@ -46,6 +46,7 @@ class Admin::DomainsController < AdminController
 
   def update
     dp = ignore_empty_statuses
+    @domain.is_admin = true
 
     if @domain.update(dp)
       flash[:notice] = I18n.t('domain_updated')

app/models/domain.rb

@@ -401,7 +401,7 @@ class Domain < ActiveRecord::Base
   def clean_pendings!
     preclean_pendings
     self.pending_json = {}
-    statuses.delete[DomainStatus::PENDING_DELETE_CONFIRMATION]
+    statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION)
     statuses.delete(DomainStatus::PENDING_UPDATE)
     statuses.delete(DomainStatus::PENDING_DELETE)
     status_notes[DomainStatus::PENDING_UPDATE] = ''

app/models/epp/domain.rb

@@ -513,7 +513,7 @@ class Epp::Domain < Domain
     return false unless valid?
 
     if Setting.request_confirmation_on_domain_deletion_enabled &&
-       frame.css('delete').attr('verified').to_s.downcase != 'yes'
+       frame.css('delete').children.css('delete').attr('verified').to_s.downcase != 'yes'
 
       registrant_verification_asked!(frame.to_s, user_id)
       self.deliver_emails = true # turn on email delivery for epp

spec/epp/domain_spec.rb

@@ -2444,14 +2444,9 @@ describe 'EPP Domain', epp: true do
       })
 
       response = epp_plain_request(xml)
-      response[:results][0][:msg].should ==
+      response[:results][0][:msg].should start_with
         "Element '{https://epp.tld.ee/schema/domain-eis-1.0.xsd}status', attribute 's': "\
-        "[facet 'enumeration'] The value 'invalidStatus' is not an element of the set "\
-        "{'clientDeleteProhibited', 'clientHold', 'clientRenewProhibited', "\
-        "'clientTransferProhibited', 'clientUpdateProhibited', 'inactive', "\
-        "'ok', 'pendingCreate', 'pendingDelete', 'pendingRenew', 'pendingTransfer', "\
-        "'pendingUpdate', 'serverDeleteProhibited', 'serverHold', 'serverRenewProhibited', "\
-        "'serverTransferProhibited', 'serverUpdateProhibited'}."
+        "[facet 'enumeration'] The value 'invalidStatus' is not an element of the set "
       response[:results][0][:result_code].should == '2001'
     end