From 781fe6603120592172b91b5d59bd9094dbd8b81d Mon Sep 17 00:00:00 2001
From: Chris Stadler <chrisstadler@gmail.com>
Date: Sat, 19 Nov 2016 15:27:50 -0500
Subject: [PATCH] Combine 'My Home' and 'Address' in user show

---
 app/views/users/show.html.erb | 10 ++--------
 spec/views/users/show_spec.rb | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 spec/views/users/show_spec.rb

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 63521b0..b920071 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -23,19 +23,13 @@
 <p>
   <strong>My Home: </strong>
   <% if @user.unit.present? %>
-    <%= link_to @user.unit.unit_number, unit_path(@user.unit) %>
+    <%= link_to "#{@user.unit.user_building.try(:address)}, Unit ##{@user.unit.unit_number}",
+      unit_path(@user.unit) %>
   <% else %>
     <%= link_to 'Update Information', new_unit_path %>
   <% end %>
 </p>
 
-<p>
-  <strong>Street address:</strong>
-  <% if @user.unit.present? && @user.unit.user_building.present? %>
-    <%= link_to @user.unit.user_building.try(:address), user_building_path(@user.unit.user_building) %>
-  <% end %>
-</p>
-
 <p>
   <strong>Phone:</strong> <%= @user.phone_string %>
 </p>
diff --git a/spec/views/users/show_spec.rb b/spec/views/users/show_spec.rb
new file mode 100644
index 0000000..1c8d0c7
--- /dev/null
+++ b/spec/views/users/show_spec.rb
@@ -0,0 +1,17 @@
+require 'rails_helper'
+
+describe 'users/show.html.erb' do
+  let(:building) { build_stubbed :user_building, address: '123 Test St.' }
+  let(:unit) { build_stubbed :unit, unit_number: 47, user_building: building }
+  let(:user) { build_stubbed :user, unit: unit }
+
+  before do
+    assign(:user, user)
+    render
+  end
+
+  it 'displays the address of the user\'s home' do
+    expect(rendered).
+      to have_link("#{building.address}, Unit ##{unit.unit_number}", unit_path(unit))
+  end
+end