@@ -93,7 +93,8 @@ class Admin::SitesController < Admin::BaseController def protect_single_site_mode unless Site.multi_sites_enabled if params[:action] == 'index' - site = Site.find_or_initialize_by_host(request.host_with_port) + site = Site.find_by_host(request.host_with_port) + site = Site.first unless site redirect_to admin_site_url(site) else render :action => :multi_sites_disabled, :layout => 'simple' engines/adva_cms/app/controllers/admin/sites_controller.rb @@ -34,6 +34,41 @@ class AdminSitesControllerTest < ActionController::TestCase end end + describe "GET to :index with single site mode on. If no site with request host name is found it redirects to first Site" do + with :single_site_enabled do + with :is_superuser do + with :access_granted do + before do + mock(Site).find_by_host("site-with-pages.com") { nil } + @site_mock = Site.new + mock(@site_mock).id.times(any_times) { 1 } + mock(Site).first { @site_mock } + end + + action { get :index } + + it_redirects_to { admin_site_url(@site_mock) } + end + end + end + end + + describe "GET to :index with single site mode on. If a site with request host name is found it redirects to the found site" do + with :single_site_enabled do + with :is_superuser do + with :access_granted do + before do + dont_allow(Site).first + end + + action { get :index } + + it_redirects_to { admin_site_url(Site.find_by_host("site-with-pages.com")) } + end + end + end + end + describe "GET to :index" do with :is_superuser do action { get :index } engines/adva_cms/test/functional/admin/sites_controller_test.rb cfd086c241889d26643167fd1eb0b484174e56d9 Raphaela Wrede rwrede@adva-business.com http://github.com/svenfuchs/adva_cms/commit/8ad2cec4d1186883cdf703bb29a15f5f35dc9d72 8ad2cec4d1186883cdf703bb29a15f5f35dc9d72 2009-11-03T02:12:56-08:00 2009-11-03T02:10:24-08:00 Given single site mode on And no site with request host name is found it redirects to first Site. a56c516db51166d135c68b200f40948149c9a8c8 Raphaela Wrede rwrede@adva-business.com