From 0e39cc6a35661416a1f1ccb8841863f7bf307020 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Thu, 13 Apr 2017 07:02:02 -0400
Subject: Settings export refactor (#1646)

* Refactor Export to take an account and know about the export types

* Use Export instance in settings/exports#show
---
 spec/controllers/settings/exports_controller_spec.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'spec/controllers')

diff --git a/spec/controllers/settings/exports_controller_spec.rb b/spec/controllers/settings/exports_controller_spec.rb
index ff98f3ad9..2be6e4744 100644
--- a/spec/controllers/settings/exports_controller_spec.rb
+++ b/spec/controllers/settings/exports_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe Settings::ExportsController do
+  render_views
+
   before do
     sign_in Fabricate(:user), scope: :user
   end
@@ -8,6 +10,7 @@ describe Settings::ExportsController do
   describe 'GET #show' do
     it 'returns http success' do
       get :show
+
       expect(response).to have_http_status(:success)
     end
   end
-- 
cgit 


From 3a9eb81a8006af0306e8abc54bd8aca8381eee25 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Thu, 13 Apr 2017 07:04:23 -0400
Subject: Admin accounts controller cleanup (#1664)

* Remove unused account_params method in admin/accounts controller

* Introduce AccountFilter to find accounts

* Use AccountFilter in admin/accounts controller

* Use more restful routes admin silence and suspension area

* Add admin/silences and admin/suspensions controllers
---
 app/controllers/admin/accounts_controller.rb       | 48 +++++++---------------
 app/controllers/admin/silences_controller.rb       | 23 +++++++++++
 app/controllers/admin/suspensions_controller.rb    | 23 +++++++++++
 app/models/account_filter.rb                       | 36 ++++++++++++++++
 app/views/admin/accounts/show.html.haml            |  8 ++--
 config/routes.rb                                   |  9 ++--
 spec/controllers/admin/silences_controller_spec.rb | 24 +++++++++++
 .../admin/suspensions_controller_spec.rb           | 24 +++++++++++
 spec/models/account_filter_spec.rb                 | 31 ++++++++++++++
 9 files changed, 182 insertions(+), 44 deletions(-)
 create mode 100644 app/controllers/admin/silences_controller.rb
 create mode 100644 app/controllers/admin/suspensions_controller.rb
 create mode 100644 app/models/account_filter.rb
 create mode 100644 spec/controllers/admin/silences_controller_spec.rb
 create mode 100644 spec/controllers/admin/suspensions_controller_spec.rb
 create mode 100644 spec/models/account_filter_spec.rb

(limited to 'spec/controllers')

diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index 71cb8edd8..0e9e52f42 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -2,49 +2,29 @@
 
 module Admin
   class AccountsController < BaseController
-    before_action :set_account, except: :index
-
     def index
-      @accounts = Account.alphabetic.page(params[:page])
-
-      @accounts = @accounts.local                             if params[:local].present?
-      @accounts = @accounts.remote                            if params[:remote].present?
-      @accounts = @accounts.where(domain: params[:by_domain]) if params[:by_domain].present?
-      @accounts = @accounts.silenced                          if params[:silenced].present?
-      @accounts = @accounts.recent                            if params[:recent].present?
-      @accounts = @accounts.suspended                         if params[:suspended].present?
-    end
-
-    def show; end
-
-    def suspend
-      Admin::SuspensionWorker.perform_async(@account.id)
-      redirect_to admin_accounts_path
+      @accounts = filtered_accounts.page(params[:page])
     end
 
-    def unsuspend
-      @account.update(suspended: false)
-      redirect_to admin_accounts_path
-    end
-
-    def silence
-      @account.update(silenced: true)
-      redirect_to admin_accounts_path
-    end
-
-    def unsilence
-      @account.update(silenced: false)
-      redirect_to admin_accounts_path
+    def show
+      @account = Account.find(params[:id])
     end
 
     private
 
-    def set_account
-      @account = Account.find(params[:id])
+    def filtered_accounts
+      AccountFilter.new(filter_params).results
     end
 
-    def account_params
-      params.require(:account).permit(:silenced, :suspended)
+    def filter_params
+      params.permit(
+        :local,
+        :remote,
+        :by_domain,
+        :silenced,
+        :recent,
+        :suspended
+      )
     end
   end
 end
diff --git a/app/controllers/admin/silences_controller.rb b/app/controllers/admin/silences_controller.rb
new file mode 100644
index 000000000..81a3008b9
--- /dev/null
+++ b/app/controllers/admin/silences_controller.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Admin
+  class SilencesController < BaseController
+    before_action :set_account
+
+    def create
+      @account.update(silenced: true)
+      redirect_to admin_accounts_path
+    end
+
+    def destroy
+      @account.update(silenced: false)
+      redirect_to admin_accounts_path
+    end
+
+    private
+
+    def set_account
+      @account = Account.find(params[:account_id])
+    end
+  end
+end
diff --git a/app/controllers/admin/suspensions_controller.rb b/app/controllers/admin/suspensions_controller.rb
new file mode 100644
index 000000000..5d9048d94
--- /dev/null
+++ b/app/controllers/admin/suspensions_controller.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Admin
+  class SuspensionsController < BaseController
+    before_action :set_account
+
+    def create
+      Admin::SuspensionWorker.perform_async(@account.id)
+      redirect_to admin_accounts_path
+    end
+
+    def destroy
+      @account.update(suspended: false)
+      redirect_to admin_accounts_path
+    end
+
+    private
+
+    def set_account
+      @account = Account.find(params[:account_id])
+    end
+  end
+end
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb
new file mode 100644
index 000000000..a8d8c8837
--- /dev/null
+++ b/app/models/account_filter.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class AccountFilter
+  attr_reader :params
+
+  def initialize(params)
+    @params = params
+  end
+
+  def results
+    scope = Account.alphabetic
+    params.each do |key, value|
+      scope = scope.merge scope_for(key, value)
+    end
+    scope
+  end
+
+  def scope_for(key, value)
+    case key
+    when /local/
+      Account.local
+    when /remote/
+      Account.remote
+    when /by_domain/
+      Account.where(domain: value)
+    when /silenced/
+      Account.silenced
+    when /recent/
+      Account.recent
+    when /suspended/
+      Account.suspended
+    else
+      raise "Unknown filter: #{key}"
+    end
+  end
+end
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index ba1c3bae7..22901aed1 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -62,11 +62,11 @@
           = number_to_human_size @account.media_attachments.sum('file_file_size')
 
 - if @account.silenced?
-  = link_to 'Undo silence', unsilence_admin_account_path(@account.id), method: :post, class: 'button'
+  = link_to 'Undo silence', admin_account_silence_path(@account.id), method: :delete, class: 'button'
 - else
-  = link_to 'Silence', silence_admin_account_path(@account.id), method: :post, class: 'button'
+  = link_to 'Silence', admin_account_silence_path(@account.id), method: :post, class: 'button'
 
 - if @account.suspended?
-  = link_to 'Undo suspension', unsuspend_admin_account_path(@account.id), method: :post, class: 'button'
+  = link_to 'Undo suspension', admin_account_suspension_path(@account.id), method: :delete, class: 'button'
 - else
-  = link_to 'Perform full suspension', suspend_admin_account_path(@account.id), method: :post, data: { confirm: 'Are you sure?' }, class: 'button'
+  = link_to 'Perform full suspension', admin_account_suspension_path(@account.id), method: :post, data: { confirm: 'Are you sure?' }, class: 'button'
diff --git a/config/routes.rb b/config/routes.rb
index 78bf7870c..ca3f31055 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,3 +1,4 @@
+
 # frozen_string_literal: true
 
 require 'sidekiq/web'
@@ -89,12 +90,8 @@ Rails.application.routes.draw do
     end
 
     resources :accounts, only: [:index, :show] do
-      member do
-        post :silence
-        post :unsilence
-        post :suspend
-        post :unsuspend
-      end
+      resource :silence, only: [:create, :destroy]
+      resource :suspension, only: [:create, :destroy]
     end
   end
 
diff --git a/spec/controllers/admin/silences_controller_spec.rb b/spec/controllers/admin/silences_controller_spec.rb
new file mode 100644
index 000000000..7c541d797
--- /dev/null
+++ b/spec/controllers/admin/silences_controller_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+describe Admin::SilencesController do
+  let(:account) { Fabricate(:account) }
+  before do
+    sign_in Fabricate(:user, admin: true), scope: :user
+  end
+
+  describe 'POST #create' do
+    it 'redirects to admin accounts page' do
+      post :create, params: { account_id: account.id }
+
+      expect(response).to redirect_to(admin_accounts_path)
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    it 'redirects to admin accounts page' do
+      delete :destroy, params: { account_id: account.id }
+
+      expect(response).to redirect_to(admin_accounts_path)
+    end
+  end
+end
diff --git a/spec/controllers/admin/suspensions_controller_spec.rb b/spec/controllers/admin/suspensions_controller_spec.rb
new file mode 100644
index 000000000..9096f067e
--- /dev/null
+++ b/spec/controllers/admin/suspensions_controller_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+describe Admin::SuspensionsController do
+  let(:account) { Fabricate(:account) }
+  before do
+    sign_in Fabricate(:user, admin: true), scope: :user
+  end
+
+  describe 'POST #create' do
+    it 'redirects to admin accounts page' do
+      post :create, params: { account_id: account.id }
+
+      expect(response).to redirect_to(admin_accounts_path)
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    it 'redirects to admin accounts page' do
+      delete :destroy, params: { account_id: account.id }
+
+      expect(response).to redirect_to(admin_accounts_path)
+    end
+  end
+end
diff --git a/spec/models/account_filter_spec.rb b/spec/models/account_filter_spec.rb
new file mode 100644
index 000000000..1599c5ae8
--- /dev/null
+++ b/spec/models/account_filter_spec.rb
@@ -0,0 +1,31 @@
+require 'rails_helper'
+
+describe AccountFilter do
+  describe 'with empty params' do
+    it 'defaults to alphabetic account list' do
+      filter = AccountFilter.new({})
+
+      expect(filter.results).to eq Account.alphabetic
+    end
+  end
+
+  describe 'with invalid params' do
+    it 'raises with key error' do
+      filter = AccountFilter.new(wrong: true)
+
+      expect { filter.results }.to raise_error(/wrong/)
+    end
+  end
+
+  describe 'with valid params' do
+    it 'combines filters on Account' do
+      filter = AccountFilter.new(by_domain: 'test.com', silenced: true)
+
+      allow(Account).to receive(:where).and_return(Account.none)
+      allow(Account).to receive(:silenced).and_return(Account.none)
+      filter.results
+      expect(Account).to have_received(:where).with(domain: 'test.com')
+      expect(Account).to have_received(:silenced)
+    end
+  end
+end
-- 
cgit 


From 137100dcf38c0da0fe7044a4c92aa06eae02c420 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Thu, 13 Apr 2017 07:09:07 -0400
Subject: Clean up well-known routes/controllers (#1649)

* Add request spec for host meta route returning xml

* Add routing spec for xrd routes

* Update well-known routes

* Move webfinger and host-meta actions to their own controllers
---
 app/controllers/well_known/host_meta_controller.rb | 13 +++++
 app/controllers/well_known/webfinger_controller.rb | 43 +++++++++++++++++
 app/controllers/xrd_controller.rb                  | 55 ----------------------
 app/views/well_known/host_meta/show.xml.ruby       |  5 ++
 app/views/well_known/webfinger/show.json.rabl      | 17 +++++++
 app/views/well_known/webfinger/show.xml.ruby       | 11 +++++
 app/views/xrd/host_meta.xml.ruby                   |  5 --
 app/views/xrd/webfinger.json.rabl                  | 17 -------
 app/views/xrd/webfinger.xml.ruby                   | 11 -----
 config/routes.rb                                   |  4 +-
 .../well_known/host_meta_controller_spec.rb        | 13 +++++
 .../well_known/webfinger_controller_spec.rb        | 21 +++++++++
 spec/controllers/xrd_controller_spec.rb            | 26 ----------
 spec/requests/host_meta_request_spec.rb            | 12 +++++
 spec/routing/well_known_routes_spec.rb             | 15 ++++++
 15 files changed, 152 insertions(+), 116 deletions(-)
 create mode 100644 app/controllers/well_known/host_meta_controller.rb
 create mode 100644 app/controllers/well_known/webfinger_controller.rb
 delete mode 100644 app/controllers/xrd_controller.rb
 create mode 100644 app/views/well_known/host_meta/show.xml.ruby
 create mode 100644 app/views/well_known/webfinger/show.json.rabl
 create mode 100644 app/views/well_known/webfinger/show.xml.ruby
 delete mode 100644 app/views/xrd/host_meta.xml.ruby
 delete mode 100644 app/views/xrd/webfinger.json.rabl
 delete mode 100644 app/views/xrd/webfinger.xml.ruby
 create mode 100644 spec/controllers/well_known/host_meta_controller_spec.rb
 create mode 100644 spec/controllers/well_known/webfinger_controller_spec.rb
 delete mode 100644 spec/controllers/xrd_controller_spec.rb
 create mode 100644 spec/requests/host_meta_request_spec.rb
 create mode 100644 spec/routing/well_known_routes_spec.rb

(limited to 'spec/controllers')

diff --git a/app/controllers/well_known/host_meta_controller.rb b/app/controllers/well_known/host_meta_controller.rb
new file mode 100644
index 000000000..2f0960acd
--- /dev/null
+++ b/app/controllers/well_known/host_meta_controller.rb
@@ -0,0 +1,13 @@
+  # frozen_string_literal: true
+
+module WellKnown
+  class HostMetaController < ApplicationController
+    def show
+      @webfinger_template = "#{webfinger_url}?resource={uri}"
+
+      respond_to do |format|
+        format.xml { render content_type: 'application/xrd+xml' }
+      end
+    end
+  end
+end
diff --git a/app/controllers/well_known/webfinger_controller.rb b/app/controllers/well_known/webfinger_controller.rb
new file mode 100644
index 000000000..1a8ef5f90
--- /dev/null
+++ b/app/controllers/well_known/webfinger_controller.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module WellKnown
+  class WebfingerController < ApplicationController
+    def show
+      @account = Account.find_local!(username_from_resource)
+      @canonical_account_uri = @account.to_webfinger_s
+      @magic_key = pem_to_magic_key(@account.keypair.public_key)
+
+      respond_to do |format|
+        format.xml  { render content_type: 'application/xrd+xml' }
+        format.json { render content_type: 'application/jrd+json' }
+      end
+    rescue ActiveRecord::RecordNotFound
+      head 404
+    end
+
+    private
+
+    def username_from_resource
+      WebfingerResource.new(resource_param).username
+    end
+
+    def pem_to_magic_key(public_key)
+      modulus, exponent = [public_key.n, public_key.e].map do |component|
+        result = []
+
+        until component.zero?
+          result << [component % 256].pack('C')
+          component >>= 8
+        end
+
+        result.reverse.join
+      end
+
+      (['RSA'] + [modulus, exponent].map { |n| Base64.urlsafe_encode64(n) }).join('.')
+    end
+
+    def resource_param
+      params.require(:resource)
+    end
+  end
+end
diff --git a/app/controllers/xrd_controller.rb b/app/controllers/xrd_controller.rb
deleted file mode 100644
index 2886315ac..000000000
--- a/app/controllers/xrd_controller.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-class XrdController < ApplicationController
-  before_action :set_default_format_xml, only: :host_meta
-
-  def host_meta
-    @webfinger_template = "#{webfinger_url}?resource={uri}"
-
-    respond_to do |format|
-      format.xml { render content_type: 'application/xrd+xml' }
-    end
-  end
-
-  def webfinger
-    @account = Account.find_local!(username_from_resource)
-    @canonical_account_uri = @account.to_webfinger_s
-    @magic_key = pem_to_magic_key(@account.keypair.public_key)
-
-    respond_to do |format|
-      format.xml  { render content_type: 'application/xrd+xml' }
-      format.json { render content_type: 'application/jrd+json' }
-    end
-  rescue ActiveRecord::RecordNotFound
-    head 404
-  end
-
-  private
-
-  def set_default_format_xml
-    request.format = 'xml' if request.headers['HTTP_ACCEPT'].nil? && params[:format].nil?
-  end
-
-  def username_from_resource
-    WebfingerResource.new(resource_param).username
-  end
-
-  def pem_to_magic_key(public_key)
-    modulus, exponent = [public_key.n, public_key.e].map do |component|
-      result = []
-
-      until component.zero?
-        result << [component % 256].pack('C')
-        component >>= 8
-      end
-
-      result.reverse.join
-    end
-
-    (['RSA'] + [modulus, exponent].map { |n| Base64.urlsafe_encode64(n) }).join('.')
-  end
-
-  def resource_param
-    params.require(:resource)
-  end
-end
diff --git a/app/views/well_known/host_meta/show.xml.ruby b/app/views/well_known/host_meta/show.xml.ruby
new file mode 100644
index 000000000..07d026471
--- /dev/null
+++ b/app/views/well_known/host_meta/show.xml.ruby
@@ -0,0 +1,5 @@
+Nokogiri::XML::Builder.new do |xml|
+  xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do
+    xml.Link(rel: 'lrdd', type: 'application/xrd+xml', template: @webfinger_template)
+  end
+end.to_xml
diff --git a/app/views/well_known/webfinger/show.json.rabl b/app/views/well_known/webfinger/show.json.rabl
new file mode 100644
index 000000000..e637ed9d3
--- /dev/null
+++ b/app/views/well_known/webfinger/show.json.rabl
@@ -0,0 +1,17 @@
+object @account
+
+node(:subject) { @canonical_account_uri }
+
+node(:aliases) do
+  [TagManager.instance.url_for(@account)]
+end
+
+node(:links) do
+  [
+    { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: TagManager.instance.url_for(@account) },
+    { rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom') },
+    { rel: 'salmon', href: api_salmon_url(@account.id) },
+    { rel: 'magic-public-key', href: "data:application/magic-public-key,#{@magic_key}" },
+    { rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_follow_url}?acct={uri}" },
+  ]
+end
diff --git a/app/views/well_known/webfinger/show.xml.ruby b/app/views/well_known/webfinger/show.xml.ruby
new file mode 100644
index 000000000..80ac71d27
--- /dev/null
+++ b/app/views/well_known/webfinger/show.xml.ruby
@@ -0,0 +1,11 @@
+Nokogiri::XML::Builder.new do |xml|
+  xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do
+    xml.Subject @canonical_account_uri
+    xml.Alias TagManager.instance.url_for(@account)
+    xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: TagManager.instance.url_for(@account))
+    xml.Link(rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom'))
+    xml.Link(rel: 'salmon', href: api_salmon_url(@account.id))
+    xml.Link(rel: 'magic-public-key', href: "data:application/magic-public-key,#{@magic_key}")
+    xml.Link(rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_follow_url}?acct={uri}")
+  end
+end.to_xml
diff --git a/app/views/xrd/host_meta.xml.ruby b/app/views/xrd/host_meta.xml.ruby
deleted file mode 100644
index 07d026471..000000000
--- a/app/views/xrd/host_meta.xml.ruby
+++ /dev/null
@@ -1,5 +0,0 @@
-Nokogiri::XML::Builder.new do |xml|
-  xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do
-    xml.Link(rel: 'lrdd', type: 'application/xrd+xml', template: @webfinger_template)
-  end
-end.to_xml
diff --git a/app/views/xrd/webfinger.json.rabl b/app/views/xrd/webfinger.json.rabl
deleted file mode 100644
index e637ed9d3..000000000
--- a/app/views/xrd/webfinger.json.rabl
+++ /dev/null
@@ -1,17 +0,0 @@
-object @account
-
-node(:subject) { @canonical_account_uri }
-
-node(:aliases) do
-  [TagManager.instance.url_for(@account)]
-end
-
-node(:links) do
-  [
-    { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: TagManager.instance.url_for(@account) },
-    { rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom') },
-    { rel: 'salmon', href: api_salmon_url(@account.id) },
-    { rel: 'magic-public-key', href: "data:application/magic-public-key,#{@magic_key}" },
-    { rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_follow_url}?acct={uri}" },
-  ]
-end
diff --git a/app/views/xrd/webfinger.xml.ruby b/app/views/xrd/webfinger.xml.ruby
deleted file mode 100644
index 80ac71d27..000000000
--- a/app/views/xrd/webfinger.xml.ruby
+++ /dev/null
@@ -1,11 +0,0 @@
-Nokogiri::XML::Builder.new do |xml|
-  xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do
-    xml.Subject @canonical_account_uri
-    xml.Alias TagManager.instance.url_for(@account)
-    xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: TagManager.instance.url_for(@account))
-    xml.Link(rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom'))
-    xml.Link(rel: 'salmon', href: api_salmon_url(@account.id))
-    xml.Link(rel: 'magic-public-key', href: "data:application/magic-public-key,#{@magic_key}")
-    xml.Link(rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_follow_url}?acct={uri}")
-  end
-end.to_xml
diff --git a/config/routes.rb b/config/routes.rb
index ca3f31055..6e48d3b92 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -15,8 +15,8 @@ Rails.application.routes.draw do
     controllers authorizations: 'oauth/authorizations', authorized_applications: 'oauth/authorized_applications'
   end
 
-  get '.well-known/host-meta', to: 'xrd#host_meta', as: :host_meta
-  get '.well-known/webfinger', to: 'xrd#webfinger', as: :webfinger, defaults: { format: 'json' }
+  get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' }
+  get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger, defaults: { format: 'json' }
 
   devise_for :users, path: 'auth', controllers: {
     sessions:           'auth/sessions',
diff --git a/spec/controllers/well_known/host_meta_controller_spec.rb b/spec/controllers/well_known/host_meta_controller_spec.rb
new file mode 100644
index 000000000..8a040021a
--- /dev/null
+++ b/spec/controllers/well_known/host_meta_controller_spec.rb
@@ -0,0 +1,13 @@
+require 'rails_helper'
+
+describe WellKnown::HostMetaController, type: :controller do
+  render_views
+
+  describe 'GET #show' do
+    it 'returns http success' do
+      get :show, format: :xml
+
+      expect(response).to have_http_status(:success)
+    end
+  end
+end
diff --git a/spec/controllers/well_known/webfinger_controller_spec.rb b/spec/controllers/well_known/webfinger_controller_spec.rb
new file mode 100644
index 000000000..6e493b037
--- /dev/null
+++ b/spec/controllers/well_known/webfinger_controller_spec.rb
@@ -0,0 +1,21 @@
+require 'rails_helper'
+
+describe WellKnown::WebfingerController, type: :controller do
+  render_views
+
+  describe 'GET #show' do
+    let(:alice) { Fabricate(:account, username: 'alice') }
+
+    it 'returns http success when account can be found' do
+      get :show, params: { resource: alice.to_webfinger_s }, format: :json
+
+      expect(response).to have_http_status(:success)
+    end
+
+    it 'returns http not found when account cannot be found' do
+      get :show, params: { resource: 'acct:not@existing.com' }, format: :json
+
+      expect(response).to have_http_status(:not_found)
+    end
+  end
+end
diff --git a/spec/controllers/xrd_controller_spec.rb b/spec/controllers/xrd_controller_spec.rb
deleted file mode 100644
index 33b17f152..000000000
--- a/spec/controllers/xrd_controller_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe XrdController, type: :controller do
-  render_views
-
-  describe 'GET #host_meta' do
-    it 'returns http success' do
-      get :host_meta
-      expect(response).to have_http_status(:success)
-    end
-  end
-
-  describe 'GET #webfinger' do
-    let(:alice) { Fabricate(:account, username: 'alice') }
-
-    it 'returns http success when account can be found' do
-      get :webfinger, params: { resource: alice.to_webfinger_s }, format: :json
-      expect(response).to have_http_status(:success)
-    end
-
-    it 'returns http not found when account cannot be found' do
-      get :webfinger, params: { resource: 'acct:not@existing.com' }, format: :json
-      expect(response).to have_http_status(:not_found)
-    end
-  end
-end
diff --git a/spec/requests/host_meta_request_spec.rb b/spec/requests/host_meta_request_spec.rb
new file mode 100644
index 000000000..0c51b5f48
--- /dev/null
+++ b/spec/requests/host_meta_request_spec.rb
@@ -0,0 +1,12 @@
+require "rails_helper"
+
+describe "The host_meta route" do
+  describe "requested without accepts headers" do
+    it "returns an xml response" do
+      get host_meta_url
+
+      expect(response).to have_http_status(:success)
+      expect(response.content_type).to eq "application/xrd+xml"
+    end
+  end
+end
diff --git a/spec/routing/well_known_routes_spec.rb b/spec/routing/well_known_routes_spec.rb
new file mode 100644
index 000000000..9540c3de3
--- /dev/null
+++ b/spec/routing/well_known_routes_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+describe 'the host-meta route' do
+  it 'routes to correct place with xml format' do
+    expect(get('/.well-known/host-meta')).
+      to route_to('well_known/host_meta#show', format: 'xml')
+  end
+end
+
+describe 'the webfinger route' do
+  it 'routes to correct place with json format' do
+    expect(get('/.well-known/webfinger')).
+      to route_to('well_known/webfinger#show', format: 'json')
+  end
+end
-- 
cgit