Merge branch 'master' into registry-693

# Conflicts:
#	app/api/repp/domain_transfers_v1.rb

.rubocop.yml

@@ -1 +1,4 @@
 inherit_from: .rubocop_todo.yml
+
+Style/Alias:
+  EnforcedStyle: prefer_alias_method

app/api/repp/domain_transfers_v1.rb

@@ -25,7 +25,7 @@ module Repp
 
           if domain
             if domain.transfer_code == transfer_code
-              domain.transfer(new_registrar)
+              DomainTransfer.request(domain, new_registrar)
               successful_domain_transfers << { type: 'domain_transfer', attributes: { domain_name: domain.name } }
             else
               errors << { title: "#{domain_name} transfer code is wrong" }

app/controllers/epp/domains_controller.rb

@@ -142,6 +142,13 @@ class Epp::DomainsController < EppController
     authorize! :transfer, @domain, @password
     action = params[:parsed_frame].css('transfer').first[:op]
 
+    if @domain.non_transferable?
+      throw :epp_error, {
+        code: '2304',
+        msg: I18n.t(:object_status_prohibits_operation)
+      }
+    end
+
     @domain_transfer = @domain.transfer(params[:parsed_frame], action, current_user)
 
     if @domain_transfer

app/controllers/epp/polls_controller.rb

@@ -6,6 +6,8 @@ class Epp::PollsController < EppController
     ack_poll if params[:parsed_frame].css('poll').first['op'] == 'ack'
   end
 
+  private
+
   def req_poll
     @message = current_user.queued_messages.last
 
@@ -49,8 +51,6 @@ class Epp::PollsController < EppController
     render_epp_response 'epp/poll/poll_ack'
   end
 
-  private
-
   def validate_poll
     requires_attribute 'poll', 'op', values: %(ack req), allow_blank: true
   end

app/controllers/epp_controller.rb

@@ -335,7 +335,6 @@ class EppController < ApplicationController
   # rubocop: disable Metrics/CyclomaticComplexity
   # rubocop: disable Metrics/PerceivedComplexity
   def write_to_epp_log
-    # return nil if EPP_LOG_ENABLED
     request_command = params[:command] || params[:action] # error receives :command, other methods receive :action
     frame = params[:raw_frame] || params[:frame]
 

app/models/concerns/domain/transferable.rb

@@ -2,31 +2,18 @@ module Concerns::Domain::Transferable
   extend ActiveSupport::Concern
 
   included do
-    after_initialize :generate_transfer_code, if: 'new_record? && transfer_code.blank?'
+    after_initialize :generate_transfer_code, if: :generate_transfer_code?
+  end
+
+  def non_transferable?
+    !transferable?
   end
 
   def transfer(new_registrar)
-    old_registrar = registrar
-
     self.registrar = new_registrar
     regenerate_transfer_code
 
-    contact_codes = contacts.pluck(:code).sort.uniq
-    registrant_code = registrant.code
-
     transaction do
-      old_registrar.messages.create!(
-        body: I18n.t('domain_transfer_was_approved', contacts: contact_codes, registrant: registrant_code),
-        attached_obj_id: id,
-        attached_obj_type: self.class.name
-      )
-
-      domain_transfers.create!(
-        transfer_requested_at: Time.zone.now,
-        old_registrar: old_registrar,
-        new_registrar: new_registrar
-      )
-
       transfer_contacts(new_registrar)
       save!
     end
@@ -34,6 +21,24 @@ module Concerns::Domain::Transferable
 
   private
 
+  def transferable?
+    (statuses & [
+      DomainStatus::PENDING_DELETE_CONFIRMATION,
+      DomainStatus::PENDING_CREATE,
+      DomainStatus::PENDING_UPDATE,
+      DomainStatus::PENDING_DELETE,
+      DomainStatus::PENDING_RENEW,
+      DomainStatus::PENDING_TRANSFER,
+      DomainStatus::FORCE_DELETE,
+      DomainStatus::SERVER_TRANSFER_PROHIBITED,
+      DomainStatus::CLIENT_TRANSFER_PROHIBITED
+    ]).empty?
+  end
+
+  def generate_transfer_code?
+    new_record? && transfer_code.blank?
+  end
+
   def generate_transfer_code
     self.transfer_code = SecureRandom.hex
   end

app/models/domain.rb

@@ -49,7 +49,7 @@ class Domain < ActiveRecord::Base
   accepts_nested_attributes_for :domain_statuses, allow_destroy: true,
                                                   reject_if: proc { |attrs| attrs[:value].blank? }
 
-  has_many :domain_transfers, dependent: :destroy
+  has_many :transfers, class_name: 'DomainTransfer', dependent: :destroy
 
   has_many :dnskeys, dependent: :destroy
 
@@ -280,7 +280,7 @@ class Domain < ActiveRecord::Base
   end
 
   def pending_transfer
-    domain_transfers.find_by(status: DomainTransfer::PENDING)
+    transfers.find_by(status: DomainTransfer::PENDING)
   end
 
   def server_holdable?

app/models/domain_transfer.rb

@@ -10,6 +10,26 @@ class DomainTransfer < ActiveRecord::Base
   SERVER_APPROVED = 'serverApproved'
 
   before_create :set_wait_until
+
+  class << self
+    def request(domain, new_registrar)
+      domain_transfer = create!(
+        transfer_requested_at: Time.zone.now,
+        domain: domain,
+        old_registrar: domain.registrar,
+        new_registrar: new_registrar
+      )
+
+      domain_transfer.approve if approve_automatically?
+    end
+
+    private
+
+    def approve_automatically?
+      Setting.transfer_wait_time.zero?
+    end
+  end
+
   def set_wait_until
     wait_time = Setting.transfer_wait_time
     return if wait_time == 0
@@ -17,6 +37,7 @@ class DomainTransfer < ActiveRecord::Base
   end
 
   before_create :set_status
+
   def set_status
     if Setting.transfer_wait_time > 0
       self.status = PENDING unless status
@@ -36,11 +57,29 @@ class DomainTransfer < ActiveRecord::Base
     status == PENDING
   end
 
-  def notify_losing_registrar(contacts, registrant)
+  def approve
+    transaction do
+      self.status = SERVER_APPROVED
+      save!
+
+      notify_old_registrar
+      domain.transfer(new_registrar)
+    end
+  end
+
+  private
+
+  def notify_old_registrar
+    old_contacts_codes = domain.contacts.pluck(:code).sort.uniq.join(', ')
+    old_registrant_code = domain.registrant.code
+
     old_registrar.messages.create!(
-      body: I18n.t('domain_transfer_was_approved', contacts: contacts, registrant: registrant),
+      body: I18n.t('messages.texts.domain_transfer',
+                   domain_name: domain.name,
+                   old_contacts_codes: old_contacts_codes,
+                   old_registrant_code: old_registrant_code),
       attached_obj_id: id,
-      attached_obj_type: self.class.to_s
+      attached_obj_type: self.class.name
     )
   end
 end

app/models/epp/domain.rb

@@ -628,7 +628,7 @@ class Epp::Domain < Domain
 
     case action
     when 'query'
-      return domain_transfers.last if domain_transfers.any?
+      return transfers.last if transfers.any?
     when 'request'
       return pending_transfer if pending_transfer
       return query_transfer(frame, current_user)
@@ -644,13 +644,6 @@ class Epp::Domain < Domain
   # rubocop: disable Metrics/MethodLength
   # rubocop: disable Metrics/AbcSize
   def query_transfer(frame, current_user)
-    unless transferrable?
-      throw :epp_error, {
-        code: '2304',
-        msg: I18n.t(:object_status_prohibits_operation)
-      }
-    end
-
     if current_user.registrar == registrar
       throw :epp_error, {
         code: '2002',
@@ -658,11 +651,8 @@ class Epp::Domain < Domain
       }
     end
 
-    old_contact_codes = contacts.pluck(:code).sort.uniq
-    old_registrant_code = registrant.code
-
     transaction do
-      dt = domain_transfers.create!(
+      dt = transfers.create!(
         transfer_requested_at: Time.zone.now,
         old_registrar: registrar,
         new_registrar: current_user.registrar
@@ -677,8 +667,8 @@ class Epp::Domain < Domain
       end
 
       if dt.approved?
+        dt.send(:notify_old_registrar)
         transfer_contacts(current_user.registrar)
-        dt.notify_losing_registrar(old_contact_codes, old_registrant_code)
         regenerate_transfer_code
         self.registrar = current_user.registrar
       end
@@ -811,20 +801,6 @@ class Epp::Domain < Domain
     true
   end
 
-  def transferrable?
-    (statuses & [
-        DomainStatus::PENDING_DELETE_CONFIRMATION,
-        DomainStatus::PENDING_CREATE,
-        DomainStatus::PENDING_UPDATE,
-        DomainStatus::PENDING_DELETE,
-        DomainStatus::PENDING_RENEW,
-        DomainStatus::PENDING_TRANSFER,
-        DomainStatus::FORCE_DELETE,
-        DomainStatus::SERVER_TRANSFER_PROHIBITED,
-        DomainStatus::CLIENT_TRANSFER_PROHIBITED
-    ]).empty?
-  end
-
   ## SHARED
 
   # For domain transfer

app/models/message.rb

@@ -1,6 +1,6 @@
 class Message < ActiveRecord::Base
   include Versions # version/message_version.rb
-  belongs_to :registrar
+  belongs_to :registrar, required: true
 
   before_create -> { self.queued = true }
 

app/models/registrar.rb

@@ -137,15 +137,6 @@ class Registrar < ActiveRecord::Base
     cash_account.account_activities.create!(args)
   end
 
-  def domain_transfers
-    at = DomainTransfer.arel_table
-    DomainTransfer.where(
-      at[:new_registrar_id].eq(id).or(
-        at[:old_registrar_id].eq(id)
-      )
-    )
-  end
-
   def address
     [street, city, state, zip].reject(&:blank?).compact.join(', ')
   end

app/views/registrar/polls/show.haml

@@ -2,7 +2,7 @@
   - msg_q = @data.css('msgQ').first
   .row
     .col-sm-12
-      %h2= t('messages', count: msg_q['count'])
+      %h2= t '.header', count: msg_q['count']
   %hr
     .row
       .col-md-12
@@ -75,7 +75,7 @@
 - else
   .row
     .col-sm-12
-      %h2= t('messages', count: 0)
+      %h2= t '.header', count: 0
   %hr
     .row
       .col-md-12

config/initializers/initial_settings.rb

@@ -73,6 +73,3 @@ if con.present? && con.table_exists?('settings')
   Setting.save_default(:registry_swift, 'LHVBEE22')
   Setting.save_default(:registry_invoice_contact, 'Martti Õigus')
 end
-
-# dev only setting
-EPP_LOG_ENABLED = true # !Rails.env.test?

config/locales/en.yml

@@ -214,20 +214,12 @@ en:
       blank: 'is missing'
       epp_domain_reserved: 'Domain name is reserved'
       epp_obj_does_not_exist: 'Object does not exist'
-      epp_command_failed: 'Command failed'
       epp_authorization_error: 'Authorization error'
-      epp_authentication_error: 'Authentication error'
       epp_id_taken: 'Contact id already exists'
       epp_domain_not_found: 'Domain not found'
       epp_exp_dates_do_not_match: 'Given and current expire dates do not match'
-      epp_registrant_not_found: 'Registrant not found'
-      epp_command_syntax_error: 'Command syntax error'
       required_parameter_missing: 'Required parameter missing: %{key}'
-      attr_missing: 'Required parameter missing: %{key}'
-      repeating_postal_info: 'Only one of each postal info types may be provided'
-      invalid_type: 'PostalInfo type is invalid'
       unimplemented_command: 'Unimplemented command'
-      domain_exists_but_belongs_to_other_registrar: 'Domain exists but belongs to other registrar'
       required_ident_attribute_missing: "Required ident attribute missing: %{key}"
       invalid_iso31661_alpha2: does not conform to ISO 3166-1 alpha-2 standard
       invalid_iso8601_date: has invalid date format YYYY-MM-DD (ISO 8601)
@@ -451,7 +443,6 @@ en:
   client_side_status_editing_error: 'Parameter value policy error. Client-side object status management not supported'
   switch_to: Switch to
   admin_menu: Admin
-  domain_transfer_was_approved: 'Domain transfer was approved, associated contacts were: %{contacts} and registrant was %{registrant}'
   business_registry_service_not_available: "Business Registry service Ärireg is not available"
 
   # DEPP
@@ -526,7 +517,6 @@ en:
   address: 'Address'
   street: 'Street'
   city: 'City'
-  messages: 'Messages (%{count})'
   message: 'Message'
   message_no: 'Message #%{id}'
   queue_date: 'Queue date'
@@ -754,7 +744,6 @@ en:
   parameter_value_range_error: 'Parameter value range error: %{key}'
   payment_received: 'Payment received'
   api_user_not_found: 'API user not found'
-  domain_already_belongs_to_the_querying_registrar: 'Domain already belongs to the querying registrar'
   notes: Notes
   active_price_for_this_operation_is: 'Active price for this operation is %{price}'
   active_price_missing_for_this_operation: 'Active price missing for this operation!'

config/locales/messages.en.yml

@@ -0,0 +1,7 @@
+en:
+  messages:
+    texts:
+      domain_transfer: >-
+        Transfer of domain %{domain_name} has been approved.
+        It was associated with registrant %{old_registrant_code}
+        and contacts %{old_contacts_codes}.

config/locales/registrar/polls.en.yml

@@ -0,0 +1,5 @@
+en:
+  registrar:
+    polls:
+      show:
+        header: Messages (%{count})

db/migrate/20180211011450_change_messages_registrar_id_to_not_null.rb

@@ -0,0 +1,5 @@
+class ChangeMessagesRegistrarIdToNotNull < ActiveRecord::Migration
+  def change
+    change_column_null :messages, :registrar_id, false
+  end
+end

db/migrate/20180211011948_add_messages_registrar_id_fk.rb

@@ -0,0 +1,5 @@
+class AddMessagesRegistrarIdFk < ActiveRecord::Migration
+  def change
+    add_foreign_key :messages, :registrars, name: 'messages_registrar_id_fk'
+  end
+end

db/migrate/20180214200224_add_domain_transfers_constraints.rb

@@ -0,0 +1,7 @@
+class AddDomainTransfersConstraints < ActiveRecord::Migration
+  def change
+    change_column_null :domain_transfers, :domain_id, false
+    change_column_null :domain_transfers, :old_registrar_id, false
+    change_column_null :domain_transfers, :new_registrar_id, false
+  end
+end

db/migrate/20180214213743_change_messages_body_to_not_null.rb

@@ -0,0 +1,5 @@
+class ChangeMessagesBodyToNotNull < ActiveRecord::Migration
+  def change
+    change_column_null :messages, :body, false
+  end
+end

db/migrate/20180218004148_change_messages_attached_obj_id_type_to_int.rb

@@ -0,0 +1,5 @@
+class ChangeMessagesAttachedObjIdTypeToInt < ActiveRecord::Migration
+  def change
+    change_column :messages, :attached_obj_id, 'integer USING attached_obj_id::integer'
+  end
+end

db/structure.sql

@@ -954,12 +954,12 @@ ALTER SEQUENCE domain_statuses_id_seq OWNED BY domain_statuses.id;
 
 CREATE TABLE domain_transfers (
     id integer NOT NULL,
-    domain_id integer,
+    domain_id integer NOT NULL,
     status character varying,
     transfer_requested_at timestamp without time zone,
     transferred_at timestamp without time zone,
-    old_registrar_id integer,
+    old_registrar_id integer NOT NULL,
-    new_registrar_id integer,
+    new_registrar_id integer NOT NULL,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
     wait_until timestamp without time zone
@@ -2183,10 +2183,10 @@ ALTER SEQUENCE mail_templates_id_seq OWNED BY mail_templates.id;
 
 CREATE TABLE messages (
     id integer NOT NULL,
-    registrar_id integer,
+    registrar_id integer NOT NULL,
-    body character varying,
+    body character varying NOT NULL,
     attached_obj_type character varying,
-    attached_obj_id character varying,
+    attached_obj_id integer,
     queued boolean,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
@@ -4524,6 +4524,14 @@ ALTER TABLE ONLY account_activities
     ADD CONSTRAINT fk_rails_d2cc3c2fa9 FOREIGN KEY (price_id) REFERENCES prices(id);
 
 
+--
+-- Name: messages_registrar_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY messages
+    ADD CONSTRAINT messages_registrar_id_fk FOREIGN KEY (registrar_id) REFERENCES registrars(id);
+
+
 --
 -- Name: user_registrar_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -5086,6 +5094,10 @@ INSERT INTO schema_migrations (version) VALUES ('20180207071528');
 
 INSERT INTO schema_migrations (version) VALUES ('20180207072139');
 
+INSERT INTO schema_migrations (version) VALUES ('20180211011450');
+
+INSERT INTO schema_migrations (version) VALUES ('20180211011948');
+
 INSERT INTO schema_migrations (version) VALUES ('20180212123810');
 
 INSERT INTO schema_migrations (version) VALUES ('20180212152810');
@@ -5094,3 +5106,9 @@ INSERT INTO schema_migrations (version) VALUES ('20180212154731');
 
 INSERT INTO schema_migrations (version) VALUES ('20180213183818');
 
+INSERT INTO schema_migrations (version) VALUES ('20180214200224');
+
+INSERT INTO schema_migrations (version) VALUES ('20180214213743');
+
+INSERT INTO schema_migrations (version) VALUES ('20180218004148');
+

doc/controllers_complete.svg

@@ -86,9 +86,7 @@
 <path fill="none" stroke="black" d="M-288,-561C-288,-561 -184,-561 -184,-561 -178,-561 -172,-567 -172,-573 -172,-573 -172,-687 -172,-687 -172,-693 -178,-699 -184,-699 -184,-699 -288,-699 -288,-699 -294,-699 -300,-693 -300,-687 -300,-687 -300,-573 -300,-573 -300,-567 -294,-561 -288,-561"/>
 <text text-anchor="middle" x="-236" y="-683.8" font-family="Times,serif" font-size="14.00">Epp::PollsController</text>
 <polyline fill="none" stroke="black" points="-300,-676 -172,-676 "/>
-<text text-anchor="start" x="-292" y="-660.8" font-family="Times,serif" font-size="14.00">ack_poll</text>
 <text text-anchor="start" x="-292" y="-645.8" font-family="Times,serif" font-size="14.00">poll</text>
-<text text-anchor="start" x="-292" y="-630.8" font-family="Times,serif" font-size="14.00">req_poll</text>
 <polyline fill="none" stroke="black" points="-300,-623 -172,-623 "/>
 <polyline fill="none" stroke="black" points="-300,-599 -172,-599 "/>
 <text text-anchor="start" x="-292" y="-583.8" font-family="Times,serif" font-size="14.00">_layout</text>

spec/factories/message.rb

@@ -1,5 +0,0 @@
-FactoryBot.define do
-  factory :message do
-    body 'fabricator body'
-  end
-end

spec/models/message_spec.rb

@@ -1,47 +0,0 @@
-require 'rails_helper'
-
-describe Message do
-  context 'with invalid attribute' do
-    before :all do
-      @mssage = Message.new
-    end
-
-    it 'should not be valid' do
-      @mssage.valid?
-      @mssage.errors.full_messages.should match_array([
-        "Body is missing"
-      ])
-    end
-
-    it 'should not have any versions' do
-      @mssage.versions.should == []
-    end
-  end
-
-  context 'with valid attributes' do
-    before :all do
-      @mssage = create(:message)
-    end
-
-    it 'should be valid' do
-      @mssage.valid?
-      @mssage.errors.full_messages.should match_array([])
-    end
-
-    it 'should be valid twice' do
-      @mssage = create(:message)
-      @mssage.valid?
-      @mssage.errors.full_messages.should match_array([])
-    end
-
-    it 'should have one version' do
-      with_versioning do
-        @mssage.versions.should == []
-        @mssage.body = 'New body'
-        @mssage.save
-        @mssage.errors.full_messages.should match_array([])
-        @mssage.versions.size.should == 1
-      end
-    end
-  end
-end

spec/requests/epp/domain/transfer/discarded_spec.rb

@@ -1,45 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'EPP domain:transfer' do
-  let(:registrar) { create(:registrar) }
-  let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user).session_id }
-  let(:request_xml) { <<-XML
-    <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-    <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
-      <command>
-        <transfer op="request">
-          <domain:transfer xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
-            <domain:name>test.com</domain:name>
-            <domain:authInfo>
-              <domain:pw>98oiewslkfkd</domain:pw>
-            </domain:authInfo>
-          </domain:transfer>
-        </transfer>
-      </command>
-    </epp>
-  XML
-  }
-
-  before :example do
-    login_as user
-  end
-
-  context 'when domain is not discarded' do
-    let!(:domain) { create(:domain, name: 'test.com') }
-
-    it 'returns epp code of 1000' do
-      post '/epp/command/transfer', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}"
-      expect(response).to have_code_of(1000)
-    end
-  end
-
-  context 'when domain is discarded' do
-    let!(:domain) { create(:domain_discarded, name: 'test.com') }
-
-    it 'returns epp code of 2105' do
-      post '/epp/command/transfer', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}"
-      expect(response).to have_code_of(2105)
-    end
-  end
-end

test/fixtures/contacts.yml

@@ -9,6 +9,17 @@ john:
   code: john-001
   auth_info: cacb5b
 
+william:
+  name: William
+  email: william@inbox.test
+  phone: '+555.555'
+  ident: 1234
+  ident_type: priv
+  ident_country_code: US
+  registrar: bestnames
+  code: william-001
+  auth_info: 6573d0
+
 jane:
   name: Jane
   email: jane@mail.test

test/fixtures/domain_contacts.yml

@@ -3,6 +3,11 @@ shop_jane:
   contact: jane
   type: AdminDomainContact
 
+shop_william:
+  domain: shop
+  contact: william
+  type: TechDomainContact
+
 airport_john:
   domain: airport
   contact: john

test/fixtures/domain_transfers.yml

@@ -0,0 +1,7 @@
+shop:
+  status: serverApproved
+  transfer_requested_at: 2010-07-05
+  transferred_at: 2010-07-05
+  domain: shop
+  old_registrar: bestnames
+  new_registrar: goodnames

test/fixtures/messages.yml

@@ -0,0 +1,4 @@
+greeting:
+  body: Welcome!
+  queued: true
+  registrar: bestnames

test/integration/api/domain_transfers_test.rb

@@ -1,11 +1,13 @@
 require 'test_helper'
 
 class APIDomainTransfersTest < ActionDispatch::IntegrationTest
-  def test_transfers_domain
+  def setup
-    request_params = { format: :json,
+    @domain = domains(:shop)
-                       data: { domainTransfers: [{ domainName: 'shop.test', transferCode: '65078d5' }] } }
+    Setting.transfer_wait_time = 0 # Auto-approval
+  end
+
+  def test_returns_domain_transfers
     post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key }
-    assert_equal registrars(:goodnames), domains(:shop).registrar
     assert_response 200
     assert_equal ({ data: [{
                              type: 'domain_transfer',
@@ -16,6 +18,45 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest
                  JSON.parse(response.body, symbolize_names: true)
   end
 
+  def test_creates_new_domain_transfer
+    assert_difference -> { @domain.transfers.size } do
+      post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key }
+    end
+  end
+
+  def test_approves_automatically_if_auto_approval_is_enabled
+    post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key }
+    assert @domain.transfers.last.approved?
+  end
+
+  def test_changes_registrar
+    post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key }
+    @domain.reload
+    assert_equal registrars(:goodnames), @domain.registrar
+  end
+
+  def test_regenerates_transfer_code
+    @old_transfer_code = @domain.transfer_code
+
+    post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key }
+    @domain.reload
+    refute_equal @domain.transfer_code, @old_transfer_code
+  end
+
+  def test_notifies_old_registrar
+    @old_registrar = @domain.registrar
+
+    assert_difference -> { @old_registrar.messages.count } do
+      post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key }
+    end
+  end
+
+  def test_duplicates_registrant_admin_and_tech_contacts
+    assert_difference 'Contact.count', 3 do
+      post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key }
+    end
+  end
+
   def test_fails_if_domain_does_not_exist
     request_params = { format: :json,
                        data: { domainTransfers: [{ domainName: 'non-existent.test', transferCode: 'any' }] } }
@@ -30,13 +71,18 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest
                        data: { domainTransfers: [{ domainName: 'shop.test', transferCode: 'wrong' }] } }
     post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key }
     assert_response 400
-    refute_equal registrars(:goodnames), domains(:shop).registrar
+    refute_equal registrars(:goodnames), @domain.registrar
     assert_equal ({ errors: [{ title: 'shop.test transfer code is wrong' }] }),
                  JSON.parse(response.body, symbolize_names: true)
   end
 
   private
 
+  def request_params
+    { format: :json,
+      data: { domainTransfers: [{ domainName: 'shop.test', transferCode: '65078d5' }] } }
+  end
+
   def http_auth_key
     ActionController::HttpAuthentication::Basic.encode_credentials('test_goodnames', 'testtest')
   end

test/integration/epp/domain/create/transfer_code_test.rb

@@ -3,7 +3,6 @@ require 'test_helper'
 class EppDomainCreateTransferCodeTest < ActionDispatch::IntegrationTest
   def setup
     travel_to Time.zone.parse('2010-07-05')
-    login_as users(:api_bestnames)
   end
 
   def test_generates_default
@@ -27,9 +26,10 @@ class EppDomainCreateTransferCodeTest < ActionDispatch::IntegrationTest
       </epp>
     XML
 
-    session_id = epp_sessions(:api_bestnames).session_id
+    post '/epp/command/create', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
-    post '/epp/command/create', { frame: request_xml }, { 'HTTP_COOKIE' => "session=#{session_id}" }
     refute_empty Domain.find_by(name: 'brandnew.test').transfer_code
+    assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code]
+    assert_equal 1, Nokogiri::XML(response.body).css('result').size
   end
 
   def test_honors_custom
@@ -56,8 +56,9 @@ class EppDomainCreateTransferCodeTest < ActionDispatch::IntegrationTest
       </epp>
     XML
 
-    session_id = epp_sessions(:api_bestnames).session_id
+    post '/epp/command/create', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
-    post '/epp/command/create', { frame: request_xml }, { 'HTTP_COOKIE' => "session=#{session_id}" }
     assert_equal '1058ad73', Domain.find_by(name: 'brandnew.test').transfer_code
+    assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code]
+    assert_equal 1, Nokogiri::XML(response.body).css('result').size
   end
 end

test/integration/epp/domain/transfer/base_test.rb

@@ -1,20 +1,16 @@
 require 'test_helper'
 
-class EppDomainTransferTransferCodeTest < ActionDispatch::IntegrationTest
+class EppDomainTransferBaseTest < ActionDispatch::IntegrationTest
-  def setup
+  def test_non_existent_domain
-    login_as users(:api_goodnames)
-  end
-
-  def test_wrong
     request_xml = <<-XML
       <?xml version="1.0" encoding="UTF-8" standalone="no"?>
       <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
         <command>
           <transfer op="request">
             <domain:transfer xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
-              <domain:name>shop.test</domain:name>
+              <domain:name>non-existent.test</domain:name>
               <domain:authInfo>
-                <domain:pw>wrong</domain:pw>
+                <domain:pw>any</domain:pw>
               </domain:authInfo>
             </domain:transfer>
           </transfer>
@@ -22,9 +18,7 @@ class EppDomainTransferTransferCodeTest < ActionDispatch::IntegrationTest
       </epp>
     XML
 
-    session_id = epp_sessions(:api_goodnames).session_id
+    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' }
-    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => "session=#{session_id}" }
+    assert_equal '2303', Nokogiri::XML(response.body).at_css('result')[:code]
-    refute_equal registrars(:goodnames), domains(:shop).registrar
-    assert Nokogiri::XML(response.body).at_css('result[code="2201"]')
   end
 end

test/integration/epp/domain/transfer/domain_transfer_test.rb

@@ -1,53 +0,0 @@
-require 'test_helper'
-
-class EppDomainTransferTest < ActionDispatch::IntegrationTest
-  def setup
-    login_as users(:api_goodnames)
-  end
-
-  def test_successfully_transfers_domain
-    request_xml = <<-XML
-      <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-      <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
-        <command>
-          <transfer op="request">
-            <domain:transfer xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
-              <domain:name>shop.test</domain:name>
-              <domain:authInfo>
-                <domain:pw>65078d5</domain:pw>
-              </domain:authInfo>
-            </domain:transfer>
-          </transfer>
-        </command>
-      </epp>
-    XML
-
-    session_id = epp_sessions(:api_goodnames).session_id
-    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => "session=#{session_id}" }
-    assert_equal registrars(:goodnames), domains(:shop).registrar
-    assert Nokogiri::XML(response.body).at_css('result[code="1000"]')
-    assert_equal 1, Nokogiri::XML(response.body).css('result').size
-  end
-
-  def test_non_existent_domain
-    request_xml = <<-XML
-      <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-      <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
-        <command>
-          <transfer op="request">
-            <domain:transfer xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
-              <domain:name>non-existent.test</domain:name>
-              <domain:authInfo>
-                <domain:pw>any</domain:pw>
-              </domain:authInfo>
-            </domain:transfer>
-          </transfer>
-        </command>
-      </epp>
-    XML
-
-    session_id = epp_sessions(:api_goodnames).session_id
-    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => "session=#{session_id}" }
-    assert Nokogiri::XML(response.body).at_css('result[code="2303"]')
-  end
-end

test/integration/epp/domain/transfer/query_test.rb

@@ -0,0 +1,61 @@
+require 'test_helper'
+
+class EppDomainTransferQueryTest < ActionDispatch::IntegrationTest
+  def test_returns_domain_transfer_details
+    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    xml_doc = Nokogiri::XML(response.body)
+    assert_equal '1000', xml_doc.at_css('result')[:code]
+    assert_equal 1, xml_doc.css('result').size
+    assert_equal 'shop.test', xml_doc.xpath('//domain:name', 'domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd').text
+    assert_equal 'serverApproved', xml_doc.xpath('//domain:trStatus', 'domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd').text
+    assert_equal 'goodnames', xml_doc.xpath('//domain:reID', 'domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd').text
+    assert_equal 'bestnames', xml_doc.xpath('//domain:acID', 'domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd').text
+  end
+
+  def test_wrong_transfer_code
+    request_xml = <<-XML
+      <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+      <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
+        <command>
+          <transfer op="query">
+            <domain:transfer xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+              <domain:name>shop.test</domain:name>
+              <domain:authInfo>
+                <domain:pw>wrong</domain:pw>
+              </domain:authInfo>
+            </domain:transfer>
+          </transfer>
+        </command>
+      </epp>
+    XML
+
+    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code]
+  end
+
+  def test_no_domain_transfer
+    domains(:shop).transfers.delete_all
+    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    assert_equal '2303', Nokogiri::XML(response.body).at_css('result')[:code]
+  end
+
+  private
+
+  def request_xml
+    <<-XML
+      <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+      <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
+        <command>
+          <transfer op="query">
+            <domain:transfer xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+              <domain:name>shop.test</domain:name>
+              <domain:authInfo>
+                <domain:pw>65078d5</domain:pw>
+              </domain:authInfo>
+            </domain:transfer>
+          </transfer>
+        </command>
+      </epp>
+    XML
+  end
+end

test/integration/epp/domain/transfer/request_test.rb

@@ -0,0 +1,137 @@
+require 'test_helper'
+
+class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest
+  def setup
+    @domain = domains(:shop)
+    Setting.transfer_wait_time = 0
+  end
+
+  def test_transfers_domain_at_once
+    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' }
+    assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code]
+    assert_equal 1, Nokogiri::XML(response.body).css('result').size
+  end
+
+  def test_creates_new_domain_transfer
+    assert_difference -> { @domain.transfers.size } do
+      post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' }
+    end
+  end
+
+  def test_approves_automatically_if_auto_approval_is_enabled
+    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' }
+    assert_equal 'serverApproved', Nokogiri::XML(response.body).xpath('//domain:trStatus', 'domain' =>
+      'https://epp.tld.ee/schema/domain-eis-1.0.xsd').text
+  end
+
+  def test_changes_registrar
+    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' }
+    @domain.reload
+    assert_equal registrars(:goodnames), @domain.registrar
+  end
+
+  def test_regenerates_transfer_code
+    @old_transfer_code = @domain.transfer_code
+
+    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' }
+
+    @domain.reload
+    refute_equal @domain.transfer_code, @old_transfer_code
+  end
+
+  def test_notifies_old_registrar
+    @old_registrar = @domain.registrar
+
+    assert_difference -> { @old_registrar.messages.count } do
+      post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' }
+    end
+  end
+
+  def test_duplicates_registrant_admin_and_tech_contacts
+    assert_difference 'Contact.count', 3 do
+      post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' }
+    end
+  end
+
+  def test_saves_legal_document
+    assert_difference -> { @domain.legal_documents(true).size } do
+      post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' }
+    end
+  end
+
+  def test_non_transferable_domain
+    @domain.update!(statuses: [DomainStatus::SERVER_TRANSFER_PROHIBITED])
+
+    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' }
+    domains(:shop).reload
+
+    assert_equal registrars(:bestnames), domains(:shop).registrar
+    assert_equal '2304', Nokogiri::XML(response.body).at_css('result')[:code]
+  end
+
+  def test_discarded_domain
+    @domain.update!(statuses: [DomainStatus::DELETE_CANDIDATE])
+
+    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' }
+    @domain.reload
+
+    assert_equal registrars(:bestnames), @domain.registrar
+    assert_equal '2105', Nokogiri::XML(response.body).at_css('result')[:code]
+  end
+
+  def test_same_registrar
+    assert_no_difference -> { @domain.transfers.size } do
+      post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    end
+
+    assert_equal '2002', Nokogiri::XML(response.body).at_css('result')[:code]
+  end
+
+  def test_wrong_transfer_code
+    request_xml = <<-XML
+      <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+      <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
+        <command>
+          <transfer op="request">
+            <domain:transfer xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+              <domain:name>shop.test</domain:name>
+              <domain:authInfo>
+                <domain:pw>wrong</domain:pw>
+              </domain:authInfo>
+            </domain:transfer>
+          </transfer>
+        </command>
+      </epp>
+    XML
+
+    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' }
+    @domain.reload
+    refute_equal registrars(:goodnames), @domain.registrar
+    assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code]
+  end
+
+  private
+
+  def request_xml
+    <<-XML
+      <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+      <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
+        <command>
+          <transfer op="request">
+            <domain:transfer xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+              <domain:name>shop.test</domain:name>
+              <domain:authInfo>
+                <domain:pw>65078d5</domain:pw>
+              </domain:authInfo>
+            </domain:transfer>
+          </transfer>
+          <extension>
+            <eis:extdata xmlns:eis="https://epp.tld.ee/schema/eis-1.0.xsd">
+              <eis:legalDocument type="pdf">test</eis:legalDocument>
+            </eis:extdata>
+          </extension>
+        </command>
+      </epp>
+    XML
+  end
+end

test/integration/epp/domain/update/transfer_code_test.rb

@@ -1,10 +1,6 @@
 require 'test_helper'
 
 class EppDomainUpdateTest < ActionDispatch::IntegrationTest
-  def setup
-    login_as users(:api_bestnames)
-  end
-
   def test_overwrites_existing
     request_xml = <<-XML
       <?xml version="1.0" encoding="UTF-8" standalone="no"?>
@@ -24,8 +20,9 @@ class EppDomainUpdateTest < ActionDispatch::IntegrationTest
       </epp>
     XML
 
-    session_id = epp_sessions(:api_bestnames).session_id
+    post '/epp/command/update', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
-    post '/epp/command/update', { frame: request_xml }, { 'HTTP_COOKIE' => "session=#{session_id}" }
     assert_equal 'f0ff7d17b0', domains(:shop).transfer_code
+    assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code]
+    assert_equal 1, Nokogiri::XML(response.body).css('result').size
   end
 end

test/integration/epp/poll_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class EppPollTest < ActionDispatch::IntegrationTest
+  def test_messages
+    post '/epp/command/poll', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    assert_equal '1301', Nokogiri::XML(response.body).at_css('result')[:code]
+    assert_equal 1, Nokogiri::XML(response.body).css('msgQ').size
+    assert_equal 1, Nokogiri::XML(response.body).css('result').size
+  end
+
+  def test_no_messages
+    registrars(:bestnames).messages.delete_all(:delete_all)
+    post '/epp/command/poll', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    assert_equal '1300', Nokogiri::XML(response.body).at_css('result')[:code]
+    assert_equal 1, Nokogiri::XML(response.body).css('result').size
+  end
+
+  private
+
+  def request_xml
+    <<-XML
+      <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+      <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
+        <command>
+          <poll op="req"/>
+        </command>
+      </epp>
+    XML
+  end
+end

test/models/domain/transferable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class DomainTransferTest < ActiveSupport::TestCase
+class DomainTransferableTest < ActiveSupport::TestCase
   def setup
     @domain = domains(:shop)
     @new_registrar = registrars(:goodnames)
@@ -44,22 +44,4 @@ class DomainTransferTest < ActiveSupport::TestCase
     @domain.transfer(@new_registrar)
     refute_same old_transfer_code, @domain.transfer_code
   end
-
-  def test_creates_domain_transfer
-    assert_difference 'DomainTransfer.count' do
-      @domain.transfer(@new_registrar)
-    end
-  end
-
-  def test_creates_message
-    assert_difference 'Message.count' do
-      @domain.transfer(@new_registrar)
-    end
-  end
-
-  def test_copies_contacts
-    assert_difference 'Contact.count', 2 do
-      @domain.transfer(@new_registrar)
-    end
-  end
 end

test/models/domain_transfer_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+class DomainTransferTest < ActiveSupport::TestCase
+  def setup
+    @domain_transfer = domain_transfers(:shop)
+  end
+
+  def test_approval
+    @domain_transfer.approve
+    @domain_transfer.reload
+    assert @domain_transfer.approved?
+  end
+
+  def test_notifies_old_registrar_on_approval
+    old_registrar = @domain_transfer.old_registrar
+
+    assert_difference -> { old_registrar.messages.count } do
+      @domain_transfer.approve
+    end
+
+    body = 'Transfer of domain shop.test has been approved.' \
+      ' It was associated with registrant john-001' \
+      ' and contacts jane-001, william-001.'
+    id = @domain_transfer.id
+    class_name = @domain_transfer.class.name
+
+    message = old_registrar.messages.last
+    assert_equal body, message.body
+    assert_equal id, message.attached_obj_id
+    assert_equal class_name, message.attached_obj_type
+  end
+end

test/models/message_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class MessageTest < ActiveSupport::TestCase
+  def setup
+    @message = messages(:greeting)
+  end
+
+  def test_valid
+    assert @message.valid?
+  end
+
+  def test_invalid_without_body
+    @message.body = nil
+    assert @message.invalid?
+  end
+
+  def test_invalid_without_registrar
+    @message.registrar = nil
+    assert @message.invalid?
+  end
+end