cms_css_path and cms_js_path don't serve merged stuff anymore

Oleg committed Nov 05, 2010

commit a2b2739412b67b7b44915c29c995549f43259fed

app/controllers/cms_content_controller.rb +2 -2

@@	@@ -10,11 +10,11 @@ class CmsContentController < ApplicationController
	end

	def render_css
-	render :text => @cms_layout.merged_css, :content_type => 'text/css'
+	render :text => @cms_layout.css, :content_type => 'text/css'
	end

	def render_js
-	render :text => @cms_layout.merged_js, :content_type => 'text/javascript'
+	render :text => @cms_layout.js, :content_type => 'text/javascript'
	end

	protected

test/integration/render_cms_seed_test.rb +18 -0

@@	@@ -13,4 +13,22 @@ class RenderCmsSeedTest < ActionDispatch::IntegrationTest
	assert_equal '<html><div>Sub Child Page Content Content for Default Snippet</div></html>', response.body
	end

+	def test_get_seed_data_page
+	ComfortableMexicanSofa.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+
+	get '/'
+	assert_response :success
+	assert assigns(:cms_page)
+	assert assigns(:cms_page).new_record?
+	end
+
+	def test_get_seed_data_css
+	ComfortableMexicanSofa.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+
+	get '/cms-css/default'
+	assert_response :success
+	assert assigns(:cms_layout)
+	assert assigns(:cms_layout).new_record?
+	end
+
	end
	\ No newline at end of file

test/integration/render_cms_test.rb +0 -9

@@	@@ -58,13 +58,4 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
	end
	end

-	def test_get_seed_data_page
-	ComfortableMexicanSofa.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
-
-	get '/seed_data_page'
-	assert_response :success
-	assert assigns(:cms_page)
-	assert assigns(:cms_page).new_record?
-	end
-
	end
	\ No newline at end of file

test/test_helper.rb +1 -0

@@	@@ -69,6 +69,7 @@ class ActionDispatch::IntegrationTest

	def setup
	host! 'test.host'
+	ComfortableMexicanSofa.config.seed_data_path = nil
	ComfortableMexicanSofa::HttpAuth.username = 'username'
	ComfortableMexicanSofa::HttpAuth.password = 'password'
	end