From a7a8fd4acbaac471b85d49a27ef54a7f09ff37a6 Mon Sep 17 00:00:00 2001
From: RachelWyatt <rwyatt@taphere.com>
Date: Tue, 20 Oct 2020 09:12:20 -0400
Subject: [PATCH 1/4] add check for nil organization logo

---
 app/views/layouts/_sidebar.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb
index 0778f89532..c1075044b4 100644
--- a/app/views/layouts/_sidebar.html.erb
+++ b/app/views/layouts/_sidebar.html.erb
@@ -1,6 +1,6 @@
 <div id="sidebar-js" class="sidebar-wrapper">
   <div class="sidebar-heading">
-    <% if all_casa_admin_signed_in? %>
+    <% if all_casa_admin_signed_in? || !current_organization.logo_url %>
       <%= image_pack_tag("media/src/images/default-logo.png",
           alt: "CASA Logo",
           class: "d-inline-block align-text-bottom") %>

From ceb453e8e48c1842d48ab6f5ad92a41aa008a752 Mon Sep 17 00:00:00 2001
From: RachelWyatt <rwyatt@taphere.com>
Date: Tue, 20 Oct 2020 09:26:35 -0400
Subject: [PATCH 2/4] add test for default logo in
 admin_views_volunteers_page_spec.rb

---
 spec/system/admin_views_volunteers_page_spec.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/system/admin_views_volunteers_page_spec.rb b/spec/system/admin_views_volunteers_page_spec.rb
index 412384da69..0a298df98b 100644
--- a/spec/system/admin_views_volunteers_page_spec.rb
+++ b/spec/system/admin_views_volunteers_page_spec.rb
@@ -26,6 +26,14 @@
       expect(page).to have_text("Miles Driven")
       expect(page).to have_text("Want reimbursement?")
     end
+
+    it "displays default logo" do
+      sign_in admin
+
+      visit volunteers_path
+
+      expect(page).to have_xpath("//img[@src = '/packs-test/media/src/images/default-logo-c9048fc43854499e952e4b62a505bf35.png' and @alt='CASA Logo']")
+    end
   end
 
   it "can show/hide columns on volunteers table" do

From 6d51f5ea41b8477c824113cd0ec604b3bdfe18a4 Mon Sep 17 00:00:00 2001
From: RachelWyatt <rwyatt@taphere.com>
Date: Tue, 20 Oct 2020 09:31:17 -0400
Subject: [PATCH 3/4] add test to sidebar.html.erb_spec.rb for default logo

---
 spec/views/layouts/sidebar.html.erb_spec.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spec/views/layouts/sidebar.html.erb_spec.rb b/spec/views/layouts/sidebar.html.erb_spec.rb
index 45ff627989..37b42c4f03 100644
--- a/spec/views/layouts/sidebar.html.erb_spec.rb
+++ b/spec/views/layouts/sidebar.html.erb_spec.rb
@@ -11,6 +11,18 @@
     assign :casa_org, user.casa_org
   end
 
+  context "when no organization logo is set" do
+    let(:user) { build_stubbed :volunteer }
+
+    it "displays default logo" do 
+      sign_in user
+
+      render partial: "layouts/sidebar"
+
+      expect(rendered).to have_xpath("//img[@src = '/packs-test/media/src/images/default-logo-c9048fc43854499e952e4b62a505bf35.png' and @alt='CASA Logo']")
+    end
+  end
+
   context "when logged in as a supervisor" do
     let(:user) { build_stubbed :supervisor }
 

From 7702260fe226b7446788a97bfd01d3da57119cfa Mon Sep 17 00:00:00 2001
From: RachelWyatt <rwyatt@taphere.com>
Date: Tue, 20 Oct 2020 09:33:16 -0400
Subject: [PATCH 4/4] fix linter findings

---
 spec/views/layouts/sidebar.html.erb_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/views/layouts/sidebar.html.erb_spec.rb b/spec/views/layouts/sidebar.html.erb_spec.rb
index 37b42c4f03..fe09a3a138 100644
--- a/spec/views/layouts/sidebar.html.erb_spec.rb
+++ b/spec/views/layouts/sidebar.html.erb_spec.rb
@@ -14,7 +14,7 @@
   context "when no organization logo is set" do
     let(:user) { build_stubbed :volunteer }
 
-    it "displays default logo" do 
+    it "displays default logo" do
       sign_in user
 
       render partial: "layouts/sidebar"