Merge branch 'master' into registry-475

# Conflicts:
#	app/models/billing/price.rb
#	spec/models/billing/price_spec.rb

spec/requests/admin/billing/prices/destroy_spec.rb

@@ -1,18 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'admin price destroy', settings: false do
-  let!(:price) { create(:price) }
-
-  before :example do
-    sign_in_to_admin_area
-  end
-
-  it 'deletes price' do
-    expect { delete admin_price_path(price) }.to change { Billing::Price.count }.from(1).to(0)
-  end
-
-  it 'redirects to :index' do
-    delete admin_price_path(price)
-    expect(response).to redirect_to admin_prices_url
-  end
-end

spec/requests/admin/billing/prices/expire_spec.rb

@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+RSpec.describe 'admin price expire', settings: false do
+  before :example do
+    sign_in_to_admin_area
+  end
+
+  it 'expires price' do
+    price = create(:effective_price)
+
+    expect { patch expire_admin_price_path(price); price.reload }
+        .to change { price.expired? }.from(false).to(true)
+  end
+
+  it 'redirects to :index' do
+    price = create(:effective_price)
+
+    patch expire_admin_price_path(price)
+
+    expect(response).to redirect_to admin_prices_url
+  end
+end

spec/requests/admin/dns/zones/destroy_spec.rb

@@ -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