mirror of
https://github.com/internetee/registry.git
synced 2025-05-16 09:27:19 +02:00
parent
01edbc5710
commit
c14d15d7b7
15 changed files with 26 additions and 19 deletions
|
@ -85,7 +85,7 @@ class WhoisRecord < ActiveRecord::Base
|
|||
|
||||
# update registar triggers when adding new attributes
|
||||
h[:registrar] = domain.registrar.name
|
||||
h[:registrar_url] = domain.registrar.url
|
||||
h[:registrar_website] = domain.registrar.website
|
||||
h[:registrar_phone] = domain.registrar.phone
|
||||
h[:registrar_address] = domain.registrar.address
|
||||
h[:registrar_changed] = domain.registrar.updated_at.try(:to_s, :iso8601)
|
||||
|
|
|
@ -16,8 +16,8 @@ class RegistrarPresenter
|
|||
registrar.phone
|
||||
end
|
||||
|
||||
def url
|
||||
registrar.url
|
||||
def website
|
||||
registrar.website
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -40,7 +40,7 @@ changed: <%= contact['changed'].to_s.tr('T',' ').sub('+', ' +') %>
|
|||
<%- end -%>
|
||||
Registrar:
|
||||
name: <%= json['registrar'] %>
|
||||
url: <%= json['registrar_url'] %>
|
||||
url: <%= json['registrar_website'] %>
|
||||
phone: <%= json['registrar_phone'] %>
|
||||
changed: <%= json['registrar_changed'].to_s.tr('T',' ').sub('+', ' +') %>
|
||||
|
||||
|
|
|
@ -2,5 +2,5 @@
|
|||
<%= registrar.name %><br>
|
||||
Email: <%= registrar.email %><br>
|
||||
Phone: <%= registrar.phone %><br>
|
||||
Website: <%= registrar.url %>
|
||||
Website: <%= registrar.website %>
|
||||
</p>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<%= registrar.name %>
|
||||
Email: <%= registrar.email %>
|
||||
Phone: <%= registrar.phone %>
|
||||
Website: <%= registrar.url %>
|
||||
Website: <%= registrar.website %>
|
||||
|
|
|
@ -2,5 +2,5 @@
|
|||
<%= registrar.name %><br>
|
||||
Email: <%= registrar.email %><br>
|
||||
Telefon: <%= registrar.phone %><br>
|
||||
Veebileht: <%= registrar.url %>
|
||||
Veebileht: <%= registrar.website %>
|
||||
</p>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<%= registrar.name %>
|
||||
Email: <%= registrar.email %>
|
||||
Telefon: <%= registrar.phone %>
|
||||
Veebileht: <%= registrar.url %>
|
||||
Veebileht: <%= registrar.website %>
|
||||
|
|
|
@ -2,5 +2,5 @@
|
|||
<%= registrar.name %><br>
|
||||
Электронная почта: <%= registrar.email %><br>
|
||||
Телефон: <%= registrar.phone %><br>
|
||||
Веб-сайт: <%= registrar.url %>
|
||||
Веб-сайт: <%= registrar.website %>
|
||||
</p>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<%= registrar.name %>
|
||||
Электронная почта: <%= registrar.email %>
|
||||
Телефон: <%= registrar.phone %>
|
||||
Веб-сайт: <%= registrar.url %>
|
||||
Веб-сайт: <%= registrar.website %>
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
class RenameRegistrarUrlToWebsite < ActiveRecord::Migration
|
||||
def change
|
||||
rename_column :registrars, :url, :website
|
||||
end
|
||||
end
|
|
@ -11,7 +11,7 @@
|
|||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 20161227193500) do
|
||||
ActiveRecord::Schema.define(version: 20170221115548) do
|
||||
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
|
@ -1046,7 +1046,7 @@ ActiveRecord::Schema.define(version: 20161227193500) do
|
|||
t.string "street"
|
||||
t.string "zip"
|
||||
t.string "code"
|
||||
t.string "url"
|
||||
t.string "website"
|
||||
t.string "directo_handle"
|
||||
t.boolean "vat"
|
||||
t.integer "legacy_id"
|
||||
|
|
|
@ -2704,7 +2704,7 @@ CREATE TABLE registrars (
|
|||
street character varying,
|
||||
zip character varying,
|
||||
code character varying,
|
||||
url character varying,
|
||||
website character varying,
|
||||
directo_handle character varying,
|
||||
vat boolean,
|
||||
legacy_id integer,
|
||||
|
@ -5278,3 +5278,5 @@ INSERT INTO schema_migrations (version) VALUES ('20161004101419');
|
|||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20161227193500');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20170221115548');
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ Fabricator(:eis, from: :registrar) do
|
|||
city 'Tallinn'
|
||||
street 'Paldiski mnt 80'
|
||||
zip '10617'
|
||||
url 'www.internet.ee'
|
||||
website 'www.internet.ee'
|
||||
code { sequence(:code) { |i| "EIS#{i}" } }
|
||||
accounts(count: 1) { Fabricate(:account, account_activities: []) }
|
||||
end
|
||||
|
|
|
@ -25,10 +25,10 @@ RSpec.describe RegistrarPresenter do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#url' do
|
||||
it 'returns url' do
|
||||
expect(registrar).to receive(:url).and_return('test url')
|
||||
expect(presenter.url).to eq('test url')
|
||||
describe '#website' do
|
||||
it 'returns website' do
|
||||
expect(registrar).to receive(:website).and_return('test')
|
||||
expect(presenter.website).to eq('test')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -11,7 +11,7 @@ RSpec.shared_examples 'domain mailer registrar info' do
|
|||
name
|
||||
email
|
||||
phone
|
||||
url
|
||||
website
|
||||
)
|
||||
|
||||
attributes.each do |attr_name|
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue