tb_cms 1.2.3 → 1.3.beta1

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
-	module Cms
-		VERSION = "1.2.3"
-	end
+  module Cms
+    VERSION = '1.3.beta1'.freeze
+  end
 end

data/spec/controllers/admin/menu_items_controller_spec.rb

@@ -1,128 +1,126 @@
 require 'rails_helper'
 
-describe Admin::MenuItemsController, :type => :controller do
+describe Admin::MenuItemsController, type: :controller do
   before(:each) do
-    activate_authlogic
-    u = SpudUser.new(:login => "testuser",:email => "test@testuser.com",:password => "test",:password_confirmation => "test")
-    u.super_admin = true
-    u.save
-    @user = SpudUserSession.create(u)
-    @menu = FactoryGirl.create(:spud_menu)
+    activate_session(admin: true)
   end
 
+  let (:menu) do
+    FactoryGirl.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)}
-      get :index,:menu_id =>@menu.id
+    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) }
+      get :index, params: { menu_id: menu.id }
 
       expect(assigns(:menu_items).count).to be > 1
     end
-    it "should redirect if the menu is not found" do
-      get :index,:menu_id => @menu.id + 1
+    it 'should redirect if the menu is not found' do
+      get :index, params: { menu_id: menu.id + 1 }
       expect(response).to redirect_to admin_menus_url
     end
   end
 
   describe 'new' do
-    it "should assign a new menu" do
-      get :new,:menu_id =>@menu.id
+    it 'should assign a new menu' do
+      get :new, params: { menu_id: menu.id }
       expect(assigns(:menu_item)).to_not be_blank
       expect(response).to be_success
     end
   end
 
   describe 'create' do
-    it "should create a new menu item with a valid form submission" do
-      expect {
-        post :create,: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}
-      }.to change(SpudMenuItem,:count).by(1)
+    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 } }
+      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}
+    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 }
 
-      expect {
-        post :create,: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}
-      }.to_not change(SpudMenuItem,:count)
+      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 } }
+      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)
+    it 'should autoset order if not specified' do
+      menuitem = FactoryGirl.create(:spud_menu_item, parent_id: menu.id)
 
-      post :create,: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: FactoryGirl.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
+    it 'should assign the menu name based on page name if left blank' do
       page = FactoryGirl.create(:spud_page)
-      post :create,: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}
+      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 } }
       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,: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}
+    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 } }
       expect(assigns(:menu_item).parent).to eq(menuitem)
     end
   end
 
   describe 'edit' do
-    it "should respond with menu item by id" do
+    it 'should respond with menu item by id' do
       menu1 = FactoryGirl.create(:spud_menu_item)
       menu2 = FactoryGirl.create(:spud_menu_item)
-      get :edit, :menu_id => @menu.id,:id => menu2.id
+      get :edit, params: { menu_id: menu.id, id: menu2.id }
       expect(assigns(:menu_item)).to eq(menu2)
     end
 
-    it "should redirect_to index if menu item not found" do
-      get :edit,:menu_id => @menu.id,:id => "345"
-      expect(response).to redirect_to admin_menu_menu_items_url(:menu_id => @menu.id)
+    it 'should redirect_to index if menu item not found' do
+      get :edit, params: { menu_id: menu.id, id: '345' }
+      expect(response).to redirect_to admin_menu_menu_items_url(menu_id: menu.id)
     end
   end
 
   describe 'update' do
-    it "should update the name when the name attribute is changed" do
+    it 'should update the name when the name attribute is changed' do
       menu_item = FactoryGirl.create(:spud_menu_item)
       new_name = 'MyMenu'
-      expect {
-        put :update,: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}
+      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 } }
         menu_item.reload
-      }.to change(menu_item,:name).to(new_name)
+      end.to change(menu_item, :name).to(new_name)
     end
-    it "should assign a menu to a submenu if parentid is defined" do
+    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)
 
-      expect {
-        put :update,: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}
+      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 } }
         menu_item.reload
-      }.to change(menu_item,:parent).to(menu_item1)
+      end.to change(menu_item, :parent).to(menu_item1)
     end
   end
 
   describe 'destroy' do
-    it "should destroy the menu item" do
-      menu_item = FactoryGirl.create(:spud_menu_item,:parent_id => @menu.id)
-      expect {
-        delete :destroy,:menu_id => @menu.id,:id => menu_item.id
-      }.to change(SpudMenuItem,:count).by(-1)
+    it 'should destroy the menu item' do
+      menu_item = FactoryGirl.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)
     end
   end
 
   describe 'update_sort' do
-    it "should update all menu items menu_order fields" do
-      ordered_arr = Array.new(5)      
+    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)
-          ordered_arr[index] = item.id.to_s
+        item = FactoryGirl.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
-      put :update_sort, :menu_id => @menu.id,:id => ordered_arr[0], :order => new_order_arr
+      put :update_sort, params: { menu_id: menu.id, id: ordered_arr[0], order: new_order_arr }
       new_order_arr.each_with_index do |item, index|
-        expect(@menu.spud_menu_items.find_by_id(item.to_i).menu_order).to be(index)
-      end 
+        expect(menu.spud_menu_items.find_by(id: item.to_i).menu_order).to be(index)
+      end
     end
   end
 end

data/spec/controllers/admin/menus_controller_spec.rb

@@ -1,17 +1,12 @@
 require 'rails_helper'
 
-describe Admin::MenusController, :type => :controller do
+describe Admin::MenusController, type: :controller do
   before(:each) do
-    activate_authlogic
-    u = SpudUser.new(:login => "testuser",:email => "test@testuser.com",:password => "test",:password_confirmation => "test")
-    u.super_admin = true
-    u.save
-    @user = SpudUserSession.create(u)
+    activate_session(admin: true)
   end
 
-
   describe 'index' do
-    it "should return an array of menus" do
+    it 'should return an array of menus' do
       2.times { FactoryGirl.create(:spud_menu) }
       get :index
 
@@ -21,7 +16,7 @@ describe Admin::MenusController, :type => :controller do
   end
 
   describe 'new' do
-    it "should response with new menu" do
+    it 'should response with new menu' do
       get :new
       expect(assigns(:menu)).to_not be_blank
       expect(response).to be_success
@@ -29,69 +24,68 @@ describe Admin::MenusController, :type => :controller do
   end
 
   describe 'create' do
-    it "should create a new menu with a valid form submission" do
-      expect {
-        post :create, :spud_menu => FactoryGirl.attributes_for(:spud_menu).reject{|k,v| k == 'id'}
-      }.to change(SpudMenu,:count).by(1)
+    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' } }
+      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 {
-        post :create, :spud_menu => FactoryGirl.attributes_for(:spud_menu,:name => nil).reject{|k,v| k == 'id'}
-      }.to_not change(SpudMenu,:count)
-
+    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' } }
+      end.to_not change(SpudMenu, :count)
 
     end
   end
 
   describe 'edit' do
-    it "should response with menu by id" do
+    it 'should response with menu by id' do
       menu1 = FactoryGirl.create(:spud_menu)
       menu2 = FactoryGirl.create(:spud_menu)
-      get :edit,:id => menu2.id
+      get :edit, params: { id: menu2.id }
       expect(assigns(:menu)).to eq(menu2)
     end
-    it "should redirect to index if menu not found" do
-      get :edit,:id => 3
+    it 'should redirect to index if menu not found' do
+      get :edit, params: { id: 3 }
       expect(response).to redirect_to admin_menus_url
     end
 
   end
 
   describe 'update' do
-    it "should update the name when the name attribute is changed" do
+    it 'should update the name when the name attribute is changed' do
       menu = FactoryGirl.create(:spud_menu)
       new_name = 'MyMenu'
-      expect {
-        put :update,:id => menu.id, :spud_menu => menu.attributes.merge!(:name => new_name).reject{|k,v| k == 'id'}
+      expect do
+        put :update, params: { id: menu.id, spud_menu: menu.attributes.merge!(name: new_name).reject { |k, _v| k == 'id' } }
         menu.reload
-      }.to change(menu,:name).to(new_name)
+      end.to change(menu, :name).to(new_name)
 
     end
 
-    it "should redirect to the admin menus after a successful update" do
+    it 'should redirect to the admin menus after a successful update' do
       menu = FactoryGirl.create(:spud_menu)
-      put :update,:id => menu.id,:spud_menu => menu.attributes.merge!(:name => "MyMenu").reject{|k,v| k == 'id'}
+      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))
+      expect(response).to redirect_to(admin_menu_menu_items_url(menu_id: menu.id))
     end
   end
 
   describe 'destroy' do
-    it "should destroy the menu" do
+    it 'should destroy the menu' do
       menu = FactoryGirl.create(:spud_menu)
-      expect {
-        delete :destroy, :id => menu.id
-      }.to change(SpudMenu,:count).by(-1)
+      expect do
+        delete :destroy, params: { id: menu.id }
+      end.to change(SpudMenu, :count).by(-1)
       expect(response).to be_redirect
     end
 
-    it "should not destroy the menu with a wrong id" do
+    it 'should not destroy the menu with a wrong id' do
       menu = FactoryGirl.create(:spud_menu)
-      expect {
-        delete :destroy,:id => "23532"
-      }.to_not change(SpudMenu,:count)
+      expect do
+        delete :destroy, params: { id: '23532' }
+      end.to_not change(SpudMenu, :count)
       expect(response).to be_redirect
     end
 

data/spec/controllers/admin/pages_controller_spec.rb

@@ -1,25 +1,21 @@
 require 'rails_helper'
 
-describe Admin::PagesController, :type => :controller do
+describe Admin::PagesController, type: :controller do
   before(:each) do
-    activate_authlogic
-    u = SpudUser.new(:login => "testuser",:email => "test@testuser.com",:password => "test",:password_confirmation => "test")
-    u.super_admin = true
-    u.save
-    @user = SpudUserSession.create(u)
+    activate_session(admin: true)
   end
 
   describe 'index' do
-    it "should return an array of parent pages" do
-      2.times {|x|  s = FactoryGirl.create(:spud_page)}
+    it 'should return an array of parent pages' do
+      2.times { |_x| s = FactoryGirl.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)
+    it 'should only return parent pages' do
+      2.times { |_x| FactoryGirl.create(:spud_page) }
+      FactoryGirl.create(:spud_page, spud_page_id: 1)
 
       get :index
       expect(assigns(:pages).count).to eq(2)
@@ -27,22 +23,22 @@ describe Admin::PagesController, :type => :controller do
   end
 
   describe 'show' do
-    it "should respond successfully" do
+    it 'should respond successfully' do
       p = FactoryGirl.create(:spud_page)
-      get :show ,:id => p.id
-      expect(assigns(:layout)).to render_template(:layout => "layouts/#{Spud::Cms.default_page_layout}")
+      get :show, params: { id: p.id }
+      expect(assigns(:layout)).to render_template(layout: "layouts/#{Spud::Cms.default_page_layout}")
       expect(response).to be_success
     end
   end
 
   describe 'new' do
-    it "should respond successfully" do
+    it 'should respond successfully' do
       get :new
 
       expect(response).to be_success
     end
 
-    it "should build a page object for the form" do
+    it 'should build a page object for the form' do
       get :new
 
       expect(assigns(:page)).to_not be_blank
@@ -50,10 +46,10 @@ describe Admin::PagesController, :type => :controller do
   end
 
   describe 'edit' do
-    context "HTML format" do
-      it "should load the correct page for the edit form" do
+    context 'HTML format' do
+      it 'should load the correct page for the edit form' do
         page = FactoryGirl.create(:spud_page)
-        get :edit, :id => page.id
+        get :edit, params: { id: page.id }
 
         expect(assigns(:page).id).to eq(page.id)
       end
@@ -61,40 +57,39 @@ describe Admin::PagesController, :type => :controller do
 
   end
 
-
   describe 'update' do
-    it "should update the name when the attribute is changed" do
+    it 'should update the name when the attribute is changed' do
       page = FactoryGirl.create(:spud_page)
-      new_name = "Adam"
-      expect {
-        put :update, :id => page.id, :spud_page => page.attributes.merge!(:name => new_name).reject{ |key,value| key == 'id' || key == 'created_at' || key == 'updated_at'}
+      new_name = 'Adam'
+      expect do
+        put :update, params: { id: page.id, spud_page: { name: new_name } }
         page.reload
-      }.to change(page, :name).to(new_name)
+      end.to change(page, :name).to(new_name)
     end
 
-    it "should redirect to the page root index after a successful update" do
+    it 'should redirect to the page root index after a successful update' do
       page = FactoryGirl.create(:spud_page)
-      new_name = "Adam"
-      put :update, :id => page.id, :spud_page => page.attributes.merge!(:name => new_name).reject{ |key,value| key == 'id' || key == 'created_at' || key == 'updated_at'}
+      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' } }
 
       expect(response).to redirect_to(admin_pages_url)
     end
   end
 
   describe 'destroy' do
-    it "should destroy the page" do
+    it 'should destroy the page' do
       page = FactoryGirl.create(:spud_page)
-      expect {
-        delete :destroy, :id => page.id
-      }.to change(SpudPage, :count).by(-1)
+      expect do
+        delete :destroy, params: { id: page.id }
+      end.to change(SpudPage, :count).by(-1)
       expect(response).to be_redirect
     end
 
-    it "should destroy the user with the wrong id" do
+    it 'should destroy the user with the wrong id' do
       page = FactoryGirl.create(:spud_page)
-      expect {
-        delete :destroy, :id => "23532"
-      }.to_not change(SpudPage, :count)
+      expect do
+        delete :destroy, params: { id: '23532' }
+      end.to_not change(SpudPage, :count)
       expect(response).to be_redirect
     end
   end

data/spec/controllers/admin/snippets_controller_spec.rb

@@ -1,5 +1,5 @@
 require 'rails_helper'
 
-describe Admin::SnippetsController, :type => :controller do
+describe Admin::SnippetsController, type: :controller do
 
 end

data/spec/controllers/pages_controller_spec.rb

@@ -1,51 +1,51 @@
 require 'rails_helper'
 
-describe PagesController, :type => :controller do
+describe PagesController, type: :controller do
   describe 'show' do
 
-    it "should render a page" do
+    it 'should render a page' do
       page = FactoryGirl.create(:spud_page)
-      get :show ,:id => page.url_name
-      expect(assigns(:layout)).to render_template(:layout => "layouts/#{Spud::Cms.default_page_layout}")
+      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")
+    it 'should render home page if id is blank' do
+      page = FactoryGirl.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.update(:url_name => "about-us")
+    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.update(url_name: 'about-us')
       page.save
-      get :show, :id => "about"
+      get :show, params: { id: 'about' }
 
-     expect(response).to redirect_to page_url(:id => "about-us")
+      expect(response).to redirect_to page_url(id: 'about-us')
     end
 
-    it "should not allow access to private pages when logged out" do
-      page = FactoryGirl.create(:spud_page,:name => "about",:visibility => 1)
+    it 'should not allow access to private pages when logged out' do
+      page = FactoryGirl.create(:spud_page, name: 'about', visibility: 1)
 
-      get :show, :id => "about"
-      expect(response).to redirect_to login_path(:return_to => '/about')
+      get :show, params: { id: 'about' }
+      expect(response).to redirect_to login_path(return_to: '/about')
     end
 
-    describe "authorized login" do
-       before(:each) do
+    describe 'authorized login' do
+      before(:each) do
         activate_authlogic
-        u = SpudUser.new(:login => "testuser",:email => "test@testuser.com",:password => "test",:password_confirmation => "test")
+        u = SpudUser.new(login: 'testuser', email: 'test@testuser.com', password: 'test', password_confirmation: 'test')
         u.super_admin = true
         u.save
         @user = SpudUserSession.create(u)
       end
 
-      it "should allow access to private pages when logged in" do
-        page = FactoryGirl.create(:spud_page,:name => "about",:visibility => 1)
+      it 'should allow access to private pages when logged in' do
+        page = FactoryGirl.create(:spud_page, name: 'about', visibility: 1)
 
-        get :show, :id => "about"
+        get :show, params: { id: 'about' }
         expect(response).to be_success
       end
     end

data/spec/dummy/config/application.rb

@@ -3,13 +3,13 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require
-require "tb_cms"
+require 'tb_cms'
 
 module Dummy
   class Application < Rails::Application
 
     Spud::Core.configure do |config|
-        config.site_name = "Test Site"
+      config.site_name = 'Test Site'
     end
 
     # Settings in config/environments/* take precedence over those specified here.
@@ -36,7 +36,7 @@ module Dummy
     config.i18n.enforce_available_locales = true
 
     # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    config.encoding = 'utf-8'
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
@@ -62,4 +62,3 @@ module Dummy
     config.assets.version = '1.0'
   end
 end
-

data/spec/dummy/config/boot.rb

@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environments/production.rb

@@ -9,7 +9,7 @@ Dummy::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_files = false
+  config.public_file_server.enabled = true
 
   # Compress JavaScripts and CSS
   config.assets.compress = true

data/spec/dummy/config/environments/test.rb

@@ -8,8 +8,8 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_files = true
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Deprecated
   # Log error messages when you accidentally call methods on nil
@@ -28,7 +28,7 @@ Dummy::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the

data/spec/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Dummy::Application