From b62fae4665fedbd6f5563a9ae3959b82cba185ba Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Dec 2016 12:24:43 +0200 Subject: [PATCH] Revert "Merge branch 'registry-248' into staging" This reverts commit af0cde844ebbe419d141343dbb09c36ace27bdab, reversing changes made to d68abd90fa6e5ce3bc059035034fed3049f811f8. --- .../registrar/domains_controller.rb | 16 +------ .../registrar/domain_list_csv_presenter.rb | 45 ------------------- app/views/registrar/domains/index.haml | 5 +-- config/locales/registrar/domains.en.yml | 11 ----- .../registrar/domains/csv_export_spec.rb | 13 ------ spec/models/admin_user_spec.rb | 6 --- .../domain_list_csv_presenter_spec.rb | 45 ------------------- .../registrar/domains_controller_spec.rb | 28 ------------ .../routing/registrar/domains_routing_spec.rb | 9 ---- 9 files changed, 2 insertions(+), 176 deletions(-) delete mode 100644 app/presenters/registrar/domain_list_csv_presenter.rb delete mode 100644 config/locales/registrar/domains.en.yml delete mode 100644 spec/features/registrar/domains/csv_export_spec.rb delete mode 100644 spec/presenters/registrar/domain_list_csv_presenter_spec.rb delete mode 100644 spec/requests/registrar/domains_controller_spec.rb delete mode 100644 spec/routing/registrar/domains_routing_spec.rb diff --git a/app/controllers/registrar/domains_controller.rb b/app/controllers/registrar/domains_controller.rb index 560a965f3..a02fb4aa1 100644 --- a/app/controllers/registrar/domains_controller.rb +++ b/app/controllers/registrar/domains_controller.rb @@ -14,7 +14,7 @@ class Registrar::DomainsController < Registrar::DeppController # EPP controller if params[:q].length == 1 && params[:q][:name_matches].present? @domain = Domain.find_by(name: params[:q][:name_matches]) if @domain - redirect_to info_registrar_domains_url(domain_name: @domain.name) and return + redirect_to info_registrar_domains_path(domain_name: @domain.name) and return end end @@ -40,20 +40,6 @@ class Registrar::DomainsController < Registrar::DeppController # EPP controller end @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 - - respond_to do |format| - format.html - format.csv do - domain_presenters = [] - - @domains.find_each do |domain| - domain_presenters << ::DomainPresenter.new(domain: domain, view: view_context) - end - - csv = Registrar::DomainListCSVPresenter.new(domains: domain_presenters, view: view_context).to_s - send_data(csv) - end - end end # rubocop: enable Metrics/PerceivedComplexity # rubocop: enable Metrics/CyclomaticComplexity diff --git a/app/presenters/registrar/domain_list_csv_presenter.rb b/app/presenters/registrar/domain_list_csv_presenter.rb deleted file mode 100644 index b1427aa40..000000000 --- a/app/presenters/registrar/domain_list_csv_presenter.rb +++ /dev/null @@ -1,45 +0,0 @@ -class Registrar::DomainListCSVPresenter - def initialize(domains:, view:) - @domains = domains - @view = view - end - - def to_s - table = CSV::Table.new([header]) - - domains.each do |domain| - table << domain_to_row(domain: domain) - end - - table.to_s - end - - private - - def header - columns = %w( - domain_name - registrant_name - registrant_id - expire_time - ) - - columns.map! { |column| view.t("registrar.domains.index.csv.#{column}") } - - CSV::Row.new(columns, [], true) - end - - def domain_to_row(domain:) - row = [] - row[0] = domain.name - row[1] = domain.registrant_name - row[2] = domain.registrant_id - row[3] = domain.expire_date - row - - CSV::Row.new([], row) - end - - attr_reader :domains - attr_reader :view -end diff --git a/app/views/registrar/domains/index.haml b/app/views/registrar/domains/index.haml index d96bfb1c8..587ef2b5e 100644 --- a/app/views/registrar/domains/index.haml +++ b/app/views/registrar/domains/index.haml @@ -49,12 +49,9 @@ %button.btn.btn-primary.search   %span.glyphicon.glyphicon-search +   %button.btn.btn-default.js-reset-form = t(:clear_fields) - .row - .col-md-2 - = button_tag t('.export_csv_btn'), class: 'btn btn-primary export-domains-csv-btn', - formaction: registrar_domains_path(format: 'csv') %hr .row diff --git a/config/locales/registrar/domains.en.yml b/config/locales/registrar/domains.en.yml deleted file mode 100644 index 4b9c5af11..000000000 --- a/config/locales/registrar/domains.en.yml +++ /dev/null @@ -1,11 +0,0 @@ -en: - registrar: - domains: - index: - export_csv_btn: Export CSV - csv: - domain_name: Domain - registrant_name: Registrant name - registrant_id: Registrant ID - expire_time: Date of expiry - diff --git a/spec/features/registrar/domains/csv_export_spec.rb b/spec/features/registrar/domains/csv_export_spec.rb deleted file mode 100644 index 1677aa62f..000000000 --- a/spec/features/registrar/domains/csv_export_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'rails_helper' - -RSpec.feature 'CSV Export', db: true do - background do - Setting.registrar_ip_whitelist_enabled = false - sign_in_to_registrar_area(user: FactoryGirl.create(:api_user)) - end - - scenario 'exports csv' do - visit registrar_domains_url - click_button t('registrar.domains.index.export_csv_btn') - end -end diff --git a/spec/models/admin_user_spec.rb b/spec/models/admin_user_spec.rb index 0d3c7e083..eeb47107b 100644 --- a/spec/models/admin_user_spec.rb +++ b/spec/models/admin_user_spec.rb @@ -39,10 +39,4 @@ RSpec.describe AdminUser do expect(described_class.min_password_length).to eq(8) end end - - describe '#min_password_length' do - it 'returns minimum password length' do - expect(described_class.min_password_length).to eq(8) - end - end end diff --git a/spec/presenters/registrar/domain_list_csv_presenter_spec.rb b/spec/presenters/registrar/domain_list_csv_presenter_spec.rb deleted file mode 100644 index 866ed2570..000000000 --- a/spec/presenters/registrar/domain_list_csv_presenter_spec.rb +++ /dev/null @@ -1,45 +0,0 @@ -require 'rails_helper' - -RSpec.describe Registrar::DomainListCSVPresenter do - let(:domain) { instance_spy(DomainPresenter) } - let(:csv) { CSV.parse(described_class.new(domains: [domain], view: view).to_s, converters: :all) } - - describe 'header' do - subject(:header) { csv.first } - - it 'is present' do - columns = [] - columns[0] = 'Domain' - columns[1] = 'Registrant name' - columns[2] = 'Registrant ID' - columns[3] = 'Date of expiry' - columns - - expect(header).to eq(columns) - end - end - - describe 'row' do - subject(:row) { csv.second } - - it 'has domain name' do - expect(domain).to receive(:name).and_return('test name') - expect(row[0]).to eq('test name') - end - - it 'has registrant name' do - expect(domain).to receive(:registrant_name).and_return('test registrant name') - expect(row[1]).to eq('test registrant name') - end - - it 'has registrant id' do - expect(domain).to receive(:registrant_id).and_return('test registrant id') - expect(row[2]).to eq('test registrant id') - end - - it 'has expire date' do - expect(domain).to receive(:expire_date).and_return('expire date') - expect(row[3]).to eq('expire date') - end - end -end diff --git a/spec/requests/registrar/domains_controller_spec.rb b/spec/requests/registrar/domains_controller_spec.rb deleted file mode 100644 index 630703c6b..000000000 --- a/spec/requests/registrar/domains_controller_spec.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'rails_helper' - -RSpec.describe Registrar::DomainsController, db: true do - describe '#index' do - before do - sign_in_to_registrar_area - end - - it 'responds with success' do - csv_presenter = instance_double(Registrar::DomainListCSVPresenter, to_s: 'csv') - expect(Registrar::DomainListCSVPresenter).to receive(:new).and_return(csv_presenter) - - get registrar_domains_url(format: 'csv') - - expect(response.body).to eq('csv') - end - - it 'returns csv' do - get registrar_domains_url(format: 'csv') - - expect(response).to have_http_status(:success) - end - end - - def sign_in_to_registrar_area(user: FactoryGirl.create(:api_user)) - post registrar_sessions_path, { depp_user: { tag: user.username, password: user.password } } - end -end diff --git a/spec/routing/registrar/domains_routing_spec.rb b/spec/routing/registrar/domains_routing_spec.rb deleted file mode 100644 index e30d1dd24..000000000 --- a/spec/routing/registrar/domains_routing_spec.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'rails_helper' - -RSpec.describe Registrar::DomainsController do - describe 'routing' do - it 'routes to #index' do - expect(get: '/registrar/domains').to route_to('registrar/domains#index') - end - end -end