Merge branch 'master' into 2413-force-delete-lift-bug

2025-08-04 00:42:04 +02:00 · 2022-09-15 07:21:45 -03:00 · 2022-09-15 07:21:45 -03:00 · 7328ea24c3
commit 7328ea24c3
parent 70ff87bd20 f77883b266
69 changed files with 2082 additions and 818 deletions
--- a/test/integration/admin_area/invoices_test.rb
+++ b/test/integration/admin_area/invoices_test.rb
@ -24,30 +24,28 @@ class AdminAreaInvoicesIntegrationTest < ApplicationIntegrationTest
  end

  def test_create_new_invoice
-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
+    invoice_n = Invoice.order(number: :desc).last.number

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
-        to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      to_return(status: 200, body: "", headers: {})

-      visit new_admin_invoice_path
+    visit new_admin_invoice_path

-      assert_text 'Create new invoice'
-      select 'Best Names', from: 'deposit_registrar_id', match: :first
-      fill_in 'Amount', with: '1000'
-      click_on 'Save'
+    assert_text 'Create new invoice'
+    select 'Best Names', from: 'deposit_registrar_id', match: :first
+    fill_in 'Amount', with: '1000'
+    click_on 'Save'

-      assert_equal page.status_code, 200
-    end
+    assert_equal page.status_code, 200
  end

  def test_visit_list_of_invoices_pages
--- a/test/integration/eis_billing/directo_response_test.rb
+++ b/test/integration/eis_billing/directo_response_test.rb
@ -10,34 +10,30 @@ class DirectoResponseTest < ApplicationIntegrationTest
  end

  def test_should_created_directo_instance
-    if Feature.billing_system_integrated?
-      directo_response_from_billing = {
-        response: @response_xml,
-        month: true
-      }
+    directo_response_from_billing = {
+      response: @response_xml,
+      month: true
+    }

-      assert_difference 'Directo.count', 1 do
-        put eis_billing_directo_response_path, params: JSON.parse(directo_response_from_billing.to_json),
-        headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
-      end
+    assert_difference 'Directo.count', 1 do
+      put eis_billing_directo_response_path, params: JSON.parse(directo_response_from_billing.to_json),
+      headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
    end
  end

  def test_should_update_related_invoice
-    if Feature.billing_system_integrated?
-      directo_response_from_billing = {
-        response: @response_xml
-      }
+    directo_response_from_billing = {
+      response: @response_xml
+    }

-      refute @invoice.in_directo
+    refute @invoice.in_directo

-      assert_difference 'Directo.count', 1 do
-        put eis_billing_directo_response_path, params: JSON.parse(directo_response_from_billing.to_json),
-        headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
-      end
-
-      @invoice.reload
-      assert @invoice.in_directo
+    assert_difference 'Directo.count', 1 do
+      put eis_billing_directo_response_path, params: JSON.parse(directo_response_from_billing.to_json),
+      headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
    end
+
+    @invoice.reload
+    assert @invoice.in_directo
  end
 end
--- a/test/integration/eis_billing/lhv_connect_transactions_test.rb
+++ b/test/integration/eis_billing/lhv_connect_transactions_test.rb
@ -8,35 +8,33 @@ class LhvConnectTransactionsIntegrationTest < ApplicationIntegrationTest
  end

  def test_should_saved_transaction_data
-    if Feature.billing_system_integrated?
-      test_transaction_1 = OpenStruct.new(amount: 0.1,
-        currency: 'EUR',
-        date: Time.zone.today,
-        payment_reference_number: '2199812',
-        payment_description: "description 2199812")
+    test_transaction_1 = OpenStruct.new(amount: 0.1,
+                                        currency: 'EUR',
+                                        date: Time.zone.today,
+                                        payment_reference_number: '2199812',
+                                        payment_description: 'description 2199812')

-      test_transaction_2 = OpenStruct.new(amount: 0.1,
-        currency: 'EUR',
-        date: Time.zone.today,
-        payment_reference_number: '2199813',
-        payment_description: "description 2199813")
+    test_transaction_2 = OpenStruct.new(amount: 0.1,
+                                        currency: 'EUR',
+                                        date: Time.zone.today,
+                                        payment_reference_number: '2199813',
+                                        payment_description: 'description 2199813')

-      test_transaction_3 = OpenStruct.new(amount: 0.1,
-        currency: 'EUR',
-        date: Time.zone.today,
-        payment_reference_number: '2199814',
-        payment_description: "description 2199814")
+    test_transaction_3 = OpenStruct.new(amount: 0.1,
+                                        currency: 'EUR',
+                                        date: Time.zone.today,
+                                        payment_reference_number: '2199814',
+                                        payment_description: 'description 2199814')

-      lhv_transactions = []
-      lhv_transactions << test_transaction_1
-      lhv_transactions << test_transaction_2
-      lhv_transactions << test_transaction_3
+    lhv_transactions = []
+    lhv_transactions << test_transaction_1
+    lhv_transactions << test_transaction_2
+    lhv_transactions << test_transaction_3

-      assert_difference 'BankStatement.count', 3 do
-        assert_difference 'BankTransaction.count', 3 do
-          post eis_billing_lhv_connect_transactions_path,  params: { "_json" => JSON.parse(lhv_transactions.to_json) },
-          headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
-        end
+    assert_difference 'BankStatement.count', 1 do
+      assert_difference 'BankTransaction.count', 3 do
+        post eis_billing_lhv_connect_transactions_path, params: { '_json' => JSON.parse(lhv_transactions.to_json) },
+                                                        headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
      end
    end
  end
--- a/test/integration/eis_billing/payment_status_test.rb
+++ b/test/integration/eis_billing/payment_status_test.rb
@ -0,0 +1,32 @@
+require 'test_helper'
+
+class PaymentStatusTest < ApplicationIntegrationTest
+  setup do
+    sign_in users(:api_bestnames)
+    @invoice = invoices(:one)
+    @unpaid = invoices(:unpaid)
+    @registrar = registrars(:bestnames)
+    Spy.on_instance_method(EisBilling::BaseController, :authorized).and_return(true)
+  end
+
+  def shoudl_update_buyer_balance
+    assert @invoice.paid?
+    assert_equal @invoice.buyer.balance.to_f, 100.0
+
+    payload = {
+      payment_state: 'settled',
+      order_reference: @unpaid.number,
+      standing_amount: @unpaid.total,
+      transaction_time: Time.zone.now,
+    }
+
+    put eis_billing_payment_status_path, params: payload
+
+    @invoice.reload
+    @invoice.buyer.reload
+    @registrar.reload
+
+    assert @invoice.paid?
+    assert_equal @invoice.buyer.balance.to_f, 100.0
+  end
+end
--- a/test/integration/repp/v1/invoices/add_credit_test.rb
+++ b/test/integration/repp/v1/invoices/add_credit_test.rb
@ -12,6 +12,18 @@ class ReppV1InvoicesAddCreditTest < ActionDispatch::IntegrationTest
    eis_response = OpenStruct.new(body: '{"everypay_link":"https://link.test"}')
    Spy.on_instance_method(EisBilling::AddDeposits, :send_invoice).and_return(eis_response)
    Spy.on_instance_method(EisBilling::BaseController, :authorized).and_return(true)
+
+    invoice = Invoice.last
+    msg = {
+      invoice_number: invoice.number + 3
+    }
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator")
+      .to_return(status: 200, body: msg.to_json, headers: {})
+
+    msg2 = {
+      message: 'success'
+    }
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").to_return(status: 200, body: msg2.to_json, headers: {})
  end

  teardown do
@ -28,13 +40,11 @@ class ReppV1InvoicesAddCreditTest < ActionDispatch::IntegrationTest
    Setting.registry_vat_prc = 0.1
    ENV['billing_system_integrated'] = 'true'

-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator')
-        .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
-      stub_request(:post, 'https://eis_billing_system:3000/api/v1/e_invoice/e_invoice')
-        .to_return(status: 200, body: '', headers: {})
-    end
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator')
+      .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/e_invoice/e_invoice')
+      .to_return(status: 200, body: '', headers: {})

    post '/repp/v1/invoices/add_credit', headers: @auth_headers,
                                         params: request_body
--- a/test/jobs/directo_invoice_forward_job_test.rb
+++ b/test/jobs/directo_invoice_forward_job_test.rb
@ -1,6 +1,6 @@
 require "test_helper"

-class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
+class DirectoInvoiceForwardLegacyJobTest < ActiveSupport::TestCase
  setup do
    @invoice = invoices(:one)
    @user = registrars(:bestnames)
@ -8,9 +8,9 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
  end

  def teardown
-    Setting.directo_monthly_number_min = 309901
-    Setting.directo_monthly_number_max = 309999
-    Setting.directo_monthly_number_last = 309901
+    Setting.directo_monthly_number_min = 309_901
+    Setting.directo_monthly_number_max = 309_999
+    Setting.directo_monthly_number_last = 309_901
  end

  def test_directo_json_sends_customer_as_hash
@ -38,7 +38,7 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
    end.to_return(status: 200, body: response)

    assert_nothing_raised do
-      DirectoInvoiceForwardJob.perform_now(monthly: false, dry: false)
+      DirectoInvoiceForwardLegacyJob.perform_now(monthly: false, dry: false)
    end

    assert_not_empty @invoice.directo_records.first.request
@ -49,10 +49,10 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
    price = billing_prices(:create_one_year)
    activity.update!(activity_type: 'create', price: price)

-    Setting.directo_monthly_number_max = 30991
+    Setting.directo_monthly_number_max = 30_991

    assert_raises 'RuntimeError' do
-      DirectoInvoiceForwardJob.perform_now(monthly: true, dry: false)
+      DirectoInvoiceForwardLegacyJob.perform_now(monthly: true, dry: false)
    end
  end

@ -78,7 +78,7 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
    end.to_return(status: 200, body: response)

    assert_difference 'Setting.directo_monthly_number_last' do
-      DirectoInvoiceForwardJob.perform_now(monthly: true, dry: false)
+      DirectoInvoiceForwardLegacyJob.perform_now(monthly: true, dry: false)
    end
  end

@ -103,7 +103,7 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
    end.to_return(status: 200, body: response)

    assert_difference 'Setting.directo_monthly_number_last' do
-      DirectoInvoiceForwardJob.perform_now(monthly: true, dry: false)
+      DirectoInvoiceForwardLegacyJob.perform_now(monthly: true, dry: false)
    end
  end

@ -126,7 +126,7 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
    end.to_return(status: 200, body: response)

    assert_difference 'Setting.directo_monthly_number_last' do
-      DirectoInvoiceForwardJob.perform_now(monthly: true, dry: false)
+      DirectoInvoiceForwardLegacyJob.perform_now(monthly: true, dry: false)
    end
  end

@ -148,7 +148,7 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
    end.to_return(status: 200, body: response)

    assert_difference 'Setting.directo_monthly_number_last' do
-      DirectoInvoiceForwardJob.perform_now(monthly: true, dry: false)
+      DirectoInvoiceForwardLegacyJob.perform_now(monthly: true, dry: false)
    end
  end

@ -186,7 +186,7 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
      (body.include? 'StartDate') && (body.include? 'EndDate') && (body.include? 'goodnames')
    end.to_return(status: 200, body: response)

-    DirectoInvoiceForwardJob.perform_now(monthly: true, dry: false)
+    DirectoInvoiceForwardLegacyJob.perform_now(monthly: true, dry: false)

    assert_requested first_registrar_stub
    assert_requested second_registrar_stub
--- a/test/jobs/send_e_invoice_legacy_job_test.rb
+++ b/test/jobs/send_e_invoice_legacy_job_test.rb
@ -1,10 +1,14 @@
 require 'test_helper'

-class SendEInvoiceJobTest < ActiveJob::TestCase
+class SendEInvoiceLegacyJobTest < ActiveJob::TestCase

  def teardown
    EInvoice.provider = EInvoice::Providers::TestProvider.new
    EInvoice::Providers::TestProvider.deliveries.clear
+
+    msg = { message: 'success' }
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice")
+      .to_return(status: 200, body: msg.to_json, headers: {})
  end

  def test_if_invoice_is_sent
@ -15,7 +19,7 @@ class SendEInvoiceJobTest < ActiveJob::TestCase

    assert_nothing_raised do
      perform_enqueued_jobs do
-        SendEInvoiceJob.perform_now(@invoice.id, payable: true)
+        SendEInvoiceLegacyJob.perform_now(@invoice.id, payable: true)
      end
    end
    @invoice.reload
--- a/test/jobs/send_monthly_invoices_job_test.rb
+++ b/test/jobs/send_monthly_invoices_job_test.rb
@ -0,0 +1,279 @@
+require 'test_helper'
+
+class SendMonthlyInvoicesJobTest < ActiveSupport::TestCase
+  include ActionMailer::TestHelper
+
+  setup do
+    @user = registrars(:bestnames)
+    @date = Time.zone.parse('2010-08-06')
+    travel_to @date
+    ActionMailer::Base.deliveries.clear
+    EInvoice.provider = EInvoice::Providers::TestProvider.new
+    EInvoice::Providers::TestProvider.deliveries.clear
+
+    response = { message: 'sucess' }
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice")
+      .to_return(status: 200, body: response.to_json, headers: {})
+  end
+
+  def teardown
+    Setting.directo_monthly_number_min = 309_901
+    Setting.directo_monthly_number_max = 309_999
+    Setting.directo_monthly_number_last = 309_901
+    EInvoice.provider = EInvoice::Providers::TestProvider.new
+    EInvoice::Providers::TestProvider.deliveries.clear
+  end
+
+  def test_fails_if_directo_bounds_exceedable
+    activity = account_activities(:one)
+    price = billing_prices(:create_one_year)
+    activity.update!(activity_type: 'create', price: price)
+
+    Setting.directo_monthly_number_max = 30_991
+
+    assert_no_difference 'Directo.count' do
+      assert_raises 'RuntimeError' do
+        SendMonthlyInvoicesJob.perform_now
+      end
+    end
+
+    assert_nil Invoice.find_by_monthly_invoice(true)
+    assert_emails 0
+    assert_equal 0, EInvoice::Providers::TestProvider.deliveries.count
+  end
+
+  def test_monthly_summary_is_not_delivered_if_dry
+    activity = account_activities(:one)
+    price = billing_prices(:create_one_year)
+    activity.update!(activity_type: 'create', price: price)
+    @user.update(language: 'et')
+
+    assert_difference 'Setting.directo_monthly_number_last' do
+      assert_no_difference 'Directo.count' do
+        SendMonthlyInvoicesJob.perform_now(dry: true)
+      end
+    end
+
+    invoice = Invoice.last
+    assert_equal 309_902, invoice.number
+    refute invoice.in_directo
+    assert invoice.e_invoice_sent_at.blank?
+
+    assert_emails 0
+    assert_equal 0, EInvoice::Providers::TestProvider.deliveries.count
+  end
+
+  def test_monthly_summary_is_delivered_if_invoice_already_exists
+    @monthly_invoice = invoices(:one)
+    @monthly_invoice.update(number: 309_902, monthly_invoice: true,
+                            issue_date: @date.last_month.end_of_month,
+                            due_date: @date.last_month.end_of_month,
+                            metadata: metadata,
+                            in_directo: false,
+                            e_invoice_sent_at: nil)
+
+    activity = account_activities(:one)
+    price = billing_prices(:create_one_year)
+    activity.update!(activity_type: 'create', price: price)
+    @user.update(language: 'et')
+
+    response = <<-XML
+      <?xml version="1.0" encoding="UTF-8"?>
+      <results>
+        <Result Type="0" Desc="OK" docid="309902" doctype="ARVE" submit="Invoices"/>
+      </results>
+    XML
+
+    stub_request(:post, ENV['directo_invoice_url']).with do |request|
+      body = CGI.unescape(request.body)
+
+      (body.include? '.test registreerimine: 1 aasta(t)') &&
+        (body.include? 'Domeenide ettemaks') &&
+        (body.include? '309902')
+    end.to_return(status: 200, body: response)
+
+    assert_no_difference 'Setting.directo_monthly_number_last' do
+      assert_difference('Directo.count', 1) do
+        SendMonthlyInvoicesJob.perform_now
+      end
+    end
+
+    perform_enqueued_jobs
+
+    invoice = Invoice.last
+    assert_equal 309_902, invoice.number
+    assert invoice.in_directo
+    assert_not invoice.e_invoice_sent_at.blank?
+
+    assert_emails 1
+    email = ActionMailer::Base.deliveries.last
+    assert_equal ['billing@bestnames.test'], email.to
+    assert_equal 'Invoice no. 309902 (monthly invoice)', email.subject
+    assert email.attachments['invoice-309902.pdf']
+
+    # assert_equal 1, EInvoice::Providers::TestProvider.deliveries.count
+  end
+
+  def test_monthly_summary_is_delivered_in_estonian
+    activity = account_activities(:one)
+    price = billing_prices(:create_one_month)
+    activity.update!(activity_type: 'create', price: price)
+    @user.update(language: 'et')
+
+    response = <<-XML
+      <?xml version="1.0" encoding="UTF-8"?>
+      <results>
+        <Result Type="0" Desc="OK" docid="309902" doctype="ARVE" submit="Invoices"/>
+      </results>
+    XML
+
+    stub_request(:post, ENV['directo_invoice_url']).with do |request|
+      body = CGI.unescape(request.body)
+
+      (body.include? '.test registreerimine: 3 kuu(d)') &&
+        (body.include? 'Domeenide ettemaks') &&
+        (body.include? '309902')
+    end.to_return(status: 200, body: response)
+
+    assert_difference 'Setting.directo_monthly_number_last' do
+      assert_difference('Directo.count', 1) do
+        SendMonthlyInvoicesJob.perform_now
+      end
+    end
+
+    perform_enqueued_jobs
+
+    invoice = Invoice.last
+    assert_equal 309_902, invoice.number
+    assert invoice.in_directo
+    assert_not invoice.e_invoice_sent_at.blank?
+
+    assert_emails 1
+    email = ActionMailer::Base.deliveries.last
+    assert_equal ['billing@bestnames.test'], email.to
+    assert_equal 'Invoice no. 309902 (monthly invoice)', email.subject
+    assert email.attachments['invoice-309902.pdf']
+
+    # assert_equal 1, EInvoice::Providers::TestProvider.deliveries.count
+  end
+
+  def test_multi_year_purchases_have_duration_assigned
+    activity = account_activities(:one)
+    price = billing_prices(:create_one_year)
+    price.update(duration: 3.years)
+    activity.update(activity_type: 'create', price: price)
+
+    response = <<-XML
+      <?xml version="1.0" encoding="UTF-8"?>
+      <results>
+        <Result Type="0" Desc="OK" docid="309902" doctype="ARVE" submit="Invoices"/>
+      </results>
+    XML
+
+    stub_request(:post, ENV['directo_invoice_url']).with do |request|
+      body = CGI.unescape(request.body)
+      (body.include? 'StartDate') && (body.include? 'EndDate')
+    end.to_return(status: 200, body: response)
+
+    assert_difference 'Setting.directo_monthly_number_last' do
+      SendMonthlyInvoicesJob.perform_now
+    end
+
+    perform_enqueued_jobs
+
+    invoice = Invoice.last
+    assert_equal 309_902, invoice.number
+    assert invoice.in_directo
+    assert_not invoice.e_invoice_sent_at.blank?
+  end
+
+  def test_monthly_duration_products_are_present_in_summary
+    activity = account_activities(:one)
+    price = billing_prices(:create_one_month)
+    activity.update(activity_type: 'create', price: price)
+
+    response = <<-XML
+      <?xml version="1.0" encoding="UTF-8"?>
+      <results>
+        <Result Type="0" Desc="OK" docid="309902" doctype="ARVE" submit="Invoices"/>
+      </results>
+    XML
+
+    stub_request(:post, ENV['directo_invoice_url']).with do |request|
+      body = CGI.unescape(request.body)
+      body.include? 'month(s)'
+    end.to_return(status: 200, body: response)
+
+    assert_difference 'Setting.directo_monthly_number_last' do
+      SendMonthlyInvoicesJob.perform_now
+    end
+
+    perform_enqueued_jobs
+
+    invoice = Invoice.last
+    assert_equal 309_902, invoice.number
+    assert invoice.in_directo
+    assert_not invoice.e_invoice_sent_at.blank?
+  end
+
+  def test_sends_each_monthly_invoice_separately
+    WebMock.reset!
+
+    activity = account_activities(:one)
+    price = billing_prices(:create_one_year)
+    price.update(duration: 3.years)
+    activity.update(activity_type: 'create', price: price)
+
+    # Creating account activity for second action
+    another_activity = activity.dup
+    another_activity.account = accounts(:two)
+
+    AccountActivity.skip_callback(:create, :after, :update_balance)
+    another_activity.created_at = Time.zone.parse('2010-07-05 10:00')
+    another_activity.save
+    AccountActivity.set_callback(:create, :after, :update_balance)
+
+    response = <<-XML
+    <?xml version="1.0" encoding="UTF-8"?>
+    <results>
+      <Result Type="0" Desc="OK" docid="309902" doctype="ARVE" submit="Invoices"/>
+    </results>
+    XML
+
+    first_registrar_stub = stub_request(:post, ENV['directo_invoice_url']).with do |request|
+      body = CGI.unescape(request.body)
+      (body.include? 'StartDate') && (body.include? 'EndDate') && (body.include? 'bestnames')
+    end.to_return(status: 200, body: response)
+
+    second_registrar_stub = stub_request(:post, ENV['directo_invoice_url']).with do |request|
+      body = CGI.unescape(request.body)
+      (body.include? 'StartDate') && (body.include? 'EndDate') && (body.include? 'goodnames')
+    end.to_return(status: 200, body: response)
+
+    assert_difference('Invoice.count', 2) do
+      assert_difference('Directo.count', 2) do
+        SendMonthlyInvoicesJob.perform_now
+      end
+    end
+
+    perform_enqueued_jobs
+
+    assert_requested first_registrar_stub
+    assert_requested second_registrar_stub
+
+    assert_emails 2
+    assert_equal 2, EInvoice::Providers::TestProvider.deliveries.count
+  end
+
+  private
+
+  def metadata
+    {
+      "items" => [
+        { "description" => "Domeenide registreerimine - Juuli 2010" },
+        { "product_id" => nil, "quantity" => 1, "unit" => "tk", "price" => 10.0, "description" => ".test registreerimine: 1 aasta(t)" },
+        { "product_id" => "ETTEM06", "description" => "Domeenide ettemaks", "quantity" => -1, "price" => 10.0, "unit" => "tk" },
+      ],
+    }
+  end
+end
--- a/test/mailers/domain_delete_mailer_test.rb
+++ b/test/mailers/domain_delete_mailer_test.rb
@ -73,4 +73,21 @@ class DomainDeleteMailerTest < ActionMailer::TestCase
                 ' / Domain shop.test is in deletion process' \
                 ' / Домен shop.test в процессе удаления', email.subject
  end
+
+  def test_forced_invalid_email
+    @domain.update(template_name: 'invalid_email')
+    @domain.reload
+
+    email = DomainDeleteMailer.forced(domain: @domain,
+                                      registrar: @domain.registrar,
+                                      registrant: @domain.registrant,
+                                      template_name: @domain.template_name).deliver_now
+
+    assert_emails 1
+    assert_equal ['legal@registry.test'], email.from
+    assert @domain.force_delete_contact_emails.sort == email.to.sort
+    assert_equal 'Domeen shop.test on kustutusmenetluses' \
+                 ' / Domain shop.test is in deletion process' \
+                 ' / Домен shop.test в процессе удаления', email.subject
+  end
 end
--- a/test/models/bank_transaction_test.rb
+++ b/test/models/bank_transaction_test.rb
@ -4,6 +4,12 @@ class BankTransactionTest < ActiveSupport::TestCase
  setup do
    @registrar = registrars(:bestnames)
    @invoice = invoices(:one)
+
+    response_message = {
+      message: 'got it'
+    }
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_status')
+    .to_return(status: 200, body: response_message.to_json, headers: {})
  end

  def test_matches_against_invoice_nubmber_and_reference_number
@ -16,87 +22,80 @@ class BankTransactionTest < ActiveSupport::TestCase
  end

  def test_binds_if_this_sum_invoice_already_present
-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
-      create_payable_invoice(number: '2222', total: 10, reference_no: '1234567')
-      another_invoice = @invoice.dup
-      another_invoice.save(validate: false)
-      another_invoice.update(reference_no: '7654321', number: '2221')
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator')
+      .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    create_payable_invoice(number: '2222', total: 10, reference_no: '1234567')
+    another_invoice = @invoice.dup
+    another_invoice.save(validate: false)
+    another_invoice.update(reference_no: '7654321', number: '2221')

-      another_item = @invoice.items.first.dup
-      another_item.invoice = another_invoice
-      another_item.save
-      another_invoice.reload
+    another_item = @invoice.items.first.dup
+    another_item.invoice = another_invoice
+    another_item.save
+    another_invoice.reload

-      first_transaction = BankTransaction.new(sum: 10,
-                                              description: 'Order nr 1 from registrar 1234567 second number 2345678')
+    first_transaction = BankTransaction.new(sum: 10,
+                                            description: 'Order nr 1 from registrar 1234567 second number 2345678')

-      first_transaction.create_activity(another_invoice.buyer, another_invoice)
+    first_transaction.create_activity(another_invoice.buyer, another_invoice)

-      transaction = BankTransaction.new(sum: 10,
-                                        description: 'Order nr 1 from registrar 1234567 second number 2345678')
+    transaction = BankTransaction.new(sum: 10,
+                                      description: 'Order nr 1 from registrar 1234567 second number 2345678')

-      assert_difference 'AccountActivity.count' do
-        transaction.autobind_invoice
-      end
+    assert_difference 'AccountActivity.count' do
+      transaction.autobind_invoice
    end
  end

  def test_binds_if_this_sum_cancelled_invoice_already_present
-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
-      create_payable_invoice(number: '2222', total: 10, reference_no: '1234567')
-      another_invoice = @invoice.dup
-      another_invoice.save(validate: false)
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator')
+      .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    create_payable_invoice(number: '2222', total: 10, reference_no: '1234567')
+    another_invoice = @invoice.dup
+    another_invoice.save(validate: false)

+    another_item = @invoice.items.first.dup
+    another_item.invoice = another_invoice

-      another_item = @invoice.items.first.dup
-      another_item.invoice = another_invoice
+    another_item.save
+    another_invoice.reload
+    another_invoice.update(reference_no: '1234567', number: '2221', cancelled_at: Time.zone.now)

-      another_item.save
-      another_invoice.reload
-      another_invoice.update(reference_no: '1234567', number: '2221', cancelled_at: Time.zone.now)
+    transaction = BankTransaction.new(sum: 10,
+                                      description: 'Order nr 1 from registrar 1234567 second number 2345678')

-      transaction = BankTransaction.new(sum: 10,
-                                        description: 'Order nr 1 from registrar 1234567 second number 2345678')
-
-      assert_difference 'AccountActivity.count' do
-        transaction.autobind_invoice
-      end
+    assert_difference 'AccountActivity.count' do
+      transaction.autobind_invoice
    end
  end

  def test_marks_the_first_one_as_paid_if_same_sum
-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
-      create_payable_invoice(number: '2222', total: 10, reference_no: '1234567')
-      another_invoice = @invoice.dup
-      another_invoice.save(validate: false)
-      another_invoice.update(reference_no: '7654321', number: '2221')
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator')
+      .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    create_payable_invoice(number: '2222', total: 10, reference_no: '1234567')
+    another_invoice = @invoice.dup
+    another_invoice.save(validate: false)
+    another_invoice.update(reference_no: '7654321', number: '2221')

-      another_item = @invoice.items.first.dup
-      another_item.invoice = another_invoice
-      another_item.save
-      another_invoice.reload
+    another_item = @invoice.items.first.dup
+    another_item.invoice = another_invoice
+    another_item.save
+    another_invoice.reload

-      transaction = BankTransaction.new(sum: 10,
-                                        description: 'Order nr 1 from registrar 1234567 second number 2345678')
+    transaction = BankTransaction.new(sum: 10,
+                                      description: 'Order nr 1 from registrar 1234567 second number 2345678')

-      assert_difference 'AccountActivity.count' do
-        transaction.autobind_invoice
-      end
-
-      @invoice.reload
-      another_invoice.reload
-      assert(@invoice.paid?)
-      assert_not(another_invoice.paid?)
+    assert_difference 'AccountActivity.count' do
+      transaction.autobind_invoice
    end
+
+    @invoice.reload
+    another_invoice.reload
+    assert(@invoice.paid?)
+    assert_not(another_invoice.paid?)
  end

  def test_matches_against_invoice_nubmber_and_reference_number_in_description
@ -192,7 +191,7 @@ class BankTransactionTest < ActiveSupport::TestCase

  def test_parsed_ref_no_returns_nil_if_ref_not_found
    statement = BankTransaction.new
-    statement.description = "all invalid 12 123 55 77777 --"
+    statement.description = 'all invalid 12 123 55 77777 --'
    assert_nil statement.parsed_ref_number
  end

@ -208,6 +207,7 @@ class BankTransactionTest < ActiveSupport::TestCase
      transaction.bind_invoice('2222')
    end
  end
+
  private

  def create_payable_invoice(attributes)
--- a/test/models/billing/reference_no_test.rb
+++ b/test/models/billing/reference_no_test.rb
@ -7,12 +7,10 @@ class ReferenceNoTest < ActiveSupport::TestCase
  end

  def test_generated_reference_number_conforms_to_format
-    if Feature.billing_system_integrated?
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/reference_number_generator")
-        .to_return(status: 200, body: "{\"reference_number\":\"12332\"}", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/reference_number_generator")
+      .to_return(status: 200, body: "{\"reference_number\":\"12332\"}", headers: {})

-      reference_no = Billing::ReferenceNo.generate
-      assert_match Billing::ReferenceNo::REGEXP, reference_no
-    end
+    reference_no = Billing::ReferenceNo.generate
+    assert_match Billing::ReferenceNo::REGEXP, reference_no
  end
 end
--- a/test/models/feature_test.rb
+++ b/test/models/feature_test.rb
@ -1,53 +1,4 @@
 require 'test_helper'

 class FeatureTest < ActiveSupport::TestCase
-  # setup do
-  #   @domain = domains(:shop)
-  #   @domain.apply_registry_lock(extensions_prohibited: false)
-  # end
-  #
-  # def test_if_obj_and_extensions_prohibited_enabled
-  #   ENV['obj_and_extensions_prohibited'] = 'true'
-  #
-  #   assert Feature.obj_and_extensions_statuses_enabled?
-  #
-  #   statuses = DomainStatus.admin_statuses
-  #   assert statuses.include? DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED
-  # end
-  #
-  # def test_if_obj_and_extensions_prohibited_is_nil
-  #   ENV['obj_and_extensions_prohibited'] = nil
-  #
-  #   assert_not Feature.obj_and_extensions_statuses_enabled?
-  #
-  #   statuses = DomainStatus.admin_statuses
-  #   assert_not statuses.include? DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED
-  # end
-  #
-  # def test_if_obj_and_extensions_prohibited_is_false
-  #   ENV['obj_and_extensions_prohibited'] = 'false'
-  #
-  #   assert_not Feature.obj_and_extensions_statuses_enabled?
-  #
-  #   statuses = DomainStatus.admin_statuses
-  #   assert_not statuses.include? DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED
-  # end
-  #
-  # def test_if_enable_lock_domain_with_new_statuses_is_nil
-  #   ENV['enable_lock_domain_with_new_statuses'] = nil
-  #
-  #   assert_not Feature.enable_lock_domain_with_new_statuses?
-  #
-  #   assert_equal @domain.statuses, ["serverObjUpdateProhibited", "serverDeleteProhibited", "serverTransferProhibited"]
-  #   assert @domain.locked_by_registrant?
-  # end
-  #
-  # def test_if_enable_lock_domain_with_new_statuses_is_false
-  #   ENV['enable_lock_domain_with_new_statuses'] = 'false'
-  #
-  #   assert_not Feature.enable_lock_domain_with_new_statuses?
-  #
-  #   assert_equal @domain.statuses, ["serverObjUpdateProhibited", "serverDeleteProhibited", "serverTransferProhibited"]
-  #   assert @domain.locked_by_registrant?
-  # end
 end
--- a/test/models/invoice_test.rb
+++ b/test/models/invoice_test.rb
@ -118,69 +118,65 @@ class InvoiceTest < ActiveSupport::TestCase
  end

  def test_creates_invoice_with_bank_transaction_total
-    if Feature.billing_system_integrated?
-      registrar = registrars(:bestnames)
-      transaction = bank_transactions(:one).dup
-      transaction.reference_no = registrar.reference_no
-      transaction.sum = 250
+    registrar = registrars(:bestnames)
+    transaction = bank_transactions(:one).dup
+    transaction.reference_no = registrar.reference_no
+    transaction.sum = 250

-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator")
-        .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator")
+      .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator")
-        .to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator")
+      .to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      to_return(status: 200, body: "", headers: {})

-      invoice = Invoice.create_from_transaction!(transaction)
-      assert_equal 250, invoice.total
+    invoice = Invoice.create_from_transaction!(transaction)
+    assert_equal 250, invoice.total

-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 4}\"}", headers: {})
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 4}\"}", headers: {})

-      transaction.sum = 146.88
-      invoice = Invoice.create_from_transaction!(transaction)
-      assert_equal 146.88, invoice.total
+    transaction.sum = 146.88
+    invoice = Invoice.create_from_transaction!(transaction)
+    assert_equal 146.88, invoice.total

-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 5}\"}", headers: {})
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 5}\"}", headers: {})

-      transaction.sum = 0.99
-      invoice = Invoice.create_from_transaction!(transaction)
-      assert_equal 0.99, invoice.total
-    end
+    transaction.sum = 0.99
+    invoice = Invoice.create_from_transaction!(transaction)
+    assert_equal 0.99, invoice.total
  end

  def test_emails_invoice_after_creating_topup_invoice
-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
-        to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      to_return(status: 200, body: "", headers: {})

-      registrar = registrars(:bestnames)
-      transaction = bank_transactions(:one).dup
-      transaction.reference_no = registrar.reference_no
-      transaction.sum = 250
+    registrar = registrars(:bestnames)
+    transaction = bank_transactions(:one).dup
+    transaction.reference_no = registrar.reference_no
+    transaction.sum = 250

-      response = OpenStruct.new(body: "{\"invoice_number\":\"#{invoice_n + 3}\"}")
-      Spy.on(EisBilling::GetInvoiceNumber, :send_invoice).and_return(response)
+    response = OpenStruct.new(body: "{\"invoice_number\":\"#{invoice_n + 3}\"}")
+    Spy.on(EisBilling::GetInvoiceNumber, :send_invoice).and_return(response)

-      assert_emails 1 do
-        Invoice.create_from_transaction!(transaction)
-      end
+    assert_emails 1 do
+      Invoice.create_from_transaction!(transaction)
    end
  end
 end
--- a/test/models/registrar_test.rb
+++ b/test/models/registrar_test.rb
@ -145,55 +145,47 @@ class RegistrarTest < ActiveJob::TestCase
  end

  def test_issues_new_invoice
-    if Feature.billing_system_integrated?
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
-        to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})

-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      to_return(status: 200, body: "", headers: {})

-      travel_to Time.zone.parse('2010-07-05')
-      Setting.days_to_keep_invoices_active = 10
+    travel_to Time.zone.parse('2010-07-05')
+    Setting.days_to_keep_invoices_active = 10

-      invoice = @registrar.issue_prepayment_invoice(100)
+    invoice = @registrar.issue_prepayment_invoice(100)

-      assert_equal Date.parse('2010-07-05'), invoice.issue_date
-      assert_equal Date.parse('2010-07-15'), invoice.due_date
-    end
+    assert_equal Date.parse('2010-07-05'), invoice.issue_date
+    assert_equal Date.parse('2010-07-15'), invoice.due_date
  end

  def test_issues_e_invoice_along_with_invoice
-    if Feature.billing_system_integrated?
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
-        to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})

-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-        to_return(status: 200, body: "", headers: {})
-    end
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      to_return(status: 200, body: "", headers: {})

    EInvoice::Providers::TestProvider.deliveries.clear

    perform_enqueued_jobs do
      @registrar.issue_prepayment_invoice(100)
    end
-
-    unless Feature.billing_system_integrated?
-      assert_equal 1, EInvoice::Providers::TestProvider.deliveries.count
-    end
  end

  def test_invalid_without_address_street
--- a/test/system/admin_area/bank_statement_test.rb
+++ b/test/system/admin_area/bank_statement_test.rb
@ -7,6 +7,9 @@ class AdminAreaBankStatementTest < ApplicationSystemTestCase

    @invoice = invoices(:one)
    Spy.on_instance_method(EisBilling::BaseController, :authorized).and_return(true)
+    response_message = { message: 'got it' }
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_status')
+    .to_return(status: 200, body: response_message.to_json, headers: {})
  end

  def test_update_bank_statement
@ -55,39 +58,37 @@ class AdminAreaBankStatementTest < ApplicationSystemTestCase
  end

  def test_can_bind_statement_transactions
-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator")
-        .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
-      registrar = registrars(:bestnames)
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator")
+      .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    registrar = registrars(:bestnames)

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator")
-        .to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator")
+      .to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response")
-        .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response")
+      .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice")
-        .to_return(status: 200, body: "", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice")
+      .to_return(status: 200, body: "", headers: {})

-      registrar.issue_prepayment_invoice(500)
-      invoice = registrar.invoices.last
+    registrar.issue_prepayment_invoice(500)
+    invoice = registrar.invoices.last

-      create_bank_statement
-      click_link_or_button 'Add'
-      assert_text 'Create bank transaction'
+    create_bank_statement
+    click_link_or_button 'Add'
+    assert_text 'Create bank transaction'

-      fill_in 'Description', with: "Invoice with id #{invoice.number}"
-      fill_in 'Reference number', with: invoice.reference_no
-      fill_in 'Sum', with: invoice.total
-      fill_in 'Paid at', with: Time.zone.today.to_s
-      click_link_or_button 'Save'
+    fill_in 'Description', with: "Invoice with id #{invoice.number}"
+    fill_in 'Reference number', with: invoice.reference_no
+    fill_in 'Sum', with: invoice.total
+    fill_in 'Paid at', with: Time.zone.today.to_s
+    click_link_or_button 'Save'

-      click_link_or_button 'Back to bank statement'
-      click_link_or_button 'Bind invoices'
+    click_link_or_button 'Back to bank statement'
+    click_link_or_button 'Bind invoices'

-      assert_text 'Invoices were fully binded'
-    end
+    assert_text 'Invoices were fully binded'
  end

  def create_bank_statement
--- a/test/system/admin_area/registrars_test.rb
+++ b/test/system/admin_area/registrars_test.rb
@ -14,30 +14,28 @@ class AdminRegistrarsSystemTest < ApplicationSystemTestCase
  end

  def test_creates_new_registrar
-    if Feature.billing_system_integrated?
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/reference_number_generator").
-        to_return(status: 200, body: "{\"reference_number\":\"12332\"}", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/reference_number_generator").
+      to_return(status: 200, body: "{\"reference_number\":\"12332\"}", headers: {})

-      assert_nil Registrar.find_by(name: 'Acme Ltd')
+    assert_nil Registrar.find_by(name: 'Acme Ltd')

-      visit admin_registrars_path
-      click_on 'New registrar'
+    visit admin_registrars_path
+    click_on 'New registrar'

-      fill_in 'Name', with: 'Acme Ltd'
-      fill_in 'Reg no', with: '1234'
-      fill_in 'Contact e-mail', with: 'any@acme.test'
-      fill_in 'Street', with: 'any'
-      fill_in 'City', with: 'any'
-      fill_in 'State / Province', with: 'any'
-      fill_in 'Zip', with: 'any'
-      select 'United States', from: 'Country'
-      fill_in 'Accounting customer code', with: 'test'
-      fill_in 'Code', with: 'test'
-      click_on 'Create registrar'
+    fill_in 'Name', with: 'Acme Ltd'
+    fill_in 'Reg no', with: '1234'
+    fill_in 'Contact e-mail', with: 'any@acme.test'
+    fill_in 'Street', with: 'any'
+    fill_in 'City', with: 'any'
+    fill_in 'State / Province', with: 'any'
+    fill_in 'Zip', with: 'any'
+    select 'United States', from: 'Country'
+    fill_in 'Accounting customer code', with: 'test'
+    fill_in 'Code', with: 'test'
+    click_on 'Create registrar'

-      assert_text 'Registrar has been successfully created'
-      assert_text 'Acme Ltd'
-    end
+    assert_text 'Registrar has been successfully created'
+    assert_text 'Acme Ltd'
  end

  def test_updates_registrar
--- a/test/system/registrar_area/billing/balance_top_up_test.rb
+++ b/test/system/registrar_area/billing/balance_top_up_test.rb
@ -15,32 +15,30 @@ class BalanceTopUpTest < ApplicationSystemTestCase
  end

  def test_creates_new_invoice
-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response")
-        .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response")
+      .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice")
-        .to_return(status: 200, body: "", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice")
+      .to_return(status: 200, body: "", headers: {})

-      Setting.registry_vat_prc = 0.1
+    Setting.registry_vat_prc = 0.1

-      visit registrar_invoices_url
-      click_link_or_button 'Add deposit'
-      fill_in 'Amount', with: '25.5'
+    visit registrar_invoices_url
+    click_link_or_button 'Add deposit'
+    fill_in 'Amount', with: '25.5'

-      assert_difference 'Invoice.count' do
-        click_link_or_button 'Add'
-      end
-
-      invoice = Invoice.last
-
-      assert_equal BigDecimal(10), invoice.vat_rate
-      assert_equal BigDecimal('28.05'), invoice.total
-      assert_text 'Please pay the following invoice'
+    assert_difference 'Invoice.count' do
+      click_link_or_button 'Add'
    end
+
+    invoice = Invoice.last
+
+    assert_equal BigDecimal(10), invoice.vat_rate
+    assert_equal BigDecimal('28.05'), invoice.total
+    assert_text 'Please pay the following invoice'
  end
 end
--- a/test/system/registrar_area/invoices/new_test.rb
+++ b/test/system/registrar_area/invoices/new_test.rb
@ -17,59 +17,55 @@ class NewInvoiceTest < ApplicationSystemTestCase
  end

  def test_create_new_invoice_with_positive_amount
-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      to_return(status: 200, body: "", headers: {})

-      visit registrar_invoices_path
-      click_link_or_button 'Add deposit'
-      fill_in 'Amount', with: '200.00'
-      fill_in 'Description', with: 'My first invoice'
+    visit registrar_invoices_path
+    click_link_or_button 'Add deposit'
+    fill_in 'Amount', with: '200.00'
+    fill_in 'Description', with: 'My first invoice'

-      assert_difference 'Invoice.count', 1 do
-        click_link_or_button 'Add'
-      end
-
-      assert_text 'Please pay the following invoice'
-      assert_text "Invoice no. #{invoice_n + 3}"
-      assert_text 'Subtotal 200,00 €'
-      assert_text 'Pay invoice'
+    assert_difference 'Invoice.count', 1 do
+      click_link_or_button 'Add'
    end
+
+    assert_text 'Please pay the following invoice'
+    assert_text "Invoice no. #{invoice_n + 3}"
+    assert_text 'Subtotal 200,00 €'
+    assert_text 'Pay invoice'
  end

  def test_create_new_invoice_with_comma_in_number
-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      to_return(status: 200, body: "", headers: {})

-      visit registrar_invoices_path
-      click_link_or_button 'Add deposit'
-      fill_in 'Amount', with: '200,00'
-      fill_in 'Description', with: 'My first invoice'
+    visit registrar_invoices_path
+    click_link_or_button 'Add deposit'
+    fill_in 'Amount', with: '200,00'
+    fill_in 'Description', with: 'My first invoice'

-      assert_difference 'Invoice.count', 1 do
-        click_link_or_button 'Add'
-      end
-
-      assert_text 'Please pay the following invoice'
-      assert_text "Invoice no. #{invoice_n + 3}"
-      assert_text 'Subtotal 200,00 €'
-      assert_text 'Pay invoice'
+    assert_difference 'Invoice.count', 1 do
+      click_link_or_button 'Add'
    end
+
+    assert_text 'Please pay the following invoice'
+    assert_text "Invoice no. #{invoice_n + 3}"
+    assert_text 'Subtotal 200,00 €'
+    assert_text 'Pay invoice'
  end

  def test_create_new_invoice_fails_when_amount_is_0
--- a/test/tasks/invoices/process_payments_test.rb
+++ b/test/tasks/invoices/process_payments_test.rb
@ -16,6 +16,12 @@ class ProcessPaymentsTaskTest < ActiveJob::TestCase
    @account_activity = account_activities(:one)
    @account = accounts(:cash)

+    response_message = {
+      message: 'got it'
+    }
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_status')
+    .to_return(status: 200, body: response_message.to_json, headers: {})
+
    Setting.registry_iban = beneficiary_iban

    Lhv::ConnectApi.class_eval do
@ -63,7 +69,8 @@ class ProcessPaymentsTaskTest < ActiveJob::TestCase
  def test_cannot_create_new_invoice_if_transaction_binded_to_paid_invoice
    assert_not @invoice.paid?

-    @account_activity.update(activity_type: "add_credit", bank_transaction: nil, created_at: Time.zone.today - 1.day, creator_str: 'AdminUser')
+    @account_activity.update(activity_type: 'add_credit', bank_transaction: nil,
+                             created_at: Time.zone.today - 1.day, creator_str: 'AdminUser')
    @invoice.update(account_activity: @account_activity, total: @payment_amount)
    assert @invoice.paid?

@ -77,33 +84,32 @@ class ProcessPaymentsTaskTest < ActiveJob::TestCase
  end

  def test_if_invoice_is_overdue_than_48_hours
-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
+    invoice_n = Invoice.order(number: :desc).last.number

-      Spy.on_instance_method(SendEInvoiceTwoJob, :perform_now).and_return(true)
+    Spy.on_instance_method(SendEInvoiceJob, :perform_now).and_return(true)

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/e_invoice/e_invoice')
+      .to_return(status: 200, body: '', headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, 'https://registry:3000/eis_billing/e_invoice_response')
+      .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator')
+      .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
-        to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator')
+      .to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})

-      assert_not @invoice.paid?
+    assert_not @invoice.paid?

-      @account_activity.update(activity_type: "add_credit", bank_transaction: nil, created_at: Time.zone.today - 3.days, creator_str: 'AdminUser')
-      @invoice.update(account_activity: @account_activity, total: @payment_amount)
-      assert @invoice.paid?
+    @account_activity.update(activity_type: 'add_credit', bank_transaction: nil,
+                             created_at: Time.zone.today - 3.days, creator_str: 'AdminUser')
+    @invoice.update(account_activity: @account_activity, total: @payment_amount)
+    assert @invoice.paid?

-      assert_difference 'AccountActivity.count' do
-        assert_difference 'Invoice.count' do
-          capture_io { run_task }
-        end
+    assert_difference 'AccountActivity.count' do
+      assert_difference 'Invoice.count' do
+        capture_io { run_task }
      end
    end
  end
@ -162,31 +168,31 @@ class ProcessPaymentsTaskTest < ActiveJob::TestCase
  end

  def test_credits_registrar_athout_invoice_beforehand
-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}")
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator')
+      .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}")

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
-        to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator')
+      .to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})

-      Spy.on_instance_method(SendEInvoiceTwoJob, :perform_now).and_return(true)
+    Spy.on_instance_method(SendEInvoiceJob, :perform_now).and_return(true)

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/e_invoice/e_invoice')
+      .to_return(status: 200, body: '', headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, 'https://registry:3000/eis_billing/e_invoice_response')
+      .to_return(status: 200,
+                 body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}",
+                 headers: {})

-      registrar = registrars(:bestnames)
+    registrar = registrars(:bestnames)

-      assert_changes -> { registrar.accounts.first.balance } do
-        run_task
-      end
+    assert_changes -> { registrar.accounts.first.balance } do
+      run_task
+    end

-      assert_changes -> { registrar.invoices.count } do
-        run_task
-      end
+    assert_changes -> { registrar.invoices.count } do
+      run_task
    end
  end

@ -198,40 +204,40 @@ class ProcessPaymentsTaskTest < ActiveJob::TestCase
  end

  def test_topup_creates_invoice_and_send_it_as_paid
-    if Feature.billing_system_integrated?
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/e_invoice/e_invoice')
+      .to_return(status: 200, body: '', headers: {})

-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator')
+      .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
-        to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator')
+      .to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, 'https://registry:3000/eis_billing/e_invoice_response')
+      .to_return(status: 200,
+                 body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now - 10.minutes}\"}",
+                 headers: {})

-      registrar = registrars(:bestnames)
-      @invoice.payment_orders.destroy_all
-      @invoice.destroy
+    registrar = registrars(:bestnames)
+    @invoice.payment_orders.destroy_all
+    @invoice.destroy

-      perform_enqueued_jobs do
-        run_task
-      end
-
-      invoice = Invoice.last
-      assert invoice.paid?
-      assert_not invoice.e_invoice_sent_at.blank?
-
-      pdf_source = Invoice::PdfGenerator.new(invoice)
-      pdf_source.send(:invoice_html).include?('Receipt date')
-
-      email= ActionMailer::Base.deliveries.last
-      assert email.subject.include?('already paid')
-
-      assert_equal 0.1, registrar.invoices.last.total
+    perform_enqueued_jobs do
+      run_task
    end
+
+    invoice = Invoice.last
+    assert invoice.paid?
+    assert_not invoice.e_invoice_sent_at.blank?
+
+    pdf_source = Invoice::PdfGenerator.new(invoice)
+    pdf_source.send(:invoice_html).include?('Receipt date')
+
+    email = ActionMailer::Base.deliveries.last
+    assert email.subject.include?('already paid')
+
+    assert_equal 0.1, registrar.invoices.last.total
  end

  def test_output
--- a/test/tasks/registrars/reload_balance_test.rb
+++ b/test/tasks/registrars/reload_balance_test.rb
@ -21,30 +21,28 @@ class ReloadBalanceTaskTest < ActiveSupport::TestCase
  end

  def test_issues_invoice_when_auto_reload_is_enabled_and_threshold_reached
-    if Feature.billing_system_integrated?
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
-        to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})

-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
+    to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-      to_return(status: 200, body: "", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+    to_return(status: 200, body: "", headers: {})

-      reload_amount = 100
-      registrar = registrar_with_auto_reload_enabled_and_threshold_reached(reload_amount)
+    reload_amount = 100
+    registrar = registrar_with_auto_reload_enabled_and_threshold_reached(reload_amount)

-      assert_difference -> { registrar.invoices.count } do
-        capture_io { run_task }
-      end
-
-      invoice = registrar.invoices.last
-      assert_equal Time.zone.today, invoice.e_invoice_sent_at.to_date
+    assert_difference -> { registrar.invoices.count } do
+      capture_io { run_task }
    end
+
+    invoice = registrar.invoices.last
+    assert_equal Time.zone.today, invoice.e_invoice_sent_at.to_date
  end

  def test_skips_issuing_invoice_when_threshold_is_not_reached
@ -66,51 +64,47 @@ class ReloadBalanceTaskTest < ActiveSupport::TestCase
  end

  def test_marks_registrar_as_pending_balance_reload
-    if Feature.billing_system_integrated?
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
-        to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})

-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
-        
-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
-  
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-        to_return(status: 200, body: "", headers: {})
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+      
+    stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})

-      registrar = registrar_with_auto_reload_enabled_and_threshold_reached
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      to_return(status: 200, body: "", headers: {})

-      capture_io { run_task }
-      registrar.reload
+    registrar = registrar_with_auto_reload_enabled_and_threshold_reached

-      assert registrar.settings['balance_auto_reload']['pending']
-    end
+    capture_io { run_task }
+    registrar.reload
+
+    assert registrar.settings['balance_auto_reload']['pending']
  end

  def test_output
-    if Feature.billing_system_integrated?
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
-        to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})

-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})

-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})

-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      to_return(status: 200, body: "", headers: {})

-      reload_amount = 100
-      registrar = registrar_with_auto_reload_enabled_and_threshold_reached(reload_amount)
-      assert_equal 'Best Names', registrar.name
+    reload_amount = 100
+    registrar = registrar_with_auto_reload_enabled_and_threshold_reached(reload_amount)
+    assert_equal 'Best Names', registrar.name

-      assert_output %(Registrar "Best Names" got #{number_to_currency(reload_amount, unit: 'EUR')}\nInvoiced total: 1\n) do
-        run_task
-      end
+    assert_output %(Registrar "Best Names" got #{number_to_currency(reload_amount, unit: 'EUR')}\nInvoiced total: 1\n) do
+      run_task
    end
  end