fixed tests

This commit is contained in:
olegphenomenon 2022-04-01 09:32:06 +03:00
parent fdf70359d1
commit 8812f8da22
20 changed files with 109 additions and 165 deletions

View file

@ -16,7 +16,10 @@ module EisBilling
bank_statement = BankStatement.new(bank_code: Setting.registry_bank_code, bank_statement = BankStatement.new(bank_code: Setting.registry_bank_code,
iban: Setting.registry_iban) iban: Setting.registry_iban)
bank_statement_transaction(bank_statement: bank_statement, incoming_transaction: incoming_transaction)
end
def bank_statement_transaction(bank_statement:, incoming_transaction:)
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
bank_statement.save! bank_statement.save!
transaction = create_transaction(incoming_transaction: incoming_transaction, bank_statement: bank_statement) transaction = create_transaction(incoming_transaction: incoming_transaction, bank_statement: bank_statement)

View file

@ -4,8 +4,6 @@ module EisBilling
send_request send_request
end end
private
def self.send_request def self.send_request
http = EisBilling::Base.base_request(url: invoice_number_generator_url) http = EisBilling::Base.base_request(url: invoice_number_generator_url)
http.post(invoice_number_generator_url, nil, EisBilling::Base.headers) http.post(invoice_number_generator_url, nil, EisBilling::Base.headers)

View file

@ -1,18 +1,16 @@
module EisBilling module EisBilling
class GetReferenceNumber < EisBilling::Base class GetReferenceNumber < EisBilling::Base
def self.send_request def self.send_request
send_request send_it
end end
private
def self.obj_data def self.obj_data
{ {
initiator: INITIATOR, initiator: INITIATOR,
} }
end end
def self.send_request def self.send_it
http = EisBilling::Base.base_request(url: reference_number_generator_url) http = EisBilling::Base.base_request(url: reference_number_generator_url)
http.post(reference_number_generator_url, obj_data.to_json, EisBilling::Base.headers) http.post(reference_number_generator_url, obj_data.to_json, EisBilling::Base.headers)
end end

View file

@ -6,7 +6,33 @@ module EisBilling
def self.send_info(invoice:, payable:) def self.send_info(invoice:, payable:)
items = [] items = []
prepared_data = { prepared_data = prepare_data(invoice: invoice, payable: payable)
invoice.items.each do |invoice_item|
items << prepare_item(invoice_item)
end
prepared_data[:items] = items
http = EisBilling::Base.base_request(url: e_invoice_url)
http.post(e_invoice_url, prepared_data.to_json, EisBilling::Base.headers)
end
def self.prepare_item(invoice_item)
{
description: invoice_item.description,
price: invoice_item.price,
quantity: invoice_item.quantity,
unit: invoice_item.unit,
subtotal: invoice_item.subtotal,
vat_rate: invoice_item.vat_rate,
vat_amount: invoice_item.vat_amount,
total: invoice_item.total,
}
end
def self.prepare_data(invoice:, payable:)
{
invoice: invoice, invoice: invoice,
vat_amount: invoice.vat_amount, vat_amount: invoice.vat_amount,
invoice_subtotal: invoice.subtotal, invoice_subtotal: invoice.subtotal,
@ -17,24 +43,6 @@ module EisBilling
payable: payable, payable: payable,
initiator: EisBilling::Base::INITIATOR, initiator: EisBilling::Base::INITIATOR,
} }
invoice.items.each do |invoice_item|
items << {
description: invoice_item.description,
price: invoice_item.price,
quantity: invoice_item.quantity,
unit: invoice_item.unit,
subtotal: invoice_item.subtotal,
vat_rate: invoice_item.vat_rate,
vat_amount: invoice_item.vat_amount,
total: invoice_item.total,
}
end
prepared_data[:items] = items
http = EisBilling::Base.base_request(url: e_invoice_url)
http.post(e_invoice_url, prepared_data.to_json, EisBilling::Base.headers)
end end
def self.e_invoice_url def self.e_invoice_url

View file

@ -60,8 +60,8 @@ end
def headers def headers
{ {
'Authorization' => "Bearer #{generate_token}", 'Authorization' => "Bearer #{generate_token}",
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
} }
end end

View file

@ -27,16 +27,16 @@ class AdminAreaInvoicesIntegrationTest < ApplicationIntegrationTest
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator"). 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: {}) to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
visit new_admin_invoice_path visit new_admin_invoice_path

View file

@ -1,63 +0,0 @@
require 'test_helper'
class PaymentStatusIntegrationTest < ApplicationIntegrationTest
setup do
@invoice = invoices(:unpaid)
sign_in users(:api_bestnames)
Spy.on_instance_method(EisBilling::BaseController, :authorized).and_return(true)
end
def test_update_payment_status_should_create_succesfully_billing_instaces
if Feature.billing_system_integrated?
payload = {
"order_reference" => @invoice.number,
"transaction_time" => Time.zone.now - 2.minute,
"standing_amount" => @invoice.total,
"payment_state" => 'settled'
}
assert_difference -> { @invoice.payment_orders.count } do
assert_difference -> { BankTransaction.count } do
put eis_billing_payment_status_path, params: payload,
headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
end
end
bank_transaction = BankTransaction.order(created_at: :desc).first
invoice_payment_order = @invoice.payment_orders.order(created_at: :desc).first
assert_equal bank_transaction.sum, @invoice.total
assert_equal invoice_payment_order.status, "paid"
assert_equal @invoice.account_activity.activity_type, "add_credit"
assert_response :ok
end
end
def test_update_payment_status_should_create_failed_payment
if Feature.billing_system_integrated?
payload = {
"order_reference" => @invoice.number,
"transaction_time" => Time.zone.now - 2.minute,
"standing_amount" => @invoice.total,
"payment_state" => 'cancelled'
}
assert_difference -> { @invoice.payment_orders.count } do
assert_difference -> { BankTransaction.count } do
put eis_billing_payment_status_path, params: payload,
headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
end
end
bank_transaction = BankTransaction.order(created_at: :desc).first
invoice_payment_order = @invoice.payment_orders.order(created_at: :desc).first
assert_equal bank_transaction.sum, @invoice.total
assert_equal invoice_payment_order.status, "failed"
assert_equal @invoice.account_activity.activity_type, "add_credit"
assert_response :ok
end
end
end

View file

@ -18,7 +18,7 @@ class BankTransactionTest < ActiveSupport::TestCase
def test_binds_if_this_sum_invoice_already_present def test_binds_if_this_sum_invoice_already_present
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
create_payable_invoice(number: '2222', total: 10, reference_no: '1234567') create_payable_invoice(number: '2222', total: 10, reference_no: '1234567')
another_invoice = @invoice.dup another_invoice = @invoice.dup
@ -47,7 +47,7 @@ class BankTransactionTest < ActiveSupport::TestCase
def test_binds_if_this_sum_cancelled_invoice_already_present def test_binds_if_this_sum_cancelled_invoice_already_present
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
create_payable_invoice(number: '2222', total: 10, reference_no: '1234567') create_payable_invoice(number: '2222', total: 10, reference_no: '1234567')
another_invoice = @invoice.dup another_invoice = @invoice.dup
@ -73,7 +73,7 @@ class BankTransactionTest < ActiveSupport::TestCase
def test_marks_the_first_one_as_paid_if_same_sum def test_marks_the_first_one_as_paid_if_same_sum
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
create_payable_invoice(number: '2222', total: 10, reference_no: '1234567') create_payable_invoice(number: '2222', total: 10, reference_no: '1234567')
another_invoice = @invoice.dup another_invoice = @invoice.dup

View file

@ -8,7 +8,7 @@ class ReferenceNoTest < ActiveSupport::TestCase
def test_generated_reference_number_conforms_to_format def test_generated_reference_number_conforms_to_format
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/reference_number_generator") stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/reference_number_generator")
.to_return(status: 200, body: "{\"reference_number\":\"12332\"}", headers: {}) .to_return(status: 200, body: "{\"reference_number\":\"12332\"}", headers: {})
reference_no = Billing::ReferenceNo.generate reference_no = Billing::ReferenceNo.generate

View file

@ -125,23 +125,23 @@ class InvoiceTest < ActiveSupport::TestCase
transaction.sum = 250 transaction.sum = 250
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator") 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: {}) .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator") 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: {}) .to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
invoice = Invoice.create_from_transaction!(transaction) invoice = Invoice.create_from_transaction!(transaction)
assert_equal 250, invoice.total assert_equal 250, invoice.total
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 4}\"}", headers: {})
transaction.sum = 146.88 transaction.sum = 146.88
@ -149,7 +149,7 @@ class InvoiceTest < ActiveSupport::TestCase
assert_equal 146.88, invoice.total assert_equal 146.88, invoice.total
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 5}\"}", headers: {})
transaction.sum = 0.99 transaction.sum = 0.99
@ -161,13 +161,13 @@ class InvoiceTest < ActiveSupport::TestCase
def test_emails_invoice_after_creating_topup_invoice def test_emails_invoice_after_creating_topup_invoice
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator"). 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: {}) to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
registrar = registrars(:bestnames) registrar = registrars(:bestnames)

View file

@ -146,17 +146,17 @@ class RegistrarTest < ActiveJob::TestCase
def test_issues_new_invoice def test_issues_new_invoice
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator"). 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: {}) to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
travel_to Time.zone.parse('2010-07-05') travel_to Time.zone.parse('2010-07-05')
@ -171,20 +171,20 @@ class RegistrarTest < ActiveJob::TestCase
def test_issues_e_invoice_along_with_invoice def test_issues_e_invoice_along_with_invoice
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator"). 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: {}) to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
end end
EInvoice::Providers::TestProvider.deliveries.clear EInvoice::Providers::TestProvider.deliveries.clear
perform_enqueued_jobs do perform_enqueued_jobs do

View file

@ -6,7 +6,7 @@ class SendDataToDirectoTest < ActiveSupport::TestCase
end end
def test_should_send_data_to_billing_directo def test_should_send_data_to_billing_directo
stub_request(:post, "http://eis_billing_system:3000/api/v1/directo/directo"). stub_request(:post, "https://eis_billing_system:3000/api/v1/directo/directo").
to_return(status: 200, body: "ok", headers: {}) to_return(status: 200, body: "ok", headers: {})
res = EisBilling::SendDataToDirecto.send_request(object_data: [], monthly: true, dry: true) res = EisBilling::SendDataToDirecto.send_request(object_data: [], monthly: true, dry: true)

View file

@ -57,17 +57,17 @@ class AdminAreaBankStatementTest < ApplicationSystemTestCase
def test_can_bind_statement_transactions def test_can_bind_statement_transactions
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator") 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: {}) .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
registrar = registrars(:bestnames) registrar = registrars(:bestnames)
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator") 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: {}) .to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response") 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: {}) .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice") stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice")
.to_return(status: 200, body: "", headers: {}) .to_return(status: 200, body: "", headers: {})
registrar.issue_prepayment_invoice(500) registrar.issue_prepayment_invoice(500)

View file

@ -15,7 +15,7 @@ class AdminRegistrarsSystemTest < ApplicationSystemTestCase
def test_creates_new_registrar def test_creates_new_registrar
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/reference_number_generator"). stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/reference_number_generator").
to_return(status: 200, body: "{\"reference_number\":\"12332\"}", headers: {}) 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')

View file

@ -13,16 +13,16 @@ class AddDepositsTest < ApplicationSystemTestCase
def test_should_send_request_for_creating_invoice_to_eis_system def test_should_send_request_for_creating_invoice_to_eis_system
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator"). 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: {}) to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
visit new_registrar_deposit_url visit new_registrar_deposit_url

View file

@ -17,13 +17,13 @@ class BalanceTopUpTest < ApplicationSystemTestCase
def test_creates_new_invoice def test_creates_new_invoice
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response") 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: {}) .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice") stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice")
.to_return(status: 200, body: "", headers: {}) .to_return(status: 200, body: "", headers: {})
Setting.registry_vat_prc = 0.1 Setting.registry_vat_prc = 0.1

View file

@ -29,13 +29,13 @@ class NewInvoicePaymentTest < ApplicationSystemTestCase
def test_create_new_SEB_payment def test_create_new_SEB_payment
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
create_invoice_and_visit_its_page create_invoice_and_visit_its_page
@ -50,13 +50,13 @@ class NewInvoicePaymentTest < ApplicationSystemTestCase
def test_create_new_Every_Pay_payment def test_create_new_Every_Pay_payment
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
create_invoice_and_visit_its_page create_invoice_and_visit_its_page

View file

@ -19,13 +19,13 @@ class NewInvoiceTest < ApplicationSystemTestCase
def test_create_new_invoice_with_positive_amount def test_create_new_invoice_with_positive_amount
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
visit registrar_invoices_path visit registrar_invoices_path
@ -47,13 +47,13 @@ class NewInvoiceTest < ApplicationSystemTestCase
def test_create_new_invoice_with_comma_in_number def test_create_new_invoice_with_comma_in_number
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
visit registrar_invoices_path visit registrar_invoices_path

View file

@ -82,16 +82,16 @@ class ProcessPaymentsTaskTest < ActiveJob::TestCase
Spy.on_instance_method(SendEInvoiceTwoJob, :perform_now).and_return(true) Spy.on_instance_method(SendEInvoiceTwoJob, :perform_now).and_return(true)
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator"). 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: {}) to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
assert_not @invoice.paid? assert_not @invoice.paid?
@ -164,18 +164,18 @@ class ProcessPaymentsTaskTest < ActiveJob::TestCase
def test_credits_registrar_athout_invoice_beforehand def test_credits_registrar_athout_invoice_beforehand
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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}\"}") to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}")
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator"). 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: {}) 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(SendEInvoiceTwoJob, :perform_now).and_return(true)
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
registrar = registrars(:bestnames) registrar = registrars(:bestnames)
@ -199,17 +199,17 @@ class ProcessPaymentsTaskTest < ActiveJob::TestCase
def test_topup_creates_invoice_and_send_it_as_paid def test_topup_creates_invoice_and_send_it_as_paid
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator"). 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: {}) to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
registrar = registrars(:bestnames) registrar = registrars(:bestnames)

View file

@ -22,17 +22,17 @@ class ReloadBalanceTaskTest < ActiveSupport::TestCase
def test_issues_invoice_when_auto_reload_is_enabled_and_threshold_reached def test_issues_invoice_when_auto_reload_is_enabled_and_threshold_reached
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator"). 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: {}) to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
reload_amount = 100 reload_amount = 100
@ -67,17 +67,17 @@ class ReloadBalanceTaskTest < ActiveSupport::TestCase
def test_marks_registrar_as_pending_balance_reload def test_marks_registrar_as_pending_balance_reload
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator"). 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: {}) to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
registrar = registrar_with_auto_reload_enabled_and_threshold_reached registrar = registrar_with_auto_reload_enabled_and_threshold_reached
@ -91,17 +91,17 @@ class ReloadBalanceTaskTest < ActiveSupport::TestCase
def test_output def test_output
if Feature.billing_system_integrated? if Feature.billing_system_integrated?
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator"). 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: {}) to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
invoice_n = Invoice.order(number: :desc).last.number invoice_n = Invoice.order(number: :desc).last.number
stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response"). 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: {}) to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
to_return(status: 200, body: "", headers: {}) to_return(status: 200, body: "", headers: {})
reload_amount = 100 reload_amount = 100