Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix expectations about solidus_auth_devise order in the Gemfile #4465

Merged
merged 2 commits into from
Aug 4, 2022
Merged

Fix expectations about solidus_auth_devise order in the Gemfile #4465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb54eae
Fix Gemfile order dependency solidus_frontend <> solidus_auth_devise
waiting-for-dev Jul 21, 2022
32492e0
Fix Gemfile order dependency solidus_backend <> solidus_auth_devise
waiting-for-dev Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion backend/app/views/spree/admin/shared/_navigation.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
0 .../admin/shared/_navigation_footer.html.erb → ...ared/_navigation_footer_fallback.html.erb
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ee/admin/shared/navigation_footer_spec.rb → ...shared/navigation_footer_fallback_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion frontend/app/views/spree/shared/_login_bar_items.html.erb
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion frontend/app/views/spree/shared/_nav_bar.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down