Merge pull request #4465 from nebulab/waiting-for-dev/fix_solidus_aut…

…h_devise_gemfile_order Fix expectations about solidus_auth_devise order in the Gemfile
solidusio · Aug 4, 2022 · 2289410 · 2289410
2 parents 3962059 + 32492e0
commit 2289410
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/backend/app/views/spree/admin/shared/_navigation.html.erb b/backend/app/views/spree/admin/shared/_navigation.html.erb
@@ -7,7 +7,11 @@
         <span class="text"><%= t('spree.minimize_menu') %></span>
       <% end %>
       <%= render partial: 'spree/admin/shared/locale_selection' %>
-      <%= render partial: 'spree/admin/shared/navigation_footer' %>
+      <% if lookup_context.exists?('spree/admin/shared/_navigation_footer') %>
+        <%= render partial: 'spree/admin/shared/navigation_footer' %>
+      <% else %>
+        <%= render partial: 'spree/admin/shared/navigation_footer_fallback' %>
+      <% end %>
     </div>
   </div>
 </div>
diff --git a/.../admin/shared/_navigation_footer.html.erb → ...ared/_navigation_footer_fallback.html.erb b/.../admin/shared/_navigation_footer.html.erb → ...ared/_navigation_footer_fallback.html.erb
diff --git a/...ee/admin/shared/navigation_footer_spec.rb → ...shared/navigation_footer_fallback_spec.rb b/...ee/admin/shared/navigation_footer_spec.rb → ...shared/navigation_footer_fallback_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "spree/admin/shared/_navigation_footer", type: :view, partial_double_verification: false do
+describe "spree/admin/shared/_navigation_footer_fallback", type: :view, partial_double_verification: false do
   let(:user) { FactoryBot.build_stubbed(:admin_user) }
   let(:ability) { Object.new.extend(CanCan::Ability) }
   before do

diff --git a/frontend/app/views/spree/shared/_login_bar_items.html.erb b/frontend/app/views/spree/shared/_login_bar_items.html.erb
diff --git a/frontend/app/views/spree/shared/_nav_bar.html.erb b/frontend/app/views/spree/shared/_nav_bar.html.erb
@@ -1,7 +1,8 @@
 <nav id="top-nav-bar" class="columns ten">
   <ul id="nav-bar" class="inline" data-hook>
     <%= render 'spree/shared/locale_selector' %>
-    <%= render 'spree/shared/login_bar_items' %>
+    <%# solidus_auth_devise or a custom auth system can replace this partial %>
+    <%= render 'spree/shared/login_bar_items' if lookup_context.exists?('spree/shared/_login_bar_items') %>
     <li id="search-bar" data-hook>
       <%= render partial: 'spree/shared/search' %>
     </li>