Move base views into the shared directory

projectblacklight · Nov 3, 2016 · ed64b78 · ed64b78
1 parent 93d9d9f
commit ed64b78
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/app/views/layouts/blacklight/base.html.erb b/app/views/layouts/blacklight/base.html.erb
@@ -30,7 +30,7 @@
   <div id="main-container" class="<%= container_classes %>">
     <%= content_for(:container_header) %>
 
-    <%= render partial: '/flash_msg', layout: 'shared/flash_messages' %>
+    <%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>
 
     <div class="row">
       <%= content_for?(:content) ? yield(:content) : yield %>

diff --git a/app/views/_flash_msg.html.erb → app/views/shared/_flash_msg.html.erb b/app/views/_flash_msg.html.erb → app/views/shared/_flash_msg.html.erb
diff --git a/app/views/shared/_header_navbar.html.erb b/app/views/shared/_header_navbar.html.erb
@@ -5,7 +5,7 @@
     <%= link_to application_name, root_path, class: "navbar-brand" %>
 
     <div class="collapse navbar-toggleable-xs float-md-right" id="user-util-collapse">
-      <%= render partial: '/user_util_links' %>
+      <%= render 'shared/user_util_links' %>
     </div>
   </div>
 </nav>

diff --git a/app/views/_user_util_links.html.erb → app/views/shared/_user_util_links.html.erb b/app/views/_user_util_links.html.erb → app/views/shared/_user_util_links.html.erb
diff --git a/spec/views/_user_util_links.html.erb_spec.rb → .../shared/_user_util_links.html.erb_spec.rb b/spec/views/_user_util_links.html.erb_spec.rb → .../shared/_user_util_links.html.erb_spec.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-describe "_user_util_links" do
+RSpec.describe "shared/_user_util_links" do
 
-  let :blacklight_config do
+  let(:blacklight_config) do
     Blacklight::Configuration.new.configure do |config|
       config.navbar.partials = { bookmark: Blacklight::Configuration::ToolConfig.new(partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?) }
     end
@@ -15,7 +15,7 @@
     allow(controller).to receive(:render_bookmarks_control?).and_return true
     allow(view).to receive(:has_user_authentication_provider?).and_return false
     allow(view).to receive_message_chain(:current_or_guest_user, :bookmarks, :count).and_return(count)
-    render :partial => "user_util_links"
+    render "shared/user_util_links"
     expect(rendered).to have_selector('#bookmarks_nav span.tag[data-role=bookmark-counter]', text: "#{count}")
   end