- <%= f.label :valid_to_from, for: nil %>
+ <%= f.label :valid_to_gteq, for: nil %>
<%= f.search_field :valid_to_gteq, value: search_params[:valid_to_gteq],
class: 'form-control js-datepicker',
placeholder: t(:valid_to_from) %>
@@ -53,7 +53,7 @@
- <%= f.label :valid_to_until, for: nil %>
+ <%= f.label :valid_to_lteq, for: nil %>
<%= f.search_field :valid_to_lteq, value: search_params[:valid_to_lteq],
class: 'form-control js-datepicker',
placeholder: t(:valid_to_until) %>
diff --git a/app/views/registrar/invoices/partials/_details.haml b/app/views/registrar/invoices/partials/_details.haml
index c5e6193a4..acc0e6589 100644
--- a/app/views/registrar/invoices/partials/_details.haml
+++ b/app/views/registrar/invoices/partials/_details.haml
@@ -19,6 +19,8 @@
%dd= l @invoice.receipt_date
- elsif @invoice.cancelled?
%dd.text-grey= t(:cancelled)
+ - elsif @invoice.monthly_invoice
+ %dd= l @invoice.issue_date
- else
%dd{class: 'text-danger'}= t(:unpaid)
diff --git a/app/views/registrar/invoices/partials/_monthly_invoice_items.haml b/app/views/registrar/invoices/partials/_monthly_invoice_items.haml
new file mode 100644
index 000000000..787218ea3
--- /dev/null
+++ b/app/views/registrar/invoices/partials/_monthly_invoice_items.haml
@@ -0,0 +1,38 @@
+%h4= t(:items)
+%hr
+.table-responsive
+ %table.table.table-hover.table-condensed
+ %thead
+ %tr
+ %th{class: 'col-xs-1'}= t(:code)
+ %th{class: 'col-xs-1'}= InvoiceItem.human_attribute_name :quantity
+ %th{class: 'col-xs-1'}= t(:unit)
+ %th{class: 'col-xs-5'}= t(:description)
+ %th{class: 'col-xs-2'}= t(:price)
+ %th{class: 'col-xs-2'}= t(:total)
+ %tbody
+ - @invoice.each do |invoice_item|
+ %tr
+ %td= invoice_item.product_id
+ %td= invoice_item.quantity
+ %td= invoice_item.unit
+ %td= invoice_item.description
+ - if invoice_item.price && invoice_item.quantity
+ %td= currency(invoice_item.price)
+ %td= "#{currency((invoice_item.price * invoice_item.quantity).round(3))} #{@invoice.currency}"
+ - else
+ %td= ''
+ %td= ''
+ %tfoot
+ %tr
+ %th{colspan: 4}
+ %th= Invoice.human_attribute_name :subtotal
+ %td= number_to_currency(0)
+ %tr
+ %th.no-border{colspan: 4}
+ %th= "VAT #{number_to_percentage(@invoice.vat_rate, precision: 1)}"
+ %td= number_to_currency(0)
+ %tr
+ %th.no-border{colspan: 4}
+ %th= t(:total)
+ %td= number_to_currency(0)
\ No newline at end of file
diff --git a/app/views/registrar/invoices/show.haml b/app/views/registrar/invoices/show.haml
index 5e6104091..dd19a0bea 100644
--- a/app/views/registrar/invoices/show.haml
+++ b/app/views/registrar/invoices/show.haml
@@ -13,7 +13,10 @@
.col-md-6= render 'registrar/invoices/partials/seller'
.col-md-6= render 'registrar/invoices/partials/buyer'
.row
- .col-md-12= render 'registrar/invoices/partials/items'
+ - if @invoice.monthly_invoice
+ .col-md-12= render 'registrar/invoices/partials/monthly_invoice_items'
+ - else
+ .col-md-12= render 'registrar/invoices/partials/items'
- if @invoice.payable?
.row.semifooter
diff --git a/app/views/registrar/polls/show.haml b/app/views/registrar/polls/show.haml
index 4ff116b81..c97d7a5d5 100644
--- a/app/views/registrar/polls/show.haml
+++ b/app/views/registrar/polls/show.haml
@@ -27,10 +27,11 @@
= form_tag confirm_transfer_registrar_poll_path, class: 'js-transfer-form' do
= hidden_field_tag 'domain[name]', @data.css('name').text
- - @data.css('trnData').children.each do |x|
- - next if x.blank?
- %dt= t(x.name)
- %dd= x.text
+ - @data.css('trnData').children.each do |x|
+ - next if x.blank?
+ %dt= t(x.name)
+ %dd= x.text
+
- else
.row
.col-sm-12
diff --git a/config/initializers/arel.rb b/config/initializers/arel.rb
new file mode 100644
index 000000000..9db1facf3
--- /dev/null
+++ b/config/initializers/arel.rb
@@ -0,0 +1,25 @@
+require 'arel/nodes/binary'
+require 'arel/predications'
+require 'arel/visitors/postgresql'
+
+module Arel
+ class Nodes::ContainsArray < Arel::Nodes::Binary
+ def operator
+ :"@>"
+ end
+ end
+
+ class Visitors::PostgreSQL
+ private
+
+ def visit_Arel_Nodes_ContainsArray(o, collector)
+ infix_value o, collector, ' @> '
+ end
+ end
+
+ module Predications
+ def contains_array(other)
+ Nodes::ContainsArray.new self, Nodes.build_quoted(other, self)
+ end
+ end
+end
\ No newline at end of file
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index e3e0d644b..2690160ef 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -15,62 +15,67 @@ host = ENV['tara_host']
identifier = ENV['tara_identifier']
secret = ENV['tara_secret']
redirect_uri = ENV['tara_redirect_uri']
+authorization_endpoint = ENV['tara_authorization_endpoint']
+token_endpoint = ENV['tara_token_endpoint']
+jwks_uri = ENV['tara_jwks_uri']
+scope = ENV['tara_scope']
registrant_identifier = ENV['tara_rant_identifier']
registrant_secret = ENV['tara_rant_secret']
registrant_redirect_uri = ENV['tara_rant_redirect_uri']
Rails.application.config.middleware.use OmniAuth::Builder do
- provider "tara", {
- callback_path: '/registrar/open_id/callback',
- name: 'tara',
- scope: ['openid'],
- state: Proc.new{ SecureRandom.hex(10) },
- client_signing_alg: :RS256,
- client_jwk_signing_key: signing_keys,
- send_scope_to_token_endpoint: false,
- send_nonce: true,
- issuer: issuer,
+ provider 'tara', {
+ callback_path: '/registrar/open_id/callback',
+ name: 'tara',
+ scope: scope,
+ # state: Proc.new{ SecureRandom.hex(10) },
+ client_signing_alg: :RS256,
+ client_jwk_signing_key: signing_keys,
+ send_scope_to_token_endpoint: false,
+ send_nonce: true,
+ issuer: issuer,
+ discovery: true,
- client_options: {
- scheme: 'https',
- host: host,
+ client_options: {
+ scheme: 'https',
+ host: host,
- authorization_endpoint: '/oidc/authorize',
- token_endpoint: '/oidc/token',
- userinfo_endpoint: nil, # Not implemented
- jwks_uri: '/oidc/jwks',
+ authorization_endpoint: authorization_endpoint,
+ token_endpoint: token_endpoint,
+ userinfo_endpoint: nil, # Not implemented
+ jwks_uri: jwks_uri,
- # Registry
- identifier: identifier,
- secret: secret,
- redirect_uri: redirect_uri,
- },
+ # Registry
+ identifier: identifier,
+ secret: secret,
+ redirect_uri: redirect_uri,
+ },
}
- provider "tara", {
- callback_path: '/registrant/open_id/callback',
- name: 'rant_tara',
- scope: ['openid'],
- client_signing_alg: :RS256,
- client_jwk_signing_key: signing_keys,
- send_scope_to_token_endpoint: false,
- send_nonce: true,
- issuer: issuer,
+ provider 'tara', {
+ callback_path: '/registrant/open_id/callback',
+ name: 'rant_tara',
+ scope: ['openid'],
+ client_signing_alg: :RS256,
+ client_jwk_signing_key: signing_keys,
+ send_scope_to_token_endpoint: false,
+ send_nonce: true,
+ issuer: issuer,
- client_options: {
- scheme: 'https',
- host: host,
+ client_options: {
+ scheme: 'https',
+ host: host,
- authorization_endpoint: '/oidc/authorize',
- token_endpoint: '/oidc/token',
- userinfo_endpoint: nil, # Not implemented
- jwks_uri: '/oidc/jwks',
+ authorization_endpoint: '/oidc/authorize',
+ token_endpoint: '/oidc/token',
+ userinfo_endpoint: nil, # Not implemented
+ jwks_uri: '/oidc/jwks',
- # Registry
- identifier: registrant_identifier,
- secret: registrant_secret,
- redirect_uri: registrant_redirect_uri,
- },
+ # Registry
+ identifier: registrant_identifier,
+ secret: registrant_secret,
+ redirect_uri: registrant_redirect_uri,
+ },
}
end
diff --git a/config/initializers/ransack.rb b/config/initializers/ransack.rb
new file mode 100644
index 000000000..d26360672
--- /dev/null
+++ b/config/initializers/ransack.rb
@@ -0,0 +1,7 @@
+Ransack.configure do |config|
+ config.add_predicate 'contains_array',
+ arel_predicate: 'contains_array',
+ formatter: proc { |v| "{#{v}}" },
+ validator: proc { |v| v.present? },
+ type: :string
+end
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9c396cbde..9021eff60 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -101,6 +101,11 @@ en:
attributes:
value:
taken: 'Status already exists on this domain'
+
+ invoice:
+ attributes:
+ base:
+ invoice_status_prohibits_operation: 'Invoice status prohibits operation'
user:
attributes:
@@ -479,6 +484,8 @@ en:
invoice:
title: 'Invoice'
already_paid: " (already paid)"
+ monthly_invoice: " (monthly invoice)"
+ monthly_invoice_description: 'Monthly invoice'
bank_statements: 'Bank statements'
back_to_bank_statements: 'Back to bank statements'
back_to_bank_statement: 'Back to bank statement'
diff --git a/config/locales/et.yml b/config/locales/et.yml
index ad04db007..84672ed3c 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -9,3 +9,5 @@ et:
invoice:
title: 'Arve'
already_paid: " (juba makstud)"
+ monthly_invoice: " (kuuaruanne)"
+ monthly_invoice_description: 'Kuuaruanne'
diff --git a/config/routes.rb b/config/routes.rb
index 8fd80f923..180a4687d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -71,12 +71,30 @@ Rails.application.routes.draw do
resources :contacts do
collection do
get 'check/:id', to: 'contacts#check'
+ get 'search(/:id)', to: 'contacts#search'
end
end
- resources :accounts do
+ resource :accounts, only: %i[index update] do
collection do
+ get '/', to: 'accounts#index'
get 'balance'
+ get 'details'
+ post 'update_auto_reload_balance'
+ get 'disable_auto_reload_balance'
+ end
+ member do
+ put 'switch_user'
+ end
+ end
+ resources :invoices, only: %i[index show] do
+ collection do
+ get ':id/download', to: 'invoices#download'
+ post 'add_credit'
+ end
+ member do
+ post 'send_to_recipient', to: 'invoices#send_to_recipient'
+ put 'cancel', to: 'invoices#cancel'
end
end
resources :auctions, only: %i[index]
@@ -98,6 +116,12 @@ Rails.application.routes.draw do
put '/', to: 'nameservers#update'
end
end
+ resources :summary, only: %i[index]
+ resources :auth, only: %i[index] do
+ collection do
+ post '/tara_callback', to: 'auth#tara_callback'
+ end
+ end
end
resources :domains, constraints: { id: /.*/ } do
resources :nameservers, only: %i[index create destroy], constraints: { id: /.*/ }, controller: 'domains/nameservers'
@@ -146,9 +170,9 @@ Rails.application.routes.draw do
namespace :accreditation_center do
# At the moment invoice_status endpoint returns only cancelled invoices. But in future logic of this enpoint can change.
# And it will need to return invoices of different statuses. I decided to leave the name of the endpoint "invoice_status"
- resources :invoice_status, only: [ :index ]
- resource :domains, only: [ :show ], param: :name
- resource :contacts, only: [ :show ], param: :id
+ resources :invoice_status, only: [:index]
+ resource :domains, only: [:show], param: :name
+ resource :contacts, only: [:show], param: :id
# resource :auth, only: [ :index ]
get 'auth', to: 'auth#index'
end
@@ -159,7 +183,7 @@ Rails.application.routes.draw do
end
match '*all', controller: 'cors', action: 'cors_preflight_check', via: [:options],
- as: 'cors_preflight_check'
+ as: 'cors_preflight_check'
end
# REGISTRAR ROUTES
diff --git a/db/migrate/20150810114746_add_statuses_backup_for_domains.rb b/db/migrate/20150810114746_add_statuses_backup_for_domains.rb
index 9e9885c6c..c1f6bbfd6 100644
--- a/db/migrate/20150810114746_add_statuses_backup_for_domains.rb
+++ b/db/migrate/20150810114746_add_statuses_backup_for_domains.rb
@@ -1,5 +1,5 @@
class AddStatusesBackupForDomains < ActiveRecord::Migration[6.0]
def change
- add_column :domains, :statuses_backup, :string, array: true, default: []
+ # add_column :domains, :statuses_backup, :string, array: true, default: []
end
end
diff --git a/db/migrate/20180422154642_rename_domains_statuses_backup_to_statuses_before_force_delete.rb b/db/migrate/20180422154642_rename_domains_statuses_backup_to_statuses_before_force_delete.rb
index 97b577068..90b9321cb 100644
--- a/db/migrate/20180422154642_rename_domains_statuses_backup_to_statuses_before_force_delete.rb
+++ b/db/migrate/20180422154642_rename_domains_statuses_backup_to_statuses_before_force_delete.rb
@@ -1,5 +1,5 @@
class RenameDomainsStatusesBackupToStatusesBeforeForceDelete < ActiveRecord::Migration[6.0]
def change
- rename_column :domains, :statuses_backup, :statuses_before_force_delete
+ # rename_column :domains, :statuses_backup, :statuses_before_force_delete
end
end
diff --git a/db/migrate/20220524130709_remove_statuses_before_force_delete_from_domains.rb b/db/migrate/20220524130709_remove_statuses_before_force_delete_from_domains.rb
new file mode 100644
index 000000000..61e06141e
--- /dev/null
+++ b/db/migrate/20220524130709_remove_statuses_before_force_delete_from_domains.rb
@@ -0,0 +1,5 @@
+class RemoveStatusesBeforeForceDeleteFromDomains < ActiveRecord::Migration[6.1]
+ def change
+ remove_column :domains, :statuses_before_force_delete if column_exists? :domains, :statuses_before_force_delete
+ end
+end
diff --git a/db/migrate/20220818075833_add_monthly_invoice_type_columns.rb b/db/migrate/20220818075833_add_monthly_invoice_type_columns.rb
new file mode 100644
index 000000000..33c98124c
--- /dev/null
+++ b/db/migrate/20220818075833_add_monthly_invoice_type_columns.rb
@@ -0,0 +1,6 @@
+class AddMonthlyInvoiceTypeColumns < ActiveRecord::Migration[6.1]
+ def change
+ add_column :invoices, :monthly_invoice, :boolean, default: false
+ add_column :invoices, :metadata, :jsonb
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 0d2055c2e..3b9e11055 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -956,7 +956,6 @@ CREATE TABLE public.domains (
force_delete_date date,
statuses character varying[],
status_notes public.hstore,
- statuses_before_force_delete character varying[] DEFAULT '{}'::character varying[],
upid integer,
up_date timestamp without time zone,
uuid uuid DEFAULT public.gen_random_uuid() NOT NULL,
@@ -1197,6 +1196,8 @@ CREATE TABLE public.invoices (
issue_date date NOT NULL,
e_invoice_sent_at timestamp without time zone,
payment_link character varying,
+ monthly_invoice boolean DEFAULT false,
+ metadata jsonb,
CONSTRAINT invoices_due_date_is_not_before_issue_date CHECK ((due_date >= issue_date))
);
@@ -5407,10 +5408,12 @@ INSERT INTO "schema_migrations" (version) VALUES
('20220216113112'),
('20220228093211'),
('20220316140727'),
+('20220406085500'),
('20220412130856'),
('20220413073315'),
('20220413084536'),
('20220413084748'),
('20220504090512'),
-('20220406085500'),
-('20220701113409');
+('20220524130709'),
+('20220701113409'),
+('20220818075833');
diff --git a/doc/registrant-api/v1/domain.md b/doc/registrant-api/v1/domain.md
index 9163a2850..f6a1705de 100644
--- a/doc/registrant-api/v1/domain.md
+++ b/doc/registrant-api/v1/domain.md
@@ -103,10 +103,7 @@ Content-Type: application/json
"dnssec_changed_at": "2015-09-09T09:11:14.860Z",
"status_notes":{
- },
- "statuses_backup":[
-
- ]
+ }
}
]
```
@@ -219,10 +216,7 @@ Content-Type: application/json
"dnssec_changed_at": "2015-09-09T09:11:14.860Z",
"status_notes":{
- },
- "statuses_backup":[
-
- ]
+ }
}
]
```
@@ -326,10 +320,7 @@ Content-Type: application/json
"dnssec_changed_at": "2015-09-09T09:11:14.860Z",
"status_notes":{
- },
- "statuses_backup":[
-
- ]
+ }
}
```
diff --git a/doc/registrant-api/v1/registry_lock.md b/doc/registrant-api/v1/registry_lock.md
index 17f4c6f6e..04102420a 100644
--- a/doc/registrant-api/v1/registry_lock.md
+++ b/doc/registrant-api/v1/registry_lock.md
@@ -96,10 +96,7 @@ Content-Type: application/json
],
"status_notes":{
- },
- "statuses_backup":[
-
- ]
+ }
}
```
@@ -235,10 +232,7 @@ Content-Type: application/json
],
"status_notes":{
- },
- "statuses_backup":[
-
- ]
+ }
}
```
diff --git a/lib/serializers/repp/contact.rb b/lib/serializers/repp/contact.rb
index b5d03b5cd..5afab98f0 100644
--- a/lib/serializers/repp/contact.rb
+++ b/lib/serializers/repp/contact.rb
@@ -3,21 +3,35 @@ module Serializers
class Contact
attr_reader :contact
- def initialize(contact, show_address:)
+ def initialize(contact, options = {})
@contact = contact
- @show_address = show_address
+ @show_address = options[:show_address]
+ @domain_params = options[:domain_params] || nil
+ @simplify = options[:simplify] || false
end
+ # rubocop:disable Metrics/MethodLength
+ # rubocop:disable Metrics/AbcSize
def to_json(obj = contact)
- json = { id: obj.code, name: obj.name, ident: ident,
- email: obj.email, phone: obj.phone,
- auth_info: obj.auth_info, statuses: obj.statuses,
- disclosed_attributes: obj.disclosed_attributes }
+ return simple_object if @simplify
+ json = { code: obj.code, name: obj.name, ident: ident, phone: obj.phone,
+ created_at: obj.created_at, auth_info: obj.auth_info, email: obj.email,
+ statuses: statuses, disclosed_attributes: obj.disclosed_attributes,
+ registrar: registrar }
json[:address] = address if @show_address
-
+ if @domain_params
+ json[:domains] = domains
+ json[:domains_count] = obj.qualified_domain_ids(@domain_params[:domain_filter]).size
+ end
json
end
+ # rubocop:enable Metrics/MethodLength
+ # rubocop:enable Metrics/AbcSize
+
+ def registrar
+ contact.registrar.as_json(only: %i[name website])
+ end
def ident
{
@@ -31,6 +45,34 @@ module Serializers
{ street: contact.street, zip: contact.zip, city: contact.city,
state: contact.state, country_code: contact.country_code }
end
+
+ def domains
+ contact.all_domains(page: @domain_params[:page],
+ per: @domain_params[:per_page],
+ params: @domain_params)
+ .map do |d|
+ { id: d.uuid, name: d.name, registrar: { name: d.registrar.name },
+ valid_to: d.valid_to, roles: d.roles }
+ end
+ end
+
+ def statuses
+ statuses_with_notes = contact.status_notes
+ contact.statuses.each do |status|
+ statuses_with_notes.merge!({ "#{status}": '' }) unless statuses_with_notes.key?(status)
+ end
+ statuses_with_notes
+ end
+
+ private
+
+ def simple_object
+ {
+ id: contact.uuid,
+ code: contact.code,
+ name: contact.name,
+ }
+ end
end
end
end
diff --git a/lib/serializers/repp/domain.rb b/lib/serializers/repp/domain.rb
index d365859c1..c851a1f0d 100644
--- a/lib/serializers/repp/domain.rb
+++ b/lib/serializers/repp/domain.rb
@@ -3,42 +3,80 @@ module Serializers
class Domain
attr_reader :domain
- def initialize(domain, sponsored: true)
+ def initialize(domain, sponsored: true, simplify: false)
@domain = domain
@sponsored = sponsored
+ @simplify = simplify
end
+ # rubocop:disable Metrics/MethodLength
# rubocop:disable Metrics/AbcSize
def to_json(obj = domain)
+ return simple_object if @simplify
+
json = {
- name: obj.name, registrant: obj.registrant.code, created_at: obj.created_at,
- updated_at: obj.updated_at, expire_time: obj.expire_time, outzone_at: obj.outzone_at,
- delete_date: obj.delete_date, force_delete_date: obj.force_delete_date,
- contacts: contacts, nameservers: nameservers, dnssec_keys: dnssec_keys,
- statuses: obj.status_notes, registrar: registrar
+ name: obj.name, registrant: registrant,
+ created_at: obj.created_at, updated_at: obj.updated_at,
+ expire_time: obj.expire_time,
+ outzone_at: obj.outzone_at, delete_date: obj.delete_date,
+ force_delete_date: obj.force_delete_date, contacts: contacts,
+ nameservers: nameservers, dnssec_keys: dnssec_keys,
+ statuses: statuses, registrar: registrar,
+ dispute: Dispute.active.exists?(domain_name: obj.name)
}
json[:transfer_code] = obj.auth_info if @sponsored
json
end
+ # rubocop:enable Metrics/MethodLength
# rubocop:enable Metrics/AbcSize
def contacts
- domain.domain_contacts.map { |c| { code: c.contact.code, type: c.type } }
- end
-
- def nameservers
- domain.nameservers.map { |ns| { hostname: ns.hostname, ipv4: ns.ipv4, ipv6: ns.ipv6 } }
- end
-
- def dnssec_keys
- domain.dnskeys.map do |nssec|
- { flags: nssec.flags, protocol: nssec.protocol, alg: nssec.alg,
- public_key: nssec.public_key }
+ domain.domain_contacts.includes(:contact).map do |dc|
+ contact = dc.contact
+ { code: contact.code, type: dc.type,
+ name: contact.name_disclosed_by_registrar(domain.registrar_id) }
end
end
+ def nameservers
+ domain.nameservers.order(:created_at).as_json(only: %i[id hostname ipv4 ipv6])
+ end
+
+ def dnssec_keys
+ domain.dnskeys.order(:updated_at).as_json(only: %i[id flags protocol alg public_key])
+ end
+
def registrar
- { name: domain.registrar.name, website: domain.registrar.website }
+ domain.registrar.as_json(only: %i[name website])
+ end
+
+ def registrant
+ rant = domain.registrant
+ {
+ name: rant.name,
+ code: rant.code,
+ }
+ end
+
+ def statuses
+ statuses_with_notes = domain.status_notes
+ domain.statuses.each do |status|
+ statuses_with_notes.merge!({ "#{status}": '' }) unless statuses_with_notes.key?(status)
+ end
+ statuses_with_notes
+ end
+
+ private
+
+ def simple_object
+ json = {
+ name: domain.name,
+ expire_time: domain.expire_time,
+ registrant: registrant,
+ statuses: statuses,
+ }
+ json[:transfer_code] = domain.auth_info if @sponsored
+ json
end
end
end
diff --git a/lib/serializers/repp/invoice.rb b/lib/serializers/repp/invoice.rb
new file mode 100644
index 000000000..686eaac99
--- /dev/null
+++ b/lib/serializers/repp/invoice.rb
@@ -0,0 +1,90 @@
+module Serializers
+ module Repp
+ class Invoice
+ attr_reader :invoice
+
+ def initialize(invoice, simplify: false)
+ @invoice = invoice
+ @simplify = simplify
+ end
+
+ # rubocop:disable Metrics/MethodLength
+ # rubocop:disable Metrics/AbcSize
+ def to_json(obj = invoice)
+ return simple_object if @simplify
+
+ {
+ id: obj.id, issue_date: obj.issue_date, cancelled_at: obj.cancelled_at,
+ paid: obj.paid?, payable: obj.payable?, cancellable: invoice.cancellable?,
+ receipt_date: obj.receipt_date, payment_link: obj.payment_link,
+ number: obj.number, subtotal: obj.subtotal, vat_amount: obj.vat_amount,
+ vat_rate: obj.vat_rate, total: obj.total,
+ description: obj.description, reference_no: obj.reference_no,
+ created_at: obj.created_at, updated_at: obj.updated_at,
+ due_date: obj.due_date, currency: obj.currency,
+ seller: seller, buyer: buyer, items: items,
+ recipient: obj.buyer.billing_email,
+ monthly_invoice: obj.monthly_invoice
+ }
+ end
+
+ private
+
+ def seller
+ {
+ name: invoice.seller_name, reg_no: invoice.seller_reg_no,
+ iban: invoice.seller_iban, bank: invoice.seller_bank,
+ swift: invoice.seller_swift, vat_no: invoice.seller_vat_no,
+ address: invoice.seller_address, country: invoice.seller_country.name,
+ phone: invoice.seller_phone, url: invoice.seller_url,
+ email: invoice.seller_email,
+ contact_name: invoice.seller_contact_name
+ }
+ end
+
+ def buyer
+ {
+ name: invoice.buyer_name,
+ reg_no: invoice.buyer_reg_no,
+ address: invoice.buyer_address,
+ country: invoice.buyer_country.name,
+ phone: invoice.buyer_phone,
+ url: invoice.buyer_url,
+ email: invoice.buyer_email,
+ }
+ end
+
+ def items
+ if invoice.monthly_invoice
+ invoice.metadata['items']
+ else
+ invoice.items.map do |item|
+ { description: item.description, unit: item.unit,
+ quantity: item.quantity, price: item.price,
+ sum_without_vat: item.item_sum_without_vat,
+ vat_amount: item.vat_amount, total: item.total }
+ end
+ end
+ end
+
+ def simple_object
+ {
+ id: invoice.id,
+ number: invoice.number,
+ paid: invoice.paid?,
+ payable: invoice.payable?,
+ payment_link: invoice.payment_link,
+ receipt_date: invoice.receipt_date,
+ cancelled: invoice.cancelled?,
+ cancellable: invoice.cancellable?,
+ due_date: invoice.due_date,
+ total: invoice.total,
+ recipient: invoice.buyer.billing_email,
+ monthly_invoice: invoice.monthly_invoice,
+ }
+ end
+ # rubocop:enable Metrics/MethodLength
+ # rubocop:enable Metrics/AbcSize
+ end
+ end
+end
diff --git a/lib/tasks/check_force_delete.rake b/lib/tasks/check_force_delete.rake
index dcaf2c72c..00101d1a2 100644
--- a/lib/tasks/check_force_delete.rake
+++ b/lib/tasks/check_force_delete.rake
@@ -4,6 +4,8 @@ task check_force_delete: :environment do
invalid_contact_ids = validations.select do |validation|
contact = validation.validation_eventable
+ next if contact.nil?
+
contact.need_to_start_force_delete? || contact.need_to_lift_force_delete?
end.pluck(:validation_eventable_id)
diff --git a/test/integration/admin_area/invoices_test.rb b/test/integration/admin_area/invoices_test.rb
index 9c831250e..7cf93ca81 100644
--- 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
diff --git a/test/integration/api/domain_admin_contacts_test.rb b/test/integration/api/domain_admin_contacts_test.rb
index ce61cffd1..6aa412c23 100644
--- a/test/integration/api/domain_admin_contacts_test.rb
+++ b/test/integration/api/domain_admin_contacts_test.rb
@@ -18,19 +18,21 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest
ident_country_code: 'LV')
patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code,
- new_contact_id: @admin_new.code },
- headers: { 'HTTP_AUTHORIZATION' => http_auth_key }
+ new_contact_id: @admin_new.code },
+ headers: { 'HTTP_AUTHORIZATION' => http_auth_key }
assert_response :bad_request
- assert_equal ({ code: 2304, message: 'Admin contacts must be identical', data: {} }),
+ assert_equal ({ code: 2304,
+ message: 'New and current admin contacts ident data must be identical',
+ data: {} }),
JSON.parse(response.body, symbolize_names: true)
end
def test_replace_all_admin_contacts_of_the_current_registrar
assert @admin_new.identical_to?(@admin_current)
patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code,
- new_contact_id: @admin_new.code },
- headers: { 'HTTP_AUTHORIZATION' => http_auth_key }
+ new_contact_id: @admin_new.code },
+ headers: { 'HTTP_AUTHORIZATION' => http_auth_key }
assert_nil domains(:shop).admin_contacts.find_by(code: @admin_current.code)
assert domains(:shop).admin_contacts.find_by(code: @admin_new.code)
@@ -41,8 +43,8 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest
domains(:airport).update!(statuses: [DomainStatus::SERVER_UPDATE_PROHIBITED])
patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code,
- new_contact_id: @admin_new.code },
- headers: { 'HTTP_AUTHORIZATION' => http_auth_key }
+ new_contact_id: @admin_new.code },
+ headers: { 'HTTP_AUTHORIZATION' => http_auth_key }
assert domains(:airport).admin_contacts.find_by(code: @admin_current.code)
end
@@ -51,12 +53,13 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest
domain = domains(:airport)
domain.admin_contacts = [@admin_current]
patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code,
- new_contact_id: @admin_new.code },
- headers: { 'HTTP_AUTHORIZATION' => http_auth_key }
+ new_contact_id: @admin_new.code },
+ headers: { 'HTTP_AUTHORIZATION' => http_auth_key }
assert_response :ok
- assert_equal ({ code: 1000, message: 'Command completed successfully', data: { affected_domains: %w[airport.test shop.test],
- skipped_domains: [] }}),
+ assert_equal ({ code: 1000, message: 'Command completed successfully',
+ data: { affected_domains: %w[airport.test shop.test],
+ skipped_domains: [] } }),
JSON.parse(response.body, symbolize_names: true)
end
diff --git a/test/integration/eis_billing/directo_response_test.rb b/test/integration/eis_billing/directo_response_test.rb
index 4b2c30ba2..5125434e8 100644
--- 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
diff --git a/test/integration/eis_billing/lhv_connect_transactions_test.rb b/test/integration/eis_billing/lhv_connect_transactions_test.rb
index f6d0f59d0..6e89808c8 100644
--- 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
diff --git a/test/integration/eis_billing/payment_status_test.rb b/test/integration/eis_billing/payment_status_test.rb
new file mode 100644
index 000000000..69c50e120
--- /dev/null
+++ 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
diff --git a/test/integration/epp/poll_test.rb b/test/integration/epp/poll_test.rb
index 29c24af26..7b114f7c0 100644
--- a/test/integration/epp/poll_test.rb
+++ b/test/integration/epp/poll_test.rb
@@ -56,7 +56,7 @@ class EppPollTest < EppTestCase
bulk_action = actions(:contacts_update_bulk_action)
@notification.update!(action: bulk_action,
attached_obj_id: bulk_action.id,
- attached_obj_type: 'BulkAction')
+ attached_obj_type: 'ContactUpdateAction')
post epp_poll_path, params: { frame: request_req_xml },
headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
diff --git a/test/integration/repp/v1/accounts/activities_list_test.rb b/test/integration/repp/v1/accounts/activities_list_test.rb
new file mode 100644
index 000000000..2038815a1
--- /dev/null
+++ b/test/integration/repp/v1/accounts/activities_list_test.rb
@@ -0,0 +1,70 @@
+require 'test_helper'
+
+class ReppV1AccountsActivitiesListTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_returns_account_activities
+ get repp_v1_accounts_path, headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal @user.registrar.cash_account.activities.count, json[:data][:count]
+ assert_equal @user.registrar.cash_account.activities.count, json[:data][:activities].length
+
+ assert json[:data][:activities][0].is_a? Hash
+ end
+
+ def test_respects_limit
+ get repp_v1_accounts_path(limit: 1), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal 1, json[:data][:activities].length
+ end
+
+ def test_respects_offset
+ offset = 1
+ get repp_v1_accounts_path(offset: offset), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal (@user.registrar.cash_account.activities.count - offset), json[:data][:activities].length
+ end
+
+ def test_returns_account_activities_by_search_query
+ search_params = {
+ description_matches: '%renew%',
+ }
+ get repp_v1_accounts_path(q: search_params), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal json[:data][:activities].length, 1
+ assert json[:data][:activities][0].is_a? Hash
+ end
+
+ def test_returns_account_activities_by_sort_query
+ activity = account_activities(:renew_cash)
+ sort_params = {
+ s: 'activity_type asc',
+ }
+ get repp_v1_accounts_path(q: sort_params), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal @user.registrar.cash_account.activities.count, json[:data][:count]
+ assert_equal @user.registrar.cash_account.activities.count, json[:data][:activities].length
+ assert_equal json[:data][:activities][0][:description], activity.description
+ end
+end
diff --git a/test/integration/repp/v1/accounts/balance_test.rb b/test/integration/repp/v1/accounts/balance_test.rb
index 4b711bd05..3fd25f3e7 100644
--- a/test/integration/repp/v1/accounts/balance_test.rb
+++ b/test/integration/repp/v1/accounts/balance_test.rb
@@ -10,6 +10,8 @@ class ReppV1BalanceTest < ActionDispatch::IntegrationTest
@auth_headers = { 'Authorization' => token }
end
+
+
def test_can_query_balance
get '/repp/v1/accounts/balance', headers: @auth_headers
json = JSON.parse(response.body, symbolize_names: true)
@@ -44,8 +46,8 @@ class ReppV1BalanceTest < ActionDispatch::IntegrationTest
assert_equal @registrar.registrar.cash_account.account_activities.last.new_balance.to_s, entry[:balance]
json[:data][:transactions].map do |trans|
- assert trans[:created_at].to_date.to_s(:db) >= started_from
- assert trans[:created_at].to_date.to_s(:db) >= end_to
+ assert trans[:created_at].to_date.to_s(:db) >= started_from
+ assert trans[:created_at].to_date.to_s(:db) >= end_to
end
end
end
diff --git a/test/integration/repp/v1/accounts/details_test.rb b/test/integration/repp/v1/accounts/details_test.rb
new file mode 100644
index 000000000..30acb5eb6
--- /dev/null
+++ b/test/integration/repp/v1/accounts/details_test.rb
@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class ReppV1AccountsDetailsTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_returns_account_details
+ get '/repp/v1/accounts/details', headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal 'Command completed successfully', json[:message]
+
+ assert_equal @user.registrar.billing_email, json[:data][:account][:billing_email]
+ end
+end
\ No newline at end of file
diff --git a/test/integration/repp/v1/accounts/switch_user_test.rb b/test/integration/repp/v1/accounts/switch_user_test.rb
new file mode 100644
index 000000000..a860fb162
--- /dev/null
+++ b/test/integration/repp/v1/accounts/switch_user_test.rb
@@ -0,0 +1,51 @@
+require 'test_helper'
+
+class ReppV1AccountsSwitchUserTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_switches_to_linked_api_user
+ new_user = users(:api_goodnames)
+ new_user.update(identity_code: '1234')
+ request_body = {
+ account: {
+ new_user_id: new_user.id,
+ },
+ }
+
+ put '/repp/v1/accounts/switch_user', headers: @auth_headers, params: request_body
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal "You are now signed in as a user \"#{new_user.username}\"", json[:message]
+
+ user_token = Base64.urlsafe_encode64("#{new_user.username}:#{new_user.plain_text_password}")
+ assert_equal json[:data][:token], user_token
+ assert_equal json[:data][:registrar][:username], new_user.username
+ assert json[:data][:registrar][:roles].include? 'super'
+ assert_equal json[:data][:registrar][:registrar_name], 'Good Names'
+ assert json[:data][:registrar][:abilities].is_a? Hash
+ end
+
+ def test_switches_to_unlinked_api_user
+ new_user = users(:api_goodnames)
+ new_user.update(identity_code: '4444')
+ request_body = {
+ account: {
+ new_user_id: new_user.id,
+ },
+ }
+
+ put '/repp/v1/accounts/switch_user', headers: @auth_headers, params: request_body
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :bad_request
+ assert_equal 'Cannot switch to unlinked user', json[:message]
+ end
+end
\ No newline at end of file
diff --git a/test/integration/repp/v1/accounts/update_auto_reload_balance_test.rb b/test/integration/repp/v1/accounts/update_auto_reload_balance_test.rb
new file mode 100644
index 000000000..11a8d08ba
--- /dev/null
+++ b/test/integration/repp/v1/accounts/update_auto_reload_balance_test.rb
@@ -0,0 +1,69 @@
+require 'test_helper'
+
+class ReppV1AccountsUpdateAutoReloadBalanceTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_updates_auto_reload_balance
+ amount = 100
+ threshold = 10
+ request_body = {
+ type: {
+ amount: amount,
+ threshold: threshold,
+ },
+ }
+
+ assert_nil @user.registrar.settings['balance_auto_reload']
+
+ post '/repp/v1/accounts/update_auto_reload_balance', headers: @auth_headers,
+ params: request_body
+ json = JSON.parse(response.body, symbolize_names: true)
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal 'Balance Auto-Reload setting has been updated', json[:message]
+
+ @user.registrar.reload
+
+ assert_equal amount, @user.registrar.settings['balance_auto_reload']['type']['amount']
+ assert_equal threshold, @user.registrar.settings['balance_auto_reload']['type']['threshold']
+ end
+
+ def test_returns_error_if_type_has_wrong_attributes
+ min_deposit = 10
+ request_body = {
+ type: {
+ amount: 5,
+ threshold: -1,
+ },
+ }
+ Setting.minimum_deposit = min_deposit
+
+ post '/repp/v1/accounts/update_auto_reload_balance', headers: @auth_headers,
+ params: request_body
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :bad_request
+ amount_error = "Amount must be greater than or equal to #{min_deposit.to_f}"
+ threshold = 'Threshold must be greater than or equal to 0'
+ assert_equal "#{amount_error}, #{threshold}", json[:message]
+ end
+
+ def test_disables_auto_reload_balance
+ get '/repp/v1/accounts/disable_auto_reload_balance', headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal 'Balance Auto-Reload setting has been disabled', json[:message]
+
+ @user.registrar.reload
+
+ assert_nil @user.registrar.settings['balance_auto_reload']
+ end
+end
\ No newline at end of file
diff --git a/test/integration/repp/v1/accounts/update_details_test.rb b/test/integration/repp/v1/accounts/update_details_test.rb
new file mode 100644
index 000000000..c1275ddeb
--- /dev/null
+++ b/test/integration/repp/v1/accounts/update_details_test.rb
@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class ReppV1AccountsUpdateDetailsTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_updates_details
+ request_body = {
+ account: {
+ billing_email: 'donaldtrump@yandex.ru',
+ iban: 'GB331111111111111111',
+ },
+ }
+
+ put '/repp/v1/accounts', headers: @auth_headers, params: request_body
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal 'Your account has been updated', json[:message]
+
+ assert_equal(request_body[:account][:billing_email], @user.registrar.billing_email)
+ assert_equal(request_body[:account][:iban], @user.registrar.iban)
+ end
+end
\ No newline at end of file
diff --git a/test/integration/repp/v1/contacts/check_test.rb b/test/integration/repp/v1/contacts/check_test.rb
index be0d979b1..6fc716638 100644
--- a/test/integration/repp/v1/contacts/check_test.rb
+++ b/test/integration/repp/v1/contacts/check_test.rb
@@ -14,7 +14,7 @@ class ReppV1ContactsCheckTest < ActionDispatch::IntegrationTest
json = JSON.parse(response.body, symbolize_names: true)
assert_response :ok
- assert_equal 'nonexistant:code', json[:data][:contact][:id]
+ assert_equal 'nonexistant:code', json[:data][:contact][:code]
assert_equal true, json[:data][:contact][:available]
end
@@ -24,7 +24,7 @@ class ReppV1ContactsCheckTest < ActionDispatch::IntegrationTest
json = JSON.parse(response.body, symbolize_names: true)
assert_response :ok
- assert_equal contact.code, json[:data][:contact][:id]
+ assert_equal contact.code, json[:data][:contact][:code]
assert_equal false, json[:data][:contact][:available]
end
end
diff --git a/test/integration/repp/v1/contacts/create_test.rb b/test/integration/repp/v1/contacts/create_test.rb
index f30bc368f..af1ca0fbf 100644
--- a/test/integration/repp/v1/contacts/create_test.rb
+++ b/test/integration/repp/v1/contacts/create_test.rb
@@ -11,16 +11,16 @@ class ReppV1ContactsCreateTest < ActionDispatch::IntegrationTest
def test_creates_new_contact
request_body = {
- "contact": {
- "name": "Donald Trump",
- "phone": "+372.51111112",
- "email": "donald@trumptower.com",
- "ident": {
- "ident_type": "priv",
- "ident_country_code": "EE",
- "ident": "39708290069"
- }
- }
+ contact: {
+ name: 'Donald Trump',
+ phone: '+372.51111112',
+ email: 'donald@trumptower.com',
+ ident: {
+ ident_type: 'priv',
+ ident_country_code: 'EE',
+ ident: '39708290069',
+ },
+ },
}
post '/repp/v1/contacts', headers: @auth_headers, params: request_body
@@ -30,7 +30,7 @@ class ReppV1ContactsCreateTest < ActionDispatch::IntegrationTest
assert_equal 1000, json[:code]
assert_equal 'Command completed successfully', json[:message]
- contact = Contact.find_by(code: json[:data][:contact][:id])
+ contact = Contact.find_by(code: json[:data][:contact][:code])
assert contact.present?
assert_equal(request_body[:contact][:name], contact.name)
@@ -42,21 +42,21 @@ class ReppV1ContactsCreateTest < ActionDispatch::IntegrationTest
end
def test_removes_postal_info_when_contact_created
- request_body = {
- "contact": {
- "name": "Donald Trump",
- "phone": "+372.51111111",
- "email": "donald@trump.com",
- "ident": {
- "ident_type": "priv",
- "ident_country_code": "EE",
- "ident": "39708290069"
+ request_body = {
+ contact: {
+ name: 'Donald Trump',
+ phone: '+372.51111111',
+ email: 'donald@trump.com',
+ ident: {
+ ident_type: 'priv',
+ ident_country_code: 'EE',
+ ident: '39708290069',
},
- "addr": {
- "city": "Tallinn",
- "street": "Wismari 13",
- "zip": "12345",
- "country_code": "EE"
+ addr: {
+ city: 'Tallinn',
+ street: 'Wismari 13',
+ zip: '12345',
+ country_code: 'EE',
}
}
}
@@ -68,7 +68,7 @@ class ReppV1ContactsCreateTest < ActionDispatch::IntegrationTest
assert_equal 1100, json[:code]
assert_equal 'Command completed successfully; Postal address data discarded', json[:message]
- contact = Contact.find_by(code: json[:data][:contact][:id])
+ contact = Contact.find_by(code: json[:data][:contact][:code])
assert contact.present?
assert_nil contact.city
@@ -126,21 +126,21 @@ class ReppV1ContactsCreateTest < ActionDispatch::IntegrationTest
end
def test_attaches_legaldoc_if_present
- request_body = {
- "contact": {
- "name": "Donald Trump",
- "phone": "+372.51111112",
- "email": "donald@trumptower.com",
- "ident": {
- "ident_type": "priv",
- "ident_country_code": "EE",
- "ident": "39708290069"
+ request_body = {
+ contact: {
+ name: 'Donald Trump',
+ phone: '+372.51111112',
+ email: 'donald@trumptower.com',
+ ident: {
+ ident_type: 'priv',
+ ident_country_code: 'EE',
+ ident: '39708290069',
+ },
+ legal_document: {
+ type: 'pdf',
+ body: ('test' * 2000).to_s,
},
},
- "legal_document": {
- "type": "pdf",
- "body": "#{'test' * 2000}"
- }
}
post '/repp/v1/contacts', headers: @auth_headers, params: request_body
@@ -150,7 +150,7 @@ class ReppV1ContactsCreateTest < ActionDispatch::IntegrationTest
assert_equal 1000, json[:code]
assert_equal 'Command completed successfully', json[:message]
- contact = Contact.find_by(code: json[:data][:contact][:id])
+ contact = Contact.find_by(code: json[:data][:contact][:code])
assert contact.legal_documents.any?
end
end
diff --git a/test/integration/repp/v1/contacts/list_test.rb b/test/integration/repp/v1/contacts/list_test.rb
index 31c4baaf9..979d3ea40 100644
--- a/test/integration/repp/v1/contacts/list_test.rb
+++ b/test/integration/repp/v1/contacts/list_test.rb
@@ -15,23 +15,22 @@ class ReppV1ContactsListTest < ActionDispatch::IntegrationTest
assert_response :ok
- assert_equal @user.registrar.contacts.count, json[:total_number_of_records]
- assert_equal @user.registrar.contacts.count, json[:contacts].length
+ assert_equal @user.registrar.contacts.count, json[:data][:count]
+ assert_equal @user.registrar.contacts.count, json[:data][:contacts].length
- assert json[:contacts][0].is_a? String
+ assert json[:data][:contacts][0].is_a? String
end
-
def test_returns_detailed_registrar_contacts
get repp_v1_contacts_path(details: true), headers: @auth_headers
json = JSON.parse(response.body, symbolize_names: true)
assert_response :ok
- assert_equal @user.registrar.contacts.count, json[:total_number_of_records]
- assert_equal @user.registrar.contacts.count, json[:contacts].length
+ assert_equal @user.registrar.contacts.count, json[:data][:count]
+ assert_equal @user.registrar.contacts.count, json[:data][:contacts].length
- assert json[:contacts][0].is_a? Hash
+ assert json[:data][:contacts][0].is_a? Hash
end
def test_respects_limit
@@ -40,7 +39,7 @@ class ReppV1ContactsListTest < ActionDispatch::IntegrationTest
assert_response :ok
- assert_equal 2, json[:contacts].length
+ assert_equal 2, json[:data][:contacts].length
end
def test_respects_offset
@@ -50,6 +49,34 @@ class ReppV1ContactsListTest < ActionDispatch::IntegrationTest
assert_response :ok
- assert_equal (@user.registrar.contacts.count - offset), json[:contacts].length
+ assert_equal (@user.registrar.contacts.count - offset), json[:data][:contacts].length
+ end
+
+ def test_returns_detailed_registrar_contacts_by_search_query
+ search_params = {
+ ident_type_eq: 'priv',
+ }
+ get repp_v1_contacts_path(details: true, q: search_params), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal json[:data][:contacts].length, 3
+ assert json[:data][:contacts][0].is_a? Hash
+ end
+
+ def test_returns_detailed_registrar_contacts_by_sort_query
+ contact = contacts(:william)
+ sort_params = {
+ s: 'name desc',
+ }
+ get repp_v1_contacts_path(details: true, q: sort_params), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal @user.registrar.contacts.count, json[:data][:count]
+ assert_equal @user.registrar.contacts.count, json[:data][:contacts].length
+ assert_equal json[:data][:contacts][0][:code], contact.code
end
end
diff --git a/test/integration/repp/v1/contacts/search_test.rb b/test/integration/repp/v1/contacts/search_test.rb
new file mode 100644
index 000000000..ceeefc7be
--- /dev/null
+++ b/test/integration/repp/v1/contacts/search_test.rb
@@ -0,0 +1,43 @@
+require 'test_helper'
+
+class ReppV1ContactsSearchTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_searches_all_contacts_by_id
+ contact = contacts(:john)
+ get "/repp/v1/contacts/search/#{contact.code}", headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert json[:data].is_a? Array
+ assert_equal json[:data][0][:value], contact.code
+ assert_equal json[:data][0][:label], "#{contact.code} #{contact.name}"
+ assert_equal json[:data][0][:selected], true
+ end
+
+ def test_searches_all_contacts_by_query
+ get '/repp/v1/contacts/search', headers: @auth_headers, params: { query: 'j' }
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert json[:data].is_a? Array
+ assert_equal json[:data].length, 2
+ assert_equal json[:data][0][:selected], false
+ assert_equal json[:data][1][:selected], false
+ end
+
+ def test_searches_all_contacts_by_wrong_query
+ get '/repp/v1/contacts/search', headers: @auth_headers, params: { query: '000' }
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert json[:data].is_a? Array
+ assert_equal json[:data].length, 0
+ end
+end
\ No newline at end of file
diff --git a/test/integration/repp/v1/contacts/show_test.rb b/test/integration/repp/v1/contacts/show_test.rb
index 4a6f5b615..496935ab6 100644
--- a/test/integration/repp/v1/contacts/show_test.rb
+++ b/test/integration/repp/v1/contacts/show_test.rb
@@ -28,7 +28,7 @@ class ReppV1ContactsShowTest < ActionDispatch::IntegrationTest
assert_equal 1000, json[:code]
assert_equal 'Command completed successfully', json[:message]
- assert_equal contact.code, json[:data][:id]
+ assert_equal contact.code, json[:data][:contact][:code]
end
def test_can_not_access_out_of_scope_contacts
diff --git a/test/integration/repp/v1/contacts/update_test.rb b/test/integration/repp/v1/contacts/update_test.rb
index cf27f98da..e75ce4188 100644
--- a/test/integration/repp/v1/contacts/update_test.rb
+++ b/test/integration/repp/v1/contacts/update_test.rb
@@ -24,14 +24,14 @@ class ReppV1ContactsUpdateTest < ActionDispatch::IntegrationTest
assert_equal 1000, json[:code]
assert_equal 'Command completed successfully', json[:message]
- contact = Contact.find_by(code: json[:data][:contact][:id])
+ contact = Contact.find_by(code: json[:data][:contact][:code])
assert contact.present?
assert_equal(request_body[:contact][:email], contact.email)
end
def test_removes_postal_info_when_updated
- request_body = {
+ request_body = {
"contact": {
"addr": {
"city": "Tallinn",
@@ -49,7 +49,7 @@ class ReppV1ContactsUpdateTest < ActionDispatch::IntegrationTest
assert_equal 1100, json[:code]
assert_equal 'Command completed successfully; Postal address data discarded', json[:message]
- contact = Contact.find_by(code: json[:data][:contact][:id])
+ contact = Contact.find_by(code: json[:data][:contact][:code])
assert contact.present?
assert_nil contact.city
@@ -81,14 +81,14 @@ class ReppV1ContactsUpdateTest < ActionDispatch::IntegrationTest
end
def test_attaches_legaldoc_if_present
- request_body = {
- "contact": {
- "email": "donaldtrump@yandex.ru"
+ request_body = {
+ contact: {
+ email: 'donaldtrump@yandex.ru',
+ legal_document: {
+ type: 'pdf',
+ body: ('test' * 2000).to_s,
+ },
},
- "legal_document": {
- "type": "pdf",
- "body": "#{'test' * 2000}"
- }
}
put "/repp/v1/contacts/#{@contact.code}", headers: @auth_headers, params: request_body
@@ -103,9 +103,11 @@ class ReppV1ContactsUpdateTest < ActionDispatch::IntegrationTest
end
def test_returns_error_if_ident_wrong_format
- request_body = {
- "contact": {
- "ident": "123"
+ request_body = {
+ contact: {
+ ident: {
+ ident: '123',
+ }
}
}
diff --git a/test/integration/repp/v1/domains/contact_replacement_test.rb b/test/integration/repp/v1/domains/contact_replacement_test.rb
index 3cbd9eb8e..65ddb4c9d 100644
--- a/test/integration/repp/v1/domains/contact_replacement_test.rb
+++ b/test/integration/repp/v1/domains/contact_replacement_test.rb
@@ -15,7 +15,7 @@ class ReppV1DomainsContactReplacementTest < ActionDispatch::IntegrationTest
payload = {
"current_contact_id": replaceable_contact.code,
- "new_contact_id": replacing_contact.code
+ "new_contact_id": replacing_contact.code,
}
patch '/repp/v1/domains/contacts', headers: @auth_headers, params: payload
@@ -37,7 +37,7 @@ class ReppV1DomainsContactReplacementTest < ActionDispatch::IntegrationTest
payload = {
"current_contact_id": replaceable_contact.code,
- "new_contact_id": replacing_contact.code
+ "new_contact_id": replacing_contact.code,
}
patch '/repp/v1/domains/contacts', headers: @auth_headers, params: payload
@@ -51,7 +51,7 @@ class ReppV1DomainsContactReplacementTest < ActionDispatch::IntegrationTest
def test_contact_codes_must_be_valid
payload = {
"current_contact_id": 'dfgsdfg',
- "new_contact_id": 'vvv'
+ "new_contact_id": 'vvv',
}
patch '/repp/v1/domains/contacts', headers: @auth_headers, params: payload
@@ -61,5 +61,4 @@ class ReppV1DomainsContactReplacementTest < ActionDispatch::IntegrationTest
assert_equal 2303, json[:code]
assert_equal 'Object does not exist', json[:message]
end
-
end
diff --git a/test/integration/repp/v1/domains/delete_test.rb b/test/integration/repp/v1/domains/delete_test.rb
index 08b73e832..818815473 100644
--- a/test/integration/repp/v1/domains/delete_test.rb
+++ b/test/integration/repp/v1/domains/delete_test.rb
@@ -15,9 +15,11 @@ class ReppV1DomainsDeleteTest < ActionDispatch::IntegrationTest
@auth_headers['Content-Type'] = 'application/json'
payload = {
- delete: {
- verified: false
- }
+ domain: {
+ delete: {
+ verified: false,
+ },
+ },
}
delete "/repp/v1/domains/#{@domain.name}", headers: @auth_headers, params: payload.to_json
@@ -36,9 +38,11 @@ class ReppV1DomainsDeleteTest < ActionDispatch::IntegrationTest
@auth_headers['Content-Type'] = 'application/json'
payload = {
- delete: {
- verified: true
- }
+ domain: {
+ delete: {
+ verified: true,
+ },
+ },
}
delete "/repp/v1/domains/#{@domain.name}", headers: @auth_headers, params: payload.to_json
diff --git a/test/integration/repp/v1/domains/list_test.rb b/test/integration/repp/v1/domains/list_test.rb
index 366ac4d26..205017a6c 100644
--- a/test/integration/repp/v1/domains/list_test.rb
+++ b/test/integration/repp/v1/domains/list_test.rb
@@ -15,7 +15,7 @@ class ReppV1DomainsListTest < ActionDispatch::IntegrationTest
assert_response :ok
- assert_equal @user.registrar.domains.count, json[:data][:total_number_of_records]
+ assert_equal @user.registrar.domains.count, json[:data][:count]
assert_equal @user.registrar.domains.count, json[:data][:domains].length
assert json[:data][:domains][0].is_a? String
@@ -27,7 +27,7 @@ class ReppV1DomainsListTest < ActionDispatch::IntegrationTest
assert_response :ok
- assert_equal @user.registrar.domains.count, json[:data][:total_number_of_records]
+ assert_equal @user.registrar.domains.count, json[:data][:count]
assert_equal @user.registrar.domains.count, json[:data][:domains].length
assert json[:data][:domains][0].is_a? Hash
@@ -64,4 +64,32 @@ class ReppV1DomainsListTest < ActionDispatch::IntegrationTest
serialized_domain = Serializers::Repp::Domain.new(domain).to_json
assert_equal serialized_domain.as_json, json[:data][:domain].as_json
end
+
+ def test_returns_detailed_registrar_domains_by_search_query
+ search_params = {
+ name_matches: '%library%',
+ }
+ get repp_v1_domains_path(details: true, q: search_params), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal json[:data][:domains].length, 1
+ assert json[:data][:domains][0].is_a? Hash
+ end
+
+ def test_returns_detailed_registrar_domains_by_sort_query
+ domain = domains(:shop)
+ sort_params = {
+ s: 'name desc',
+ }
+ get repp_v1_domains_path(details: true, q: sort_params), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal @user.registrar.domains.count, json[:data][:count]
+ assert_equal @user.registrar.domains.count, json[:data][:domains].length
+ assert_equal json[:data][:domains][0][:name], domain.name
+ end
end
diff --git a/test/integration/repp/v1/domains/renews_test.rb b/test/integration/repp/v1/domains/renews_test.rb
index 3949f49dd..2fc1b7590 100644
--- a/test/integration/repp/v1/domains/renews_test.rb
+++ b/test/integration/repp/v1/domains/renews_test.rb
@@ -18,7 +18,7 @@ class ReppV1DomainsRenewsTest < ActionDispatch::IntegrationTest
:prepare_renewed_expire_time).and_call_through
@auth_headers['Content-Type'] = 'application/json'
- payload = { renew: { period: 1, period_unit: 'y', exp_date: original_valid_to } }
+ payload = { renews: { period: 1, period_unit: 'y', exp_date: original_valid_to } }
post "/repp/v1/domains/#{@domain.name}/renew", headers: @auth_headers, params: payload.to_json
json = JSON.parse(response.body, symbolize_names: true)
@@ -36,7 +36,7 @@ class ReppV1DomainsRenewsTest < ActionDispatch::IntegrationTest
travel_to Time.zone.parse('2010-07-05')
@auth_headers['Content-Type'] = 'application/json'
- payload = { renew: { period: 10, period_unit: 'y', exp_date: original_valid_to } }
+ payload = { renews: { period: 10, period_unit: 'y', exp_date: original_valid_to } }
post "/repp/v1/domains/#{@domain.name}/renew", headers: @auth_headers, params: payload.to_json
json = JSON.parse(response.body, symbolize_names: true)
@@ -60,7 +60,7 @@ class ReppV1DomainsRenewsTest < ActionDispatch::IntegrationTest
one_year.reload
@auth_headers['Content-Type'] = 'application/json'
- payload = { renew: { period: 1, period_unit: 'y', exp_date: original_valid_to } }
+ payload = { renews: { period: 1, period_unit: 'y', exp_date: original_valid_to } }
post "/repp/v1/domains/#{@domain.name}/renew", headers: @auth_headers, params: payload.to_json
json = JSON.parse(response.body, symbolize_names: true)
diff --git a/test/integration/repp/v1/domains/update_test.rb b/test/integration/repp/v1/domains/update_test.rb
index d924fe7a3..59fb00d34 100644
--- a/test/integration/repp/v1/domains/update_test.rb
+++ b/test/integration/repp/v1/domains/update_test.rb
@@ -16,8 +16,8 @@ class ReppV1DomainsUpdateTest < ActionDispatch::IntegrationTest
payload = {
domain: {
- auth_code: new_auth_code
- }
+ auth_code: new_auth_code,
+ },
}
put "/repp/v1/domains/#{@domain.name}", headers: @auth_headers, params: payload.to_json
@@ -40,9 +40,9 @@ class ReppV1DomainsUpdateTest < ActionDispatch::IntegrationTest
payload = {
domain: {
registrant: {
- code: new_registrant.code
- }
- }
+ code: new_registrant.code,
+ },
+ },
}
put "/repp/v1/domains/#{@domain.name}", headers: @auth_headers, params: payload.to_json
@@ -67,13 +67,14 @@ class ReppV1DomainsUpdateTest < ActionDispatch::IntegrationTest
domain: {
registrant: {
code: new_registrant.code,
- verified: true
- }
- }
+ verified: true,
+ },
+ },
}
put "/repp/v1/domains/#{@domain.name}", headers: @auth_headers, params: payload.to_json
@domain.reload
+
json = JSON.parse(response.body, symbolize_names: true)
assert_response :ok
assert_equal 1000, json[:code]
diff --git a/test/integration/repp/v1/invoices/add_credit_test.rb b/test/integration/repp/v1/invoices/add_credit_test.rb
new file mode 100644
index 000000000..fe250de7d
--- /dev/null
+++ b/test/integration/repp/v1/invoices/add_credit_test.rb
@@ -0,0 +1,104 @@
+require 'test_helper'
+
+class ReppV1InvoicesAddCreditTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+
+ @original_registry_vat_rate = Setting.registry_vat_prc
+ 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
+ Setting.registry_vat_prc = @original_registry_vat_rate
+ end
+
+ def test_generates_add_credit_invoice_with_billing_system
+ request_body = {
+ invoice: {
+ amount: 100,
+ description: 'Add credit',
+ },
+ }
+ Setting.registry_vat_prc = 0.1
+ ENV['billing_system_integrated'] = 'true'
+
+ 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
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal 'Command completed successfully', json[:message]
+
+ assert_not json[:data][:invoice][:paid]
+ assert json[:data][:invoice][:payable]
+ assert json[:data][:invoice][:cancellable]
+ assert_equal json[:data][:invoice][:payment_link], 'https://link.test'
+ assert_equal json[:data][:invoice][:total], 110.to_f.to_s
+ end
+
+ def test_generates_add_credit_invoice_without_billing_system
+ request_body = {
+ invoice: {
+ amount: 100,
+ description: 'Add credit',
+ },
+ }
+ Setting.registry_vat_prc = 0.1
+ ENV['billing_system_integrated'] = 'false'
+
+ post '/repp/v1/invoices/add_credit', headers: @auth_headers,
+ params: request_body
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal 'Command completed successfully', json[:message]
+
+ assert_not json[:data][:invoice][:paid]
+ assert json[:data][:invoice][:payable]
+ assert json[:data][:invoice][:cancellable]
+ assert_equal json[:data][:invoice][:total], 110.to_f.to_s
+ end
+
+ def test_generates_add_credit_invoice_with_invalid_amount
+ request_body = {
+ invoice: {
+ amount: 0.4,
+ description: 'Add credit',
+ },
+ }
+ Setting.minimum_deposit = 0.5
+
+ post '/repp/v1/invoices/add_credit', headers: @auth_headers,
+ params: request_body
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :bad_request
+ assert_equal "Amount is too small. Minimum deposit is #{Setting.minimum_deposit} EUR", json[:message]
+ end
+end
\ No newline at end of file
diff --git a/test/integration/repp/v1/invoices/cancel_test.rb b/test/integration/repp/v1/invoices/cancel_test.rb
new file mode 100644
index 000000000..1041d1d1f
--- /dev/null
+++ b/test/integration/repp/v1/invoices/cancel_test.rb
@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class ReppV1InvoicesCancelTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_cancels_invoice
+ invoice = invoices(:one)
+ invoice.account_activity = nil
+ assert invoice.cancellable?
+ stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_status')
+ .to_return(status: :ok, headers: {})
+
+ put "/repp/v1/invoices/#{invoice.id}/cancel", headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal 'Command completed successfully', json[:message]
+
+ invoice.reload
+ assert invoice.cancelled?
+ assert json[:data][:invoice].is_a? Hash
+ end
+
+ def test_cancels_uncancellable_invoice
+ invoice = invoices(:one)
+ assert_not invoice.cancellable?
+
+ put "/repp/v1/invoices/#{invoice.id}/cancel", headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :bad_request
+ assert_equal 'Invoice status prohibits operation', json[:message]
+
+ invoice.reload
+ assert_not invoice.cancelled?
+ end
+end
\ No newline at end of file
diff --git a/test/integration/repp/v1/invoices/download_test.rb b/test/integration/repp/v1/invoices/download_test.rb
new file mode 100644
index 000000000..cbb9de585
--- /dev/null
+++ b/test/integration/repp/v1/invoices/download_test.rb
@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class ReppV1InvoicesDownloadTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_returns_invoice_as_pdf
+ invoice = @user.registrar.invoices.first
+
+ get "/repp/v1/invoices/#{invoice.id}/download", headers: @auth_headers
+
+ assert_response :ok
+ assert_equal 'application/pdf', response.headers['Content-Type']
+ assert_equal "attachment; filename=\"Invoice-2.pdf\"; filename*=UTF-8''Invoice-2.pdf", response.headers['Content-Disposition']
+ assert_not_empty response.body
+ end
+end
\ No newline at end of file
diff --git a/test/integration/repp/v1/invoices/list_test.rb b/test/integration/repp/v1/invoices/list_test.rb
new file mode 100644
index 000000000..5dfe2d53f
--- /dev/null
+++ b/test/integration/repp/v1/invoices/list_test.rb
@@ -0,0 +1,85 @@
+require 'test_helper'
+
+class ReppV1InvoicesListTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_returns_registrar_invoices
+ get repp_v1_invoices_path, headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal @user.registrar.invoices.count, json[:data][:count]
+ assert_equal @user.registrar.invoices.count, json[:data][:invoices].length
+
+ assert json[:data][:invoices][0].is_a? Integer
+ end
+
+ def test_returns_detailed_registrar_invoices
+ get repp_v1_invoices_path(details: true), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal @user.registrar.invoices.count, json[:data][:count]
+ assert_equal @user.registrar.invoices.count, json[:data][:invoices].length
+
+ assert json[:data][:invoices][0].is_a? Hash
+ end
+
+ def test_returns_detailed_registrar_invoices_by_search_query
+ invoice = @user.registrar.invoices.last
+ invoice.update(number: 15_008)
+ search_params = {
+ number_gteq: 15_000,
+ }
+ get repp_v1_invoices_path(details: true, q: search_params), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal json[:data][:invoices].length, 1
+ assert json[:data][:invoices][0].is_a? Hash
+ assert_equal json[:data][:invoices][0][:id], invoice.id
+ end
+
+ def test_returns_detailed_registrar_invoices_by_sort_query
+ invoice = invoices(:unpaid)
+ sort_params = {
+ s: 'number desc',
+ }
+ get repp_v1_invoices_path(details: true, q: sort_params), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal @user.registrar.invoices.count, json[:data][:count]
+ assert_equal @user.registrar.invoices.count, json[:data][:invoices].length
+ assert_equal json[:data][:invoices][0][:id], invoice.id
+ end
+
+ def test_respects_limit
+ get repp_v1_invoices_path(details: true, limit: 1), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal 1, json[:data][:invoices].length
+ end
+
+ def test_respects_offset
+ offset = 1
+ get repp_v1_invoices_path(details: true, offset: offset), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+
+ assert_equal (@user.registrar.invoices.count - offset), json[:data][:invoices].length
+ end
+end
\ No newline at end of file
diff --git a/test/integration/repp/v1/invoices/send_test.rb b/test/integration/repp/v1/invoices/send_test.rb
new file mode 100644
index 000000000..77fe9997f
--- /dev/null
+++ b/test/integration/repp/v1/invoices/send_test.rb
@@ -0,0 +1,39 @@
+require 'test_helper'
+
+class ReppV1InvoicesSendTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_sends_invoice_to_recipient
+ invoice = invoices(:one)
+ recipient = 'donaldtrump@yandex.ru'
+ request_body = {
+ invoice: {
+ id: invoice.id,
+ recipient: recipient,
+ },
+ }
+ post "/repp/v1/invoices/#{invoice.id}/send_to_recipient", headers: @auth_headers,
+ params: request_body
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_equal 1, invoice.number
+
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal 'Command completed successfully', json[:message]
+
+ assert_equal json[:data][:invoice][:id], invoice.id
+ assert_equal json[:data][:invoice][:recipient], recipient
+ email = ActionMailer::Base.deliveries.last
+ assert_emails 1
+ assert_equal [recipient], email.to
+ assert_equal 'Invoice no. 1', email.subject
+ assert email.attachments['invoice-1.pdf']
+ end
+end
\ No newline at end of file
diff --git a/test/integration/repp/v1/invoices/show_test.rb b/test/integration/repp/v1/invoices/show_test.rb
new file mode 100644
index 000000000..74feb42ac
--- /dev/null
+++ b/test/integration/repp/v1/invoices/show_test.rb
@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class ReppV1InvoicesShowTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_returns_error_when_not_found
+ get repp_v1_invoice_path(id: 'definitelynotexistant'), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :not_found
+ assert_equal 2303, json[:code]
+ assert_equal 'Object does not exist', json[:message]
+ end
+
+ def test_shows_existing_invoice
+ invoice = @user.registrar.invoices.first
+
+ get repp_v1_invoice_path(id: invoice.id), headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal 'Command completed successfully', json[:message]
+
+ assert_equal invoice.id, json[:data][:invoice][:id]
+ end
+end
\ No newline at end of file
diff --git a/test/integration/repp/v1/registrar/auth/check_info_test.rb b/test/integration/repp/v1/registrar/auth/check_info_test.rb
new file mode 100644
index 000000000..03563d273
--- /dev/null
+++ b/test/integration/repp/v1/registrar/auth/check_info_test.rb
@@ -0,0 +1,38 @@
+require 'test_helper'
+
+class ReppV1RegistrarAuthCheckInfoTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_returns_valid_user_auth_values
+ get '/repp/v1/registrar/auth', headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal 'Command completed successfully', json[:message]
+
+ assert_equal json[:data][:username], @user.username
+ assert json[:data][:roles].include? 'super'
+ assert_equal json[:data][:registrar_name], 'Best Names'
+ assert json[:data][:abilities].is_a? Hash
+ end
+
+ def test_invalid_user_login
+ token = Base64.encode64("#{@user.username}:0066600")
+ token = "Basic #{token}"
+
+ auth_headers = { 'Authorization' => token }
+
+ get '/repp/v1/registrar/auth', headers: auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :unauthorized
+ assert_equal json[:message], 'Invalid authorization information'
+ end
+end
\ No newline at end of file
diff --git a/test/integration/repp/v1/registrar/auth/tara_callback_test.rb b/test/integration/repp/v1/registrar/auth/tara_callback_test.rb
new file mode 100644
index 000000000..e39e24078
--- /dev/null
+++ b/test/integration/repp/v1/registrar/auth/tara_callback_test.rb
@@ -0,0 +1,46 @@
+require 'test_helper'
+
+class ReppV1RegistrarAuthTaraCallbackTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ username = nil
+ password = nil
+ token = Base64.encode64("#{username}:#{password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_validates_user_from_omniauth_params
+ request_body = {
+ auth: {
+ uid: 'EE1234',
+ },
+ }
+
+ post '/repp/v1/registrar/auth/tara_callback', headers: @auth_headers, params: request_body
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal 'Command completed successfully', json[:message]
+
+ user_token = Base64.urlsafe_encode64("#{@user.username}:#{@user.plain_text_password}")
+ assert_equal json[:data][:username], @user.username
+ assert_equal json[:data][:token], user_token
+ end
+
+ def test_invalidates_user_with_wrong_omniauth_params
+ request_body = {
+ auth: {
+ uid: '33333',
+ },
+ }
+
+ post '/repp/v1/registrar/auth/tara_callback', headers: @auth_headers, params: request_body
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :unauthorized
+ assert_equal 'No such user', json[:message]
+ end
+end
\ No newline at end of file
diff --git a/test/integration/repp/v1/registrar/summary_test.rb b/test/integration/repp/v1/registrar/summary_test.rb
new file mode 100644
index 000000000..97797990a
--- /dev/null
+++ b/test/integration/repp/v1/registrar/summary_test.rb
@@ -0,0 +1,43 @@
+require 'test_helper'
+
+class ReppV1RegistrarSummaryTest < ActionDispatch::IntegrationTest
+ def setup
+ @user = users(:api_bestnames)
+ token = Base64.encode64("#{@user.username}:#{@user.plain_text_password}")
+ token = "Basic #{token}"
+
+ @auth_headers = { 'Authorization' => token }
+ end
+
+ def test_checks_user_summary_info
+ get '/repp/v1/registrar/summary', headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal 'Command completed successfully', json[:message]
+
+ assert_equal json[:data][:username], @user.username
+ assert_equal json[:data][:registrar_name], 'Best Names'
+ assert_equal json[:data][:domains], @user.registrar.domains.count
+ assert_equal json[:data][:contacts], @user.registrar.contacts.count
+ assert_equal json[:data][:balance][:amount].to_f, @user.registrar.cash_account.balance
+ assert json[:data][:notification].is_a? Hash
+ assert_equal json[:data][:notifications_count], @user.unread_notifications.count
+ end
+
+ def test_checks_limited_user_summary_info
+ @user.update(roles: ['billing'])
+ get '/repp/v1/registrar/summary', headers: @auth_headers
+ json = JSON.parse(response.body, symbolize_names: true)
+
+ assert_response :ok
+ assert_equal 1000, json[:code]
+ assert_equal 'Command completed successfully', json[:message]
+
+ assert_equal json[:data][:username], @user.username
+ assert_equal json[:data][:registrar_name], 'Best Names'
+ assert_nil json[:data][:notification]
+ assert_nil json[:data][:notifications_count]
+ end
+end
\ No newline at end of file
diff --git a/test/interactions/do_request_test.rb b/test/interactions/do_request_test.rb
index a26eb0451..f73f71ad6 100644
--- a/test/interactions/do_request_test.rb
+++ b/test/interactions/do_request_test.rb
@@ -11,32 +11,23 @@ class DoRequestTest < ActiveSupport::TestCase
@domain = domains(:shop)
@user = users(:api_bestnames)
- @request.body = { data: { type: 'nameserver', id: @nameserver.hostname,
- domains: ["shop.test"],
- attributes: { hostname: 'new-ns.bestnames.test',
- ipv4: '192.0.2.55',
- ipv6: '2001:db8::55' } } }.to_json
+ @request.body = { data: { type: 'nameserver',
+ id: @nameserver.hostname,
+ domains: ['shop.test'],
+ attributes: { hostname: 'new-ns.bestnames.test',
+ ipv4: '192.0.2.55',
+ ipv6: '2001:db8::55' } } }.to_json
@request.basic_auth(@user.username, @user.plain_text_password)
end
def test_request_occurs
- stub_request(:put, "http://epp:3000/repp/v1/registrar/nameservers").
- with(
- body: "{\"data\":{\"type\":\"nameserver\",\"id\":\"ns1.bestnames.test\",\"domains\":[\"shop.test\"],\"attributes\":{\"hostname\":\"new-ns.bestnames.test\",\"ipv4\":\"192.0.2.55\",\"ipv6\":\"2001:db8::55\"}}}",
- headers: {
- 'Accept'=>'*/*',
- 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
- 'Authorization'=>'Basic dGVzdF9iZXN0bmFtZXM6dGVzdHRlc3Q=',
- 'Content-Type'=>'application/json',
- 'Host'=>'epp:3000',
- 'User-Agent'=>'Ruby'
- }).
- to_return(status: 200, body: ["shop.test"], headers: {})
+ stub_request(:put, "#{ENV['repp_url']}registrar/nameservers")
+ .to_return(status: 200, body: ['shop.test'], headers: {})
action = Actions::DoRequest.new(@request, @uri)
response = action.call
- assert_equal response.body, ["shop.test"]
- assert_equal response.code, "200"
+ assert_equal response.body, ['shop.test']
+ assert_equal response.code, '200'
end
end
\ No newline at end of file
diff --git a/test/jobs/directo_invoice_forward_job_test.rb b/test/jobs/directo_invoice_forward_job_test.rb
index 33a05f644..5e72b84f8 100644
--- 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
diff --git a/test/jobs/send_e_invoice_job_test.rb b/test/jobs/send_e_invoice_legacy_job_test.rb
similarity index 66%
rename from test/jobs/send_e_invoice_job_test.rb
rename to test/jobs/send_e_invoice_legacy_job_test.rb
index 0f2c683f2..35d5f5328 100644
--- a/test/jobs/send_e_invoice_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
diff --git a/test/jobs/send_monthly_invoices_job_test.rb b/test/jobs/send_monthly_invoices_job_test.rb
new file mode 100644
index 000000000..9fc5137ef
--- /dev/null
+++ 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
+
+ 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
+
+ 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
+
+ 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
+
+ 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
+
+ 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
\ No newline at end of file
diff --git a/test/mailers/domain_delete_mailer_test.rb b/test/mailers/domain_delete_mailer_test.rb
index 8e568846c..8bd2e0e92 100644
--- 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
diff --git a/test/models/bank_transaction_test.rb b/test/models/bank_transaction_test.rb
index 8a3a664b5..fbf2fdc59 100644
--- 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)
diff --git a/test/models/billing/reference_no_test.rb b/test/models/billing/reference_no_test.rb
index 15ac65dc4..5f22ff780 100644
--- 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
diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb
index 48372210b..66621f23d 100644
--- a/test/models/domain/force_delete_test.rb
+++ b/test/models/domain/force_delete_test.rb
@@ -128,13 +128,6 @@ class ForceDeleteTest < ActionMailer::TestCase
assert_empty @domain.statuses & statuses_to_be_removed, 'Pending actions should be stopped'
end
- def test_scheduling_force_delete_preserves_current_statuses
- @domain.statuses = %w[test1 test2]
- @domain.schedule_force_delete(type: :fast_track)
- @domain.reload
- assert_equal %w[test1 test2], @domain.statuses_before_force_delete
- end
-
def test_scheduling_force_delete_bypasses_validation
@domain = domains(:invalid)
@domain.schedule_force_delete(type: :fast_track)
diff --git a/test/models/feature_test.rb b/test/models/feature_test.rb
index f71979f11..9352deb70 100644
--- 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
diff --git a/test/models/invoice_test.rb b/test/models/invoice_test.rb
index d0cadb4ee..344af9dcc 100644
--- 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
diff --git a/test/models/registrant_user_test.rb b/test/models/registrant_user_test.rb
index 81e57fa72..4059720c9 100644
--- a/test/models/registrant_user_test.rb
+++ b/test/models/registrant_user_test.rb
@@ -60,6 +60,8 @@ class RegistrantUserTest < ActiveSupport::TestCase
end
bulk_action = @user.actions.where(operation: :bulk_update).last
+ single_action = @user.actions.find_by(operation: :update,
+ contact_id: contacts(:identical_to_william).id)
assert_equal 4, bulk_action.subactions.size
@@ -67,14 +69,14 @@ class RegistrantUserTest < ActiveSupport::TestCase
notification = r.notifications.unread.order('created_at DESC').take
if r == registrars(:bestnames)
assert_equal '4 contacts have been updated by registrant', notification.text
- assert_equal 'BulkAction', notification.attached_obj_type
+ assert_equal 'ContactUpdateAction', notification.attached_obj_type
assert_equal bulk_action.id, notification.attached_obj_id
assert_equal bulk_action.id, notification.action_id
else
assert_equal 'Contact william-002 has been updated by registrant', notification.text
- refute notification.action_id
- refute notification.attached_obj_id
- refute notification.attached_obj_type
+ assert_equal 'ContactUpdateAction', notification.attached_obj_type
+ assert_equal single_action.id, notification.attached_obj_id
+ assert_equal single_action.id, notification.action_id
end
end
end
diff --git a/test/models/registrar_test.rb b/test/models/registrar_test.rb
index 71ebe0fc0..da9eeed9a 100644
--- 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
diff --git a/test/system/admin_area/bank_statement_test.rb b/test/system/admin_area/bank_statement_test.rb
index f86e6ef53..4117cf7ba 100644
--- 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
diff --git a/test/system/admin_area/registrars_test.rb b/test/system/admin_area/registrars_test.rb
index 757875d1f..f3ee31020 100644
--- 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
diff --git a/test/system/registrar_area/billing/balance_top_up_test.rb b/test/system/registrar_area/billing/balance_top_up_test.rb
index 5cb32361f..3dfeb5a26 100644
--- 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
diff --git a/test/system/registrar_area/invoices/new_test.rb b/test/system/registrar_area/invoices/new_test.rb
index a1b66ac47..16e30aeb7 100644
--- 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
diff --git a/test/tasks/invoices/process_payments_test.rb b/test/tasks/invoices/process_payments_test.rb
index e368c5369..1ed65dc12 100644
--- 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
diff --git a/test/tasks/registrars/reload_balance_test.rb b/test/tasks/registrars/reload_balance_test.rb
index 0888fe3f4..934c6f6d0 100644
--- 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