diff --git a/app/views/theme1/_navigation.html.slim b/app/views/theme1/_navigation.html.slim index 61ddd006..d46ed853 100644 --- a/app/views/theme1/_navigation.html.slim +++ b/app/views/theme1/_navigation.html.slim @@ -2,5 +2,5 @@ ul.nav li[class=(current_page?(controller: '/pages', action: 'home') ? :active : nil)]= link_to find_page('home').try(:menu_text), locale_root_path li[class=(current_page?(controller: '/pages', action: 'show', name: 'about') ? :active : nil)]= link_to find_page('about').try(:menu_text), page_path('about') - - Page.top_menu.each do |page| + - Page.menu_roots.each do |page| li[class=(current_page?(controller: '/pages', action: 'show', name: page.name) ? :active : nil)]= link_to page.menu_text, page_path(page.name) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6d841b05..8af8b08b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,7 +1,7 @@ # This file is copied to spec/ when you run 'rails generate rspec:install' -ENV["RAILS_ENV"] ||= 'test' require 'simplecov' SimpleCov.start 'rails' +ENV["RAILS_ENV"] ||= 'test' require File.expand_path("../config/environment", File.dirname(__FILE__)) require 'rspec/rails' require 'rspec/matchers'