From 35267820f9cfbf580dbf7b43d405a7c63157d75b Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Tue, 23 May 2017 17:23:05 +0300
Subject: [PATCH] Do not allow to permanently remove a zone

#522
---
 app/controllers/admin/dns/zones_controller.rb |  6 ------
 app/views/admin/dns/zones/edit.html.erb       | 13 +------------
 config/locales/admin/dns/zones.en.yml         |  5 -----
 config/routes.rb                              |  2 +-
 spec/features/admin/dns/zones/delete_spec.rb  | 16 ----------------
 spec/requests/admin/dns/zones/destroy_spec.rb | 18 ------------------
 6 files changed, 2 insertions(+), 58 deletions(-)
 delete mode 100644 spec/features/admin/dns/zones/delete_spec.rb
 delete mode 100644 spec/requests/admin/dns/zones/destroy_spec.rb

diff --git a/app/controllers/admin/dns/zones_controller.rb b/app/controllers/admin/dns/zones_controller.rb
index 10e432520..9d5041fb5 100644
--- a/app/controllers/admin/dns/zones_controller.rb
+++ b/app/controllers/admin/dns/zones_controller.rb
@@ -36,12 +36,6 @@ module Admin
         end
       end
 
-      def destroy
-        @zone.destroy!
-        flash[:notice] = t('.destroyed')
-        redirect_to_index
-      end
-
       private
 
       def load_zone
diff --git a/app/views/admin/dns/zones/edit.html.erb b/app/views/admin/dns/zones/edit.html.erb
index 645a77197..fc37f984b 100644
--- a/app/views/admin/dns/zones/edit.html.erb
+++ b/app/views/admin/dns/zones/edit.html.erb
@@ -3,18 +3,7 @@
 </ol>
 
 <div class="page-header">
-    <div class="row">
-        <div class="col-sm-10">
-            <h1><%= t '.title' %></h1>
-        </div>
-
-        <div class="col-sm-2 text-right">
-            <%= link_to(t('.delete_btn'), admin_zone_path(@zone),
-                        method: :delete,
-                        data: { confirm: t('.delete_btn_confirm') },
-                        class: 'btn btn-danger') %>
-        </div>
-    </div>
+    <h1><%= t '.title' %></h1>
 </div>
 
 <%= render 'form', zone: @zone %>
diff --git a/config/locales/admin/dns/zones.en.yml b/config/locales/admin/dns/zones.en.yml
index 08897a93b..6397c61ff 100644
--- a/config/locales/admin/dns/zones.en.yml
+++ b/config/locales/admin/dns/zones.en.yml
@@ -15,15 +15,10 @@ en:
 
         edit:
           title: Edit zone
-          delete_btn: Delete
-          delete_btn_confirm: Are you sure you want to delete zone?
 
         update:
           updated: Zone has been updated
 
-        destroy:
-          destroyed: Zone has been deleted
-
         form:
           create_btn: Create zone
           update_btn: Update zone
diff --git a/config/routes.rb b/config/routes.rb
index b808f1a24..3cba3234a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -163,7 +163,7 @@ Rails.application.routes.draw do
   namespace :admin do
     resources :keyrelays
     resources :zonefiles
-    resources :zones, controller: 'dns/zones', except: %i[show]
+    resources :zones, controller: 'dns/zones', except: %i[show destroy]
     resources :legal_documents
     resources :keyrelays
     resources :prices, controller: 'billing/prices', except: %i[show]
diff --git a/spec/features/admin/dns/zones/delete_spec.rb b/spec/features/admin/dns/zones/delete_spec.rb
deleted file mode 100644
index 4cf0e5f28..000000000
--- a/spec/features/admin/dns/zones/delete_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'rails_helper'
-
-RSpec.feature 'Deleting zone in admin area', settings: false do
-  given!(:zone) { create(:zone) }
-
-  background do
-    sign_in_to_admin_area
-  end
-
-  scenario 'deletes zone' do
-    visit edit_admin_zone_url(zone)
-    click_link_or_button t('admin.dns.zones.edit.delete_btn')
-
-    expect(page).to have_text(t('admin.dns.zones.destroy.destroyed'))
-  end
-end
diff --git a/spec/requests/admin/dns/zones/destroy_spec.rb b/spec/requests/admin/dns/zones/destroy_spec.rb
deleted file mode 100644
index 4d2c714bc..000000000
--- a/spec/requests/admin/dns/zones/destroy_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'admin zone destroy', settings: false do
-  let!(:zone) { create(:zone) }
-
-  before :example do
-    sign_in_to_admin_area
-  end
-
-  it 'deletes zone' do
-    expect { delete admin_zone_path(zone) }.to change { DNS::Zone.count }.from(1).to(0)
-  end
-
-  it 'redirects to :index' do
-    delete admin_zone_path(zone)
-    expect(response).to redirect_to admin_zones_url
-  end
-end