From 0618f09939b7afc607bcd983139b91e056debe4d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Wed, 26 Apr 2017 18:19:53 -0400
Subject: Add spec coverage and refactor authorize_follows controller (#2505)

---
 app/views/authorize_follow/_card.html.haml  | 12 ------------
 app/views/authorize_follow/error.html.haml  |  3 ---
 app/views/authorize_follow/new.html.haml    | 12 ------------
 app/views/authorize_follows/_card.html.haml | 12 ++++++++++++
 app/views/authorize_follows/error.html.haml |  3 +++
 app/views/authorize_follows/show.html.haml  | 12 ++++++++++++
 6 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 app/views/authorize_follow/_card.html.haml
 delete mode 100644 app/views/authorize_follow/error.html.haml
 delete mode 100644 app/views/authorize_follow/new.html.haml
 create mode 100644 app/views/authorize_follows/_card.html.haml
 create mode 100644 app/views/authorize_follows/error.html.haml
 create mode 100644 app/views/authorize_follows/show.html.haml

(limited to 'app/views')

diff --git a/app/views/authorize_follow/_card.html.haml b/app/views/authorize_follow/_card.html.haml
deleted file mode 100644
index ee76f628d..000000000
--- a/app/views/authorize_follow/_card.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-.account-card
-  .detailed-status__display-name
-    %div
-      = image_tag account.avatar.url(:original), alt: '', width: 48, height: 48, class: 'avatar'
-
-    %span.display-name
-      = link_to TagManager.instance.url_for(account), class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do
-        %strong.emojify= display_name(account)
-        %span= "@#{account.acct}"
-
-  - if account.note?
-    .account__header__content.emojify= Formatter.instance.simplified_format(account)
diff --git a/app/views/authorize_follow/error.html.haml b/app/views/authorize_follow/error.html.haml
deleted file mode 100644
index 88d33b68d..000000000
--- a/app/views/authorize_follow/error.html.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-.form-container
-  .flash-message#error_explanation
-    = t('authorize_follow.error')
diff --git a/app/views/authorize_follow/new.html.haml b/app/views/authorize_follow/new.html.haml
deleted file mode 100644
index 3b60df058..000000000
--- a/app/views/authorize_follow/new.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-- content_for :page_title do
-  = t('authorize_follow.title', acct: @account.acct)
-
-.form-container
-  .follow-prompt
-    %h2= t('authorize_follow.prompt_html', self: current_account.username)
-
-    = render 'card', account: @account
-
-  = form_tag authorize_follow_path, method: :post, class: 'simple_form' do
-    = hidden_field_tag :acct, @account.acct
-    = button_tag t('authorize_follow.follow'), type: :submit
diff --git a/app/views/authorize_follows/_card.html.haml b/app/views/authorize_follows/_card.html.haml
new file mode 100644
index 000000000..ee76f628d
--- /dev/null
+++ b/app/views/authorize_follows/_card.html.haml
@@ -0,0 +1,12 @@
+.account-card
+  .detailed-status__display-name
+    %div
+      = image_tag account.avatar.url(:original), alt: '', width: 48, height: 48, class: 'avatar'
+
+    %span.display-name
+      = link_to TagManager.instance.url_for(account), class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do
+        %strong.emojify= display_name(account)
+        %span= "@#{account.acct}"
+
+  - if account.note?
+    .account__header__content.emojify= Formatter.instance.simplified_format(account)
diff --git a/app/views/authorize_follows/error.html.haml b/app/views/authorize_follows/error.html.haml
new file mode 100644
index 000000000..88d33b68d
--- /dev/null
+++ b/app/views/authorize_follows/error.html.haml
@@ -0,0 +1,3 @@
+.form-container
+  .flash-message#error_explanation
+    = t('authorize_follow.error')
diff --git a/app/views/authorize_follows/show.html.haml b/app/views/authorize_follows/show.html.haml
new file mode 100644
index 000000000..3b60df058
--- /dev/null
+++ b/app/views/authorize_follows/show.html.haml
@@ -0,0 +1,12 @@
+- content_for :page_title do
+  = t('authorize_follow.title', acct: @account.acct)
+
+.form-container
+  .follow-prompt
+    %h2= t('authorize_follow.prompt_html', self: current_account.username)
+
+    = render 'card', account: @account
+
+  = form_tag authorize_follow_path, method: :post, class: 'simple_form' do
+    = hidden_field_tag :acct, @account.acct
+    = button_tag t('authorize_follow.follow'), type: :submit
-- 
cgit