tb_cms 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c7c821abf433b7551fd0945474f55285c337bc4
-  data.tar.gz: 945f3a55ef2288ca26ef6fa3090573c153d5d6ea
+  metadata.gz: cf2fe4b361b6f73b675c9c263b53be34c0a80c60
+  data.tar.gz: 2b8ced4d2cfdd18bd7578f2dadc284dcf89cb9e7
 SHA512:
-  metadata.gz: 5da1e47e8ad75547832558aa1b4ece99367437ef577189daf24c0f569189a256a7f67320ff61e13bfab42774edd24279c489447294e95cc09ef3bdbc124111b4
-  data.tar.gz: fd87881e33441d399c6ab0ae5e435e3f8d383119844e628fc3734f50e5d9f904c79d77f78d410123c16e12653478f76803d4cb992e942154ed8ff8abce72551c
+  metadata.gz: fb80687cde5988b4b9151c31e711c4487807d6d794a398da68bb6f606957194cbd8f5e58c8c51d3a0654ade1b0efa43386c0b8ffe9fb8a937018b603e64e9817
+  data.tar.gz: 0a11371e6df82a12cd4d0652d4a6ab6db7580cd58d8e95b9568573327dc5b8c5fb88637bdc2331a9cd9b9ffda839028476f69cad20adb7e55b22b0d1b8b81d47

data/app/controllers/pages_controller.rb

@@ -34,11 +34,11 @@ class PagesController < ApplicationController
   private
 
   def render_404
-    raise Spud::NotFoundError, item: 'page'
-   end
+    raise TbCore::NotFoundError, item: 'page'
+  end
 
   def set_default_content_type
     request.format = :html if params[:format].blank?
-   end
+  end
 
 end

data/app/models/spud_page.rb

@@ -2,7 +2,6 @@ class SpudPage < ActiveRecord::Base
   include CmsDeprecatedMultisite
   include TbRedirects::HasRedirects
 
-  spud_searchable
   belongs_to :spud_page,
     required: false
   has_many :spud_page_partial_revisions

data/lib/spud_cms/engine.rb

@@ -11,7 +11,7 @@ module Spud
       end
 
       initializer :admin do
-        Spud::Core.configure do |config|
+        TbCore.configure do |config|
           config.admin_applications += [{ name: 'Pages', thumbnail: 'admin/pages_thumb.png', url: '/admin/pages', order: 0 }]
           if Spud::Cms.menus_enabled
             config.admin_applications += [{ name: 'Menus', thumbnail: 'admin/menus_thumb.png', url: '/admin/menus', order: 2 }]
@@ -23,19 +23,13 @@ module Spud
         end
       end
 
-      initializer :model_overrides_cms do |_config|
-        ActiveRecord::Base.class_eval do
-          include Spud::Searchable
-        end
-      end
-
       initializer :spud_cms_routes do |config|
         config.routes_reloader.paths << File.expand_path('../page_route.rb', __FILE__)
       end
 
       initializer 'tb_cms.assets' do |_config|
-        Spud::Core.append_admin_javascripts('admin/cms/application')
-        Spud::Core.append_admin_stylesheets('admin/cms/application')
+        TbCore.append_admin_javascripts('admin/cms/application')
+        TbCore.append_admin_stylesheets('admin/cms/application')
         Rails.application.config.assets.precompile += ['admin/pages_thumb.png', 'admin/snippets_thumb.png', 'admin/menus_thumb.png']
       end
 

data/lib/spud_cms/template_parser.rb

@@ -44,7 +44,7 @@ module Spud
             process_directive(header_line, layout)
           end
           layout[:partials] = ['Body'] if layout[:partials].blank?
-          layout[:sites] = [Spud::Core.config.short_name.downcase] if layout[:sites].blank?
+          layout[:sites] = [TbCore.config.short_name.downcase] if layout[:sites].blank?
           if layout[:template_name].blank? == false
             return layout
           else
@@ -58,7 +58,7 @@ module Spud
         default_layout_path = layout_path(Rails.application.root.join('app', 'views', 'layouts', Spud::Cms.default_page_layout))
         # puts(layouts)
         if layouts[default_layout_path].blank?
-          layouts[default_layout_path] = { template_name: 'Default', partials: ['Body'], sites: [Spud::Core.short_name.downcase], default: true }
+          layouts[default_layout_path] = { template_name: 'Default', partials: ['Body'], sites: [TbCore.short_name.downcase], default: true }
         else
           layouts[default_layout_path][:default] = true
         end

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Cms
-    VERSION = '1.3.2'.freeze
+    VERSION = '1.3.3'.freeze
   end
 end

data/spec/controllers/admin/menu_items_controller_spec.rb

@@ -6,12 +6,12 @@ describe Admin::MenuItemsController, type: :controller do
   end
 
   let (:menu) do
-    FactoryGirl.create(:spud_menu)
+    FactoryBot.create(:spud_menu)
   end
 
   describe 'index' do
     it 'should return an array of menus' do
-      2.times { |_x| s = FactoryGirl.create(:spud_menu_item, spud_menu_id: menu.id, parent_id: menu.id) }
+      2.times { |_x| s = FactoryBot.create(:spud_menu_item, spud_menu_id: menu.id, parent_id: menu.id) }
       get :index, params: { menu_id: menu.id }
 
       expect(assigns(:menu_items).count).to be > 1
@@ -33,43 +33,43 @@ describe Admin::MenuItemsController, type: :controller do
   describe 'create' do
     it 'should create a new menu item with a valid form submission' do
       expect do
-        post :create, params: { menu_id: menu.id, spud_menu_item: FactoryGirl.attributes_for(:spud_menu_item, parent_id: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
+        post :create, params: { menu_id: menu.id, spud_menu_item: FactoryBot.attributes_for(:spud_menu_item, parent_id: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
       end.to change(SpudMenuItem, :count).by(1)
       expect(response).to be_redirect
     end
 
     it 'should not create a menu item with an invalid form entry' do
-      yamldata = FactoryGirl.attributes_for(:spud_menu_item, name: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id }
+      yamldata = FactoryBot.attributes_for(:spud_menu_item, name: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id }
 
       expect do
-        post :create, params: { menu_id: menu.id, spud_menu_item: FactoryGirl.attributes_for(:spud_menu_item, name: nil, parent_id: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
+        post :create, params: { menu_id: menu.id, spud_menu_item: FactoryBot.attributes_for(:spud_menu_item, name: nil, parent_id: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
       end.to_not change(SpudMenuItem, :count)
     end
 
     it 'should autoset order if not specified' do
-      menuitem = FactoryGirl.create(:spud_menu_item, parent_id: menu.id)
+      menuitem = FactoryBot.create(:spud_menu_item, parent_id: menu.id)
 
-      post :create, params: { menu_id: menu.id, spud_menu_item: FactoryGirl.attributes_for(:spud_menu_item, menu_order: nil, parent_id: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
+      post :create, params: { menu_id: menu.id, spud_menu_item: FactoryBot.attributes_for(:spud_menu_item, menu_order: nil, parent_id: nil).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
       expect(assigns(:menu_item).menu_order).to eq(1)
     end
 
     it 'should assign the menu name based on page name if left blank' do
-      page = FactoryGirl.create(:spud_page)
-      post :create, params: { menu_id: menu.id, spud_menu_item: FactoryGirl.attributes_for(:spud_menu_item, name: nil, spud_page_id: page.id).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
+      page = FactoryBot.create(:spud_page)
+      post :create, params: { menu_id: menu.id, spud_menu_item: FactoryBot.attributes_for(:spud_menu_item, name: nil, spud_page_id: page.id).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
       expect(assigns(:menu_item).name).to eq(page.name)
     end
 
     it 'should set the parent to a submenu if specified' do
-      menuitem = FactoryGirl.create(:spud_menu_item, parent_id: menu.id)
-      post :create, params: { menu_id: menu.id, spud_menu_item: FactoryGirl.attributes_for(:spud_menu_item, parent_id: menuitem.id).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
+      menuitem = FactoryBot.create(:spud_menu_item, parent_id: menu.id)
+      post :create, params: { menu_id: menu.id, spud_menu_item: FactoryBot.attributes_for(:spud_menu_item, parent_id: menuitem.id).reject { |k, _v| k == 'id' || k == :spud_menu_id } }
       expect(assigns(:menu_item).parent).to eq(menuitem)
     end
   end
 
   describe 'edit' do
     it 'should respond with menu item by id' do
-      menu1 = FactoryGirl.create(:spud_menu_item)
-      menu2 = FactoryGirl.create(:spud_menu_item)
+      menu1 = FactoryBot.create(:spud_menu_item)
+      menu2 = FactoryBot.create(:spud_menu_item)
       get :edit, params: { menu_id: menu.id, id: menu2.id }
       expect(assigns(:menu_item)).to eq(menu2)
     end
@@ -82,7 +82,7 @@ describe Admin::MenuItemsController, type: :controller do
 
   describe 'update' do
     it 'should update the name when the name attribute is changed' do
-      menu_item = FactoryGirl.create(:spud_menu_item)
+      menu_item = FactoryBot.create(:spud_menu_item)
       new_name = 'MyMenu'
       expect do
         put :update, params: { menu_id: menu.id, id: menu_item.id, spud_menu_item: menu_item.attributes.merge!(name: new_name, parent_id: nil).reject { |k, _v| k.to_sym == :spud_menu_id || k == 'id' || k.to_sym == :updated_at || k.to_sym == :created_at } }
@@ -90,8 +90,8 @@ describe Admin::MenuItemsController, type: :controller do
       end.to change(menu_item, :name).to(new_name)
     end
     it 'should assign a menu to a submenu if parentid is defined' do
-      menu_item1 = FactoryGirl.create(:spud_menu_item)
-      menu_item = FactoryGirl.create(:spud_menu_item)
+      menu_item1 = FactoryBot.create(:spud_menu_item)
+      menu_item = FactoryBot.create(:spud_menu_item)
 
       expect do
         put :update, params: { menu_id: menu.id, id: menu_item.id, spud_menu_item: menu_item.attributes.merge!(parent_id: menu_item1.id).reject { |k, _v| k.to_sym == :spud_menu_id || k == 'id' || k.to_sym == :updated_at || k.to_sym == :created_at } }
@@ -102,7 +102,7 @@ describe Admin::MenuItemsController, type: :controller do
 
   describe 'destroy' do
     it 'should destroy the menu item' do
-      menu_item = FactoryGirl.create(:spud_menu_item, parent_id: menu.id)
+      menu_item = FactoryBot.create(:spud_menu_item, parent_id: menu.id)
       expect do
         delete :destroy, params: { menu_id: menu.id, id: menu_item.id }
       end.to change(SpudMenuItem, :count).by(-1)
@@ -113,7 +113,7 @@ describe Admin::MenuItemsController, type: :controller do
     it 'should update all menu items menu_order fields' do
       ordered_arr = Array.new(5)
       ordered_arr.each_with_index do |item, index|
-        item = FactoryGirl.create(:spud_menu_item, parent_id: menu.id, menu_order: index)
+        item = FactoryBot.create(:spud_menu_item, parent_id: menu.id, menu_order: index)
         ordered_arr[index] = item.id.to_s
       end
       new_order_arr = ordered_arr.shuffle

data/spec/controllers/admin/menus_controller_spec.rb

@@ -7,7 +7,7 @@ describe Admin::MenusController, type: :controller do
 
   describe 'index' do
     it 'should return an array of menus' do
-      2.times { FactoryGirl.create(:spud_menu) }
+      2.times { FactoryBot.create(:spud_menu) }
       get :index
 
       expect(assigns(:menus).count).to be > 1
@@ -26,14 +26,14 @@ describe Admin::MenusController, type: :controller do
   describe 'create' do
     it 'should create a new menu with a valid form submission' do
       expect do
-        post :create, params: { spud_menu: FactoryGirl.attributes_for(:spud_menu).reject { |k, _v| k == 'id' } }
+        post :create, params: { spud_menu: FactoryBot.attributes_for(:spud_menu).reject { |k, _v| k == 'id' } }
       end.to change(SpudMenu, :count).by(1)
       expect(response).to be_redirect
     end
 
     it 'should not create a menu with an invalid form entry' do
       expect do
-        post :create, params: { spud_menu: FactoryGirl.attributes_for(:spud_menu, name: nil).reject { |k, _v| k == 'id' } }
+        post :create, params: { spud_menu: FactoryBot.attributes_for(:spud_menu, name: nil).reject { |k, _v| k == 'id' } }
       end.to_not change(SpudMenu, :count)
 
     end
@@ -41,8 +41,8 @@ describe Admin::MenusController, type: :controller do
 
   describe 'edit' do
     it 'should response with menu by id' do
-      menu1 = FactoryGirl.create(:spud_menu)
-      menu2 = FactoryGirl.create(:spud_menu)
+      menu1 = FactoryBot.create(:spud_menu)
+      menu2 = FactoryBot.create(:spud_menu)
       get :edit, params: { id: menu2.id }
       expect(assigns(:menu)).to eq(menu2)
     end
@@ -55,7 +55,7 @@ describe Admin::MenusController, type: :controller do
 
   describe 'update' do
     it 'should update the name when the name attribute is changed' do
-      menu = FactoryGirl.create(:spud_menu)
+      menu = FactoryBot.create(:spud_menu)
       new_name = 'MyMenu'
       expect do
         put :update, params: { id: menu.id, spud_menu: menu.attributes.merge!(name: new_name).reject { |k, _v| k == 'id' } }
@@ -65,7 +65,7 @@ describe Admin::MenusController, type: :controller do
     end
 
     it 'should redirect to the admin menus after a successful update' do
-      menu = FactoryGirl.create(:spud_menu)
+      menu = FactoryBot.create(:spud_menu)
       put :update, params: { id: menu.id, spud_menu: menu.attributes.merge!(name: 'MyMenu').reject { |k, _v| k == 'id' } }
 
       expect(response).to redirect_to(admin_menu_menu_items_url(menu_id: menu.id))
@@ -74,7 +74,7 @@ describe Admin::MenusController, type: :controller do
 
   describe 'destroy' do
     it 'should destroy the menu' do
-      menu = FactoryGirl.create(:spud_menu)
+      menu = FactoryBot.create(:spud_menu)
       expect do
         delete :destroy, params: { id: menu.id }
       end.to change(SpudMenu, :count).by(-1)
@@ -82,7 +82,7 @@ describe Admin::MenusController, type: :controller do
     end
 
     it 'should not destroy the menu with a wrong id' do
-      menu = FactoryGirl.create(:spud_menu)
+      menu = FactoryBot.create(:spud_menu)
       expect do
         delete :destroy, params: { id: '23532' }
       end.to_not change(SpudMenu, :count)

data/spec/controllers/admin/pages_controller_spec.rb

@@ -7,15 +7,15 @@ describe Admin::PagesController, type: :controller do
 
   describe 'index' do
     it 'should return an array of parent pages' do
-      2.times { |_x| s = FactoryGirl.create(:spud_page) }
+      2.times { |_x| s = FactoryBot.create(:spud_page) }
       get :index
 
       expect(assigns(:pages).count).to be > 1
     end
 
     it 'should only return parent pages' do
-      2.times { |_x| FactoryGirl.create(:spud_page) }
-      FactoryGirl.create(:spud_page, spud_page_id: 1)
+      2.times { |_x| FactoryBot.create(:spud_page) }
+      FactoryBot.create(:spud_page, spud_page_id: 1)
 
       get :index
       expect(assigns(:pages).count).to eq(2)
@@ -24,7 +24,7 @@ describe Admin::PagesController, type: :controller do
 
   describe 'show' do
     it 'should respond successfully' do
-      p = FactoryGirl.create(:spud_page)
+      p = FactoryBot.create(:spud_page)
       get :show, params: { id: p.id }
       expect(assigns(:layout)).to render_template(layout: "layouts/#{Spud::Cms.default_page_layout}")
       expect(response).to be_success
@@ -48,7 +48,7 @@ describe Admin::PagesController, type: :controller do
   describe 'edit' do
     context 'HTML format' do
       it 'should load the correct page for the edit form' do
-        page = FactoryGirl.create(:spud_page)
+        page = FactoryBot.create(:spud_page)
         get :edit, params: { id: page.id }
 
         expect(assigns(:page).id).to eq(page.id)
@@ -59,7 +59,7 @@ describe Admin::PagesController, type: :controller do
 
   describe 'update' do
     it 'should update the name when the attribute is changed' do
-      page = FactoryGirl.create(:spud_page)
+      page = FactoryBot.create(:spud_page)
       new_name = 'Adam'
       expect do
         put :update, params: { id: page.id, spud_page: { name: new_name } }
@@ -68,7 +68,7 @@ describe Admin::PagesController, type: :controller do
     end
 
     it 'should redirect to the page root index after a successful update' do
-      page = FactoryGirl.create(:spud_page)
+      page = FactoryBot.create(:spud_page)
       new_name = 'Adam'
       put :update, params: { id: page.id, spud_page: page.attributes.merge!(name: new_name).reject { |key, _value| key == 'id' || key == 'created_at' || key == 'updated_at' } }
 
@@ -78,7 +78,7 @@ describe Admin::PagesController, type: :controller do
 
   describe 'destroy' do
     it 'should destroy the page' do
-      page = FactoryGirl.create(:spud_page)
+      page = FactoryBot.create(:spud_page)
       expect do
         delete :destroy, params: { id: page.id }
       end.to change(SpudPage, :count).by(-1)
@@ -86,7 +86,7 @@ describe Admin::PagesController, type: :controller do
     end
 
     it 'should destroy the user with the wrong id' do
-      page = FactoryGirl.create(:spud_page)
+      page = FactoryBot.create(:spud_page)
       expect do
         delete :destroy, params: { id: '23532' }
       end.to_not change(SpudPage, :count)

data/spec/controllers/pages_controller_spec.rb

@@ -4,21 +4,21 @@ describe PagesController, type: :controller do
   describe 'show' do
 
     it 'should render a page' do
-      page = FactoryGirl.create(:spud_page)
+      page = FactoryBot.create(:spud_page)
       get :show, params: { id: page.url_name }
       expect(assigns(:layout)).to render_template(layout: "layouts/#{Spud::Cms.default_page_layout}")
       expect(response).to be_success
     end
 
     it 'should render home page if id is blank' do
-      page = FactoryGirl.create(:spud_page, name: 'home')
+      page = FactoryBot.create(:spud_page, name: 'home')
       get :show
       expect(assigns(:page)).to eq(page)
       expect(response).to be_success
     end
 
     it 'should redirect to new page url from old page url if it was changed' do
-      page = FactoryGirl.create(:spud_page, name: 'about', url_name: 'about')
+      page = FactoryBot.create(:spud_page, name: 'about', url_name: 'about')
       page.update(url_name: 'about-us')
       page.save
       get :show, params: { id: 'about' }
@@ -27,7 +27,7 @@ describe PagesController, type: :controller do
     end
 
     it 'should not allow access to private pages when logged out' do
-      page = FactoryGirl.create(:spud_page, name: 'about', visibility: 1)
+      page = FactoryBot.create(:spud_page, name: 'about', visibility: 1)
 
       get :show, params: { id: 'about' }
       expect(response).to redirect_to login_path(return_to: '/about')
@@ -43,7 +43,7 @@ describe PagesController, type: :controller do
       end
 
       it 'should allow access to private pages when logged in' do
-        page = FactoryGirl.create(:spud_page, name: 'about', visibility: 1)
+        page = FactoryBot.create(:spud_page, name: 'about', visibility: 1)
 
         get :show, params: { id: 'about' }
         expect(response).to be_success

data/spec/dummy/config/application.rb

@@ -8,7 +8,7 @@ require 'tb_cms'
 module Dummy
   class Application < Rails::Application
 
-    Spud::Core.configure do |config|
+    TbCore.configure do |config|
       config.site_name = 'Test Site'
     end
 

data/spec/helpers/cms/application_helper_spec.rb

@@ -7,36 +7,36 @@ describe Cms::ApplicationHelper, type: :helper do
 
   describe '#sp_list_menu' do
     it 'should be able to find a menu by its name' do
-      menu = FactoryGirl.create(:spud_menu, name: 'Main')
-      2.times { |_x| FactoryGirl.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/') }
+      menu = FactoryBot.create(:spud_menu, name: 'Main')
+      2.times { |_x| FactoryBot.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/') }
 
       result = helper.sp_list_menu(name: 'Main', active_class: 'active')
       expect(result).to match /\<li/
     end
 
     it 'should assign id to ul block' do
-      menu = FactoryGirl.create(:spud_menu)
-      2.times { |_x| s = FactoryGirl.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/') }
+      menu = FactoryBot.create(:spud_menu)
+      2.times { |_x| s = FactoryBot.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/') }
 
       result = helper.sp_list_menu(name: menu.name, id: 'nav')
       expect(result).to match /id=\'nav\'/
     end
 
     it 'should render nested menu items' do
-      menu = FactoryGirl.create(:spud_menu, name: 'Main2')
-      s = FactoryGirl.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
-      s2 = FactoryGirl.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
-      s3 = FactoryGirl.create(:spud_menu_item, parent_type: 'SpudMenuItem', parent_id: s.id, spud_menu_id: menu.id, url: '/', name: 'SubItem')
+      menu = FactoryBot.create(:spud_menu, name: 'Main2')
+      s = FactoryBot.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
+      s2 = FactoryBot.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
+      s3 = FactoryBot.create(:spud_menu_item, parent_type: 'SpudMenuItem', parent_id: s.id, spud_menu_id: menu.id, url: '/', name: 'SubItem')
 
       result = helper.sp_list_menu(name: 'Main2')
       expect(result).to match /SubItem/
     end
 
     it 'should respect max depth' do
-      menu = FactoryGirl.create(:spud_menu, name: 'Main4')
-      s = FactoryGirl.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
-      s2 = FactoryGirl.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
-      s3 = FactoryGirl.create(:spud_menu_item, parent_type: 'SpudMenuItem', parent_id: s.id, spud_menu_id: menu.id, url: '/', name: 'SubItem')
+      menu = FactoryBot.create(:spud_menu, name: 'Main4')
+      s = FactoryBot.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
+      s2 = FactoryBot.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
+      s3 = FactoryBot.create(:spud_menu_item, parent_type: 'SpudMenuItem', parent_id: s.id, spud_menu_id: menu.id, url: '/', name: 'SubItem')
 
       result = helper.sp_list_menu(name: 'Main4', max_depth: 1)
       expect(result).to_not match /SubItem/
@@ -45,10 +45,10 @@ describe Cms::ApplicationHelper, type: :helper do
 
   describe '#sp_menu_with_seperator' do
     it 'should render a flattened list of links' do
-      menu = FactoryGirl.create(:spud_menu, name: 'Main3')
-      s = FactoryGirl.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
-      s2 = FactoryGirl.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
-      s3 = FactoryGirl.create(:spud_menu_item, parent_type: 'SpudMenuItem', parent_id: s.id, spud_menu_id: menu.id, url: '/', name: 'SubItem')
+      menu = FactoryBot.create(:spud_menu, name: 'Main3')
+      s = FactoryBot.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
+      s2 = FactoryBot.create(:spud_menu_item, parent_id: menu.id, spud_menu_id: menu.id, url: '/')
+      s3 = FactoryBot.create(:spud_menu_item, parent_type: 'SpudMenuItem', parent_id: s.id, spud_menu_id: menu.id, url: '/', name: 'SubItem')
 
       content = helper.sp_menu_with_seperator(name: 'Main3')
       expect(content).to match /SubItem/
@@ -58,9 +58,9 @@ describe Cms::ApplicationHelper, type: :helper do
 
   describe '#sp_list_pages' do
     it 'should be able to list created pages' do
-      page = FactoryGirl.create(:spud_page)
-      page2 = FactoryGirl.create(:spud_page)
-      page3 = FactoryGirl.create(:spud_page, spud_page_id: page.id)
+      page = FactoryBot.create(:spud_page)
+      page2 = FactoryBot.create(:spud_page)
+      page3 = FactoryBot.create(:spud_page, spud_page_id: page.id)
 
       content = helper.sp_list_pages(active_class: 'active')
       expect(content).to match /#{page.name}/
@@ -69,8 +69,8 @@ describe Cms::ApplicationHelper, type: :helper do
     end
 
     it 'should assign id' do
-      page = FactoryGirl.create(:spud_page)
-      page2 = FactoryGirl.create(:spud_page)
+      page = FactoryBot.create(:spud_page)
+      page2 = FactoryBot.create(:spud_page)
 
       content = helper.sp_list_pages(id: 'page_nav')
       expect(content).to match /id=\'page_nav\'/
@@ -78,17 +78,17 @@ describe Cms::ApplicationHelper, type: :helper do
     end
 
     it 'should be able to exclude certain pages' do
-      page = FactoryGirl.create(:spud_page)
-      page2 = FactoryGirl.create(:spud_page)
+      page = FactoryBot.create(:spud_page)
+      page2 = FactoryBot.create(:spud_page)
 
       content = helper.sp_list_pages(exclude: [page2.name])
       expect(content).to match /#{page.name}/
       expect(content).to_not match /#{page2.name}/
     end
     it 'should respect max depth' do
-      page = FactoryGirl.create(:spud_page)
-      page2 = FactoryGirl.create(:spud_page)
-      page3 = FactoryGirl.create(:spud_page, spud_page_id: page.id)
+      page = FactoryBot.create(:spud_page)
+      page2 = FactoryBot.create(:spud_page)
+      page3 = FactoryBot.create(:spud_page, spud_page_id: page.id)
 
       content = helper.sp_list_pages(max_depth: 1)
       expect(content).to match /#{page.name}/
@@ -97,9 +97,9 @@ describe Cms::ApplicationHelper, type: :helper do
     end
 
     it 'should be able to list sub pages of a particular page' do
-      page = FactoryGirl.create(:spud_page)
-      page2 = FactoryGirl.create(:spud_page)
-      page3 = FactoryGirl.create(:spud_page, spud_page_id: page.id)
+      page = FactoryBot.create(:spud_page)
+      page2 = FactoryBot.create(:spud_page)
+      page3 = FactoryBot.create(:spud_page, spud_page_id: page.id)
       content = helper.sp_list_pages(start_page_id: page.id)
       expect(content).to_not match /#{page.name}/
       expect(content).to_not match /#{page2.name}/

data/spec/models/spud_menu_item_spec.rb

@@ -9,22 +9,22 @@ describe SpudMenuItem, type: :model do
 
   describe :validations do
     it 'should require a name' do
-      p = FactoryGirl.build(:spud_menu_item, name: nil)
+      p = FactoryBot.build(:spud_menu_item, name: nil)
       expect(p).to_not be_valid
     end
 
     it 'should require a menu_id' do
-      p = FactoryGirl.build(:spud_menu_item, spud_menu_id: nil)
+      p = FactoryBot.build(:spud_menu_item, spud_menu_id: nil)
       expect(p).to_not be_valid
     end
 
     it 'should require a parent_type' do
-      p = FactoryGirl.build(:spud_menu_item, parent_type: nil)
+      p = FactoryBot.build(:spud_menu_item, parent_type: nil)
       expect(p).to_not be_valid
     end
 
     it 'should require a parent_id' do
-      p = FactoryGirl.build(:spud_menu_item, parent_id: nil)
+      p = FactoryBot.build(:spud_menu_item, parent_id: nil)
       expect(p).to_not be_valid
     end
   end

data/spec/models/spud_page_partial_spec.rb

@@ -4,24 +4,24 @@ describe SpudPagePartial, type: :model do
   describe 'validations' do
 
     it 'should require a name' do
-      p = FactoryGirl.build(:spud_page_partial, name: nil)
+      p = FactoryBot.build(:spud_page_partial, name: nil)
       expect(p).to_not be_valid
     end
 
     it 'should respond with a symbol_name based on name' do
-      p = FactoryGirl.build(:spud_page_partial, name: 'Test Page')
+      p = FactoryBot.build(:spud_page_partial, name: 'Test Page')
       expect(p.symbol_name).to eq('test_page')
     end
   end
 
   describe 'save hooks' do
     it 'should save the symbol name' do
-      p = FactoryGirl.create(:spud_page_partial, name: 'Test Page')
+      p = FactoryBot.create(:spud_page_partial, name: 'Test Page')
       expect(p.attributes['symbol_name']).to eq('test_page')
     end
 
     it 'should create a new revision if content is changed' do
-      p = FactoryGirl.create(:spud_page_partial, name: 'Test Page', content: 'Content')
+      p = FactoryBot.create(:spud_page_partial, name: 'Test Page', content: 'Content')
       expect(SpudPagePartialRevision.where(spud_page_id: p.spud_page_id).count).to eq(1)
     end
 
@@ -29,7 +29,7 @@ describe SpudPagePartial, type: :model do
       Spud::Cms.configure do |config|
         config.max_revisions = 2
       end
-      p = FactoryGirl.create(:spud_page_partial, name: 'Test Page', content: 'Home Sweet Home', spud_page_id: 1)
+      p = FactoryBot.create(:spud_page_partial, name: 'Test Page', content: 'Home Sweet Home', spud_page_id: 1)
       p.content = 'Nah'
       p.save
 

data/spec/models/spud_page_spec.rb

@@ -11,26 +11,26 @@ describe SpudPage, type: :model do
   describe 'validations' do
 
     it 'should require a name' do
-      p = FactoryGirl.build(:spud_page, name: nil)
+      p = FactoryBot.build(:spud_page, name: nil)
       expect(p).to_not be_valid
     end
 
     it 'should require a unique url_name' do
-      FactoryGirl.create(:spud_page, url_name: 'test', use_custom_url_name: true)
-      t = FactoryGirl.build(:spud_page, url_name: 'test', use_custom_url_name: true)
+      FactoryBot.create(:spud_page, url_name: 'test', use_custom_url_name: true)
+      t = FactoryBot.build(:spud_page, url_name: 'test', use_custom_url_name: true)
       expect(t).to_not be_valid
     end
 
     it 'should generate a url_name if taken' do
-      FactoryGirl.create(:spud_page, name: 'test')
-      t = FactoryGirl.build(:spud_page, name: 'test')
+      FactoryBot.create(:spud_page, name: 'test')
+      t = FactoryBot.build(:spud_page, name: 'test')
       expect do
         t.valid?
       end.to change(t, :url_name)
     end
 
     it 'should dependantly destroy page_partials' do
-      t = FactoryGirl.create(:spud_page, spud_page_partials: [SpudPagePartial.new(name: 'body')])
+      t = FactoryBot.create(:spud_page, spud_page_partials: [SpudPagePartial.new(name: 'body')])
       expect do
         t.destroy
       end.to change(SpudPagePartial, :count).from(1).to(0)
@@ -53,7 +53,7 @@ describe SpudPage, type: :model do
     end
 
     it 'should return private if visibility is == 1' do
-      parent_page = FactoryGirl.build(:spud_page, name: 'parent', visibility: 1)
+      parent_page = FactoryBot.build(:spud_page, name: 'parent', visibility: 1)
 
       expect(parent_page.is_private?).to eq(true)
 
@@ -64,25 +64,25 @@ describe SpudPage, type: :model do
 
   describe '#generate_url_name' do
     it 'should use the provided url' do
-      @page = FactoryGirl.create(:spud_page, url_name: 'test')
+      @page = FactoryBot.create(:spud_page, url_name: 'test')
       expect(@page.url_name).to eq('test')
     end
 
     it 'should generate a url based on the page name' do
-      @page = FactoryGirl.create(:spud_page, name: 'Hello World')
+      @page = FactoryBot.create(:spud_page, name: 'Hello World')
       expect(@page.url_name).to eq('hello-world')
     end
 
     it 'should generate a url based on the page name and parent page' do
-      @parent = FactoryGirl.create(:spud_page, name: 'About Us')
-      @page = FactoryGirl.create(:spud_page, name: 'Hello World', spud_page: @parent)
+      @parent = FactoryBot.create(:spud_page, name: 'About Us')
+      @page = FactoryBot.create(:spud_page, name: 'Hello World', spud_page: @parent)
       expect(@page.url_name).to eq('about-us/hello-world')
     end
   end
 
   describe '#create_redirect_if_necessary' do
     it 'should create a redirect' do
-      page = FactoryGirl.create(:spud_page, url_name: 'page-a')
+      page = FactoryBot.create(:spud_page, url_name: 'page-a')
       expect do
         page.update(url_name: 'page-b')
       end.to change(page.tb_redirects, :count).by(1)

data/spec/rails_helper.rb

@@ -7,7 +7,7 @@ require 'rspec/rails'
 require 'rails-controller-testing'
 require 'database_cleaner'
 require 'simplecov'
-require 'factory_girl_rails'
+require 'factory_bot_rails'
 require 'tb_core/test_helper'
 require 'shoulda'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_cms
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Moser Consulting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.beta2
+        version: 1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.beta2
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: tb_redirects
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -338,87 +338,87 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Twice Baked CMS
 test_files:
-- spec/controllers/admin/menu_items_controller_spec.rb
-- spec/controllers/admin/menus_controller_spec.rb
-- spec/controllers/admin/pages_controller_spec.rb
-- spec/controllers/admin/snippets_controller_spec.rb
-- spec/controllers/pages_controller_spec.rb
+- spec/spec_helper.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/views/layouts/content_left.html.erb
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/layouts/content_left.html.erb
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config.ru
-- spec/dummy/db/migrate/20141231214446_create_spud_admin_permissions.tb_core.rb
-- spec/dummy/db/migrate/20141231214447_create_spud_users.tb_core.rb
+- spec/dummy/script/rails
+- spec/dummy/Rakefile
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/404.html
+- spec/dummy/db/schema.rb
 - spec/dummy/db/migrate/20141231214448_add_time_zone_to_spud_user.tb_core.rb
-- spec/dummy/db/migrate/20141231214449_add_scope_to_spud_admin_permissions.tb_core.rb
-- spec/dummy/db/migrate/20141231214450_create_spud_user_settings.tb_core.rb
-- spec/dummy/db/migrate/20141231214451_create_spud_roles.tb_core.rb
-- spec/dummy/db/migrate/20141231214452_create_spud_permissions.tb_core.rb
-- spec/dummy/db/migrate/20141231214453_create_spud_role_permissions.tb_core.rb
 - spec/dummy/db/migrate/20141231214454_drop_spud_admin_permissions.tb_core.rb
-- spec/dummy/db/migrate/20141231214455_create_spud_permalinks.tb_permalinks.rb
-- spec/dummy/db/migrate/20141231214456_add_site_id_to_spud_permalinks.tb_permalinks.rb
-- spec/dummy/db/migrate/20141231214457_modify_site_id_for_spud_permalinks.tb_permalinks.rb
+- spec/dummy/db/migrate/20141231214451_create_spud_roles.tb_core.rb
+- spec/dummy/db/migrate/20150108164814_remove_site_id_from_cms_tables.tb_cms.rb
+- spec/dummy/db/migrate/20141231214469_add_classes_to_spud_menu_items.tb_cms.rb
 - spec/dummy/db/migrate/20141231214459_create_spud_pages.tb_cms.rb
+- spec/dummy/db/migrate/20141231214477_add_layout_to_spud_pages.tb_cms.rb
+- spec/dummy/db/migrate/20141231214464_add_visibility_to_spud_pages.tb_cms.rb
+- spec/dummy/db/migrate/20141231214473_create_spud_page_partial_revisions.tb_cms.rb
+- spec/dummy/db/migrate/20141231214470_add_site_id_to_spud_pages.tb_cms.rb
+- spec/dummy/db/migrate/20141231214447_create_spud_users.tb_core.rb
 - spec/dummy/db/migrate/20141231214460_create_spud_menus.tb_cms.rb
-- spec/dummy/db/migrate/20141231214461_create_spud_menu_items.tb_cms.rb
-- spec/dummy/db/migrate/20141231214462_create_spud_templates.tb_cms.rb
+- spec/dummy/db/migrate/20141231214450_create_spud_user_settings.tb_core.rb
+- spec/dummy/db/migrate/20141231214476_add_content_processed_to_spud_page_partials.tb_cms.rb
 - spec/dummy/db/migrate/20141231214463_create_spud_page_partials.tb_cms.rb
-- spec/dummy/db/migrate/20141231214464_add_visibility_to_spud_pages.tb_cms.rb
-- spec/dummy/db/migrate/20141231214465_add_menu_name_to_spud_menu_items.tb_cms.rb
-- spec/dummy/db/migrate/20141231214466_add_use_custom_url_name_to_spud_pages.tb_cms.rb
+- spec/dummy/db/migrate/20141231214449_add_scope_to_spud_admin_permissions.tb_core.rb
 - spec/dummy/db/migrate/20141231214467_add_notes_to_spud_pages.tb_cms.rb
-- spec/dummy/db/migrate/20141231214468_add_menu_id_to_spud_menu_items.tb_cms.rb
-- spec/dummy/db/migrate/20141231214469_add_classes_to_spud_menu_items.tb_cms.rb
-- spec/dummy/db/migrate/20141231214470_add_site_id_to_spud_pages.tb_cms.rb
-- spec/dummy/db/migrate/20141231214471_add_site_id_to_spud_templates.tb_cms.rb
+- spec/dummy/db/migrate/20141231214446_create_spud_admin_permissions.tb_core.rb
+- spec/dummy/db/migrate/20160215180157_create_tb_redirects.tb_redirects.rb
 - spec/dummy/db/migrate/20141231214472_add_site_id_to_spud_menus.tb_cms.rb
-- spec/dummy/db/migrate/20141231214473_create_spud_page_partial_revisions.tb_cms.rb
-- spec/dummy/db/migrate/20141231214474_add_symbol_name_to_spud_page_partials.tb_cms.rb
+- spec/dummy/db/migrate/20141231214465_add_menu_name_to_spud_menu_items.tb_cms.rb
+- spec/dummy/db/migrate/20141231214452_create_spud_permissions.tb_core.rb
+- spec/dummy/db/migrate/20141231214453_create_spud_role_permissions.tb_core.rb
 - spec/dummy/db/migrate/20141231214475_modify_site_id_for_spud_pages.tb_cms.rb
-- spec/dummy/db/migrate/20141231214476_add_content_processed_to_spud_page_partials.tb_cms.rb
-- spec/dummy/db/migrate/20141231214477_add_layout_to_spud_pages.tb_cms.rb
+- spec/dummy/db/migrate/20141231214461_create_spud_menu_items.tb_cms.rb
+- spec/dummy/db/migrate/20141231214457_modify_site_id_for_spud_permalinks.tb_permalinks.rb
+- spec/dummy/db/migrate/20141231214455_create_spud_permalinks.tb_permalinks.rb
+- spec/dummy/db/migrate/20141231214466_add_use_custom_url_name_to_spud_pages.tb_cms.rb
+- spec/dummy/db/migrate/20141231214468_add_menu_id_to_spud_menu_items.tb_cms.rb
 - spec/dummy/db/migrate/20141231214479_create_spud_snippets.tb_cms.rb
-- spec/dummy/db/migrate/20150108164814_remove_site_id_from_cms_tables.tb_cms.rb
-- spec/dummy/db/migrate/20150911185843_add_requires_password_change_to_spud_users.tb_core.rb
+- spec/dummy/db/migrate/20141231214471_add_site_id_to_spud_templates.tb_cms.rb
 - spec/dummy/db/migrate/20150911185844_add_title_tag_to_spud_page.tb_cms.rb
-- spec/dummy/db/migrate/20160215180157_create_tb_redirects.tb_redirects.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
+- spec/dummy/db/migrate/20141231214462_create_spud_templates.tb_cms.rb
+- spec/dummy/db/migrate/20141231214456_add_site_id_to_spud_permalinks.tb_permalinks.rb
+- spec/dummy/db/migrate/20150911185843_add_requires_password_change_to_spud_users.tb_core.rb
+- spec/dummy/db/migrate/20141231214474_add_symbol_name_to_spud_page_partials.tb_cms.rb
 - spec/dummy/README.rdoc
-- spec/dummy/script/rails
-- spec/helpers/cms/application_helper_spec.rb
-- spec/models/spud_menu_item_spec.rb
 - spec/models/spud_page_partial_revision_spec.rb
 - spec/models/spud_page_partial_spec.rb
 - spec/models/spud_page_spec.rb
+- spec/models/spud_menu_item_spec.rb
 - spec/models/spud_snippet_spec.rb
+- spec/controllers/pages_controller_spec.rb
+- spec/controllers/admin/snippets_controller_spec.rb
+- spec/controllers/admin/pages_controller_spec.rb
+- spec/controllers/admin/menu_items_controller_spec.rb
+- spec/controllers/admin/menus_controller_spec.rb
 - spec/rails_helper.rb
-- spec/spec_helper.rb
+- spec/helpers/cms/application_helper_spec.rb