0
@@ -21,13 +21,13 @@ class AssetsControllerTest < Test::Unit::TestCase
0
 
0
   def test_should_find_css_by_full_path
0
     get :show, :path => 'style', :ext => 'css', :dir => 'stylesheets'
0
-    assert_equal 'text/css', @response.headers['Content-Type']
0
+    assert_equal 'text/css', @response.content_type
0
     assert_equal sites(:first).resources['style.css'].read, @response.body
0
   end
0
 
0
   def test_should_find_js_by_full_path
0
     get :show, :path => 'behavior', :ext => 'js', :dir => 'javascripts'
0
-    assert_equal 'text/javascript', @response.headers['Content-Type']
0
+    assert_equal Mime::JS, @response.content_type
0
     assert_equal sites(:first).resources['behavior.js'].read, @response.body
0
   end
0
 end

0
@@ -1,4 +1,5 @@
0
 require File.join(RAILS_ROOT, 'app/models/site')
0
+
0
 class Site
0
   attr_reader :recent_template_type, :recent_preferred_template, :recent_layout_template
0
 
0
@@ -21,4 +22,4 @@ class Site
0
   [:set_template_type_for, :set_preferred_template, :set_layout_template].each do |m|
0
     alias_method_chain m, :testing
0
   end
0
-end
0
\ No newline at end of file
0
+end unless Site.instance_methods.include?('set_template_type_for_with_testing')
0
\ No newline at end of file

0
@@ -166,7 +166,7 @@ context "Site Validations" do
0
 end
0
 
0
 context "Site Template" do
0
-  fixtures :sites
0
+  fixtures :sites, :sections
0
 
0
   def setup
0
     prepare_theme_fixtures
0
@@ -178,4 +178,38 @@ context "Site Template" do
0
       sites(:first).send(:parse_template, sites(:first).templates[:archive], {}, {})
0
     end
0
   end
0
+
0
+  specify "should find preferred for site" do
0
+    assert_site_template_name :home, :section
0
+  end
0
+
0
+  specify "should find fallback for site with preferred template" do
0
+    FileUtils.rm File.join(THEME_ROOT, 'site-1', 'templates', 'home.liquid')
0
+    assert_site_template_name :section, :section
0
+  end
0
+
0
+  specify "should find preferred for site layout" do
0
+    FileUtils.cp File.join(THEME_ROOT, 'site-1', 'layouts', 'layout.liquid'), File.join(THEME_ROOT, 'site-1', 'layouts', 'custom_layout.liquid')
0
+    sites(:first).sections.home.update_attribute :layout, 'custom_layout'
0
+    assert_site_layout_name :custom_layout, :layout
0
+  end
0
+
0
+  specify "should find fallback for site with preferred layout" do
0
+    sites(:first).sections.home.update_attribute :layout, 'custom_layout'
0
+    assert_site_layout_name :layout
0
+  end
0
+
0
+  protected
0
+    def assert_site_template_name(expected_template_name, template_type = nil, options = {})
0
+      template_type ||= expected_template_name
0
+      site            = options[:site] || sites(:first)
0
+      section         = options[:section] || site.sections.home
0
+      assert_equal(expected_template_name.nil? ? nil : site.templates[expected_template_name], site.send(:set_preferred_template, section, template_type))
0
+    end
0
+    def assert_site_layout_name(expected_template_name, template_type = nil, options = {})
0
+      template_type ||= expected_template_name
0
+      site            = options[:site] || sites(:first)
0
+      section         = options[:section] || site.sections.home
0
+      assert_equal(expected_template_name.nil? ? nil : site.templates[expected_template_name], site.send(:set_layout_template, section, template_type))
0
+    end
0
 end
0
\ No newline at end of file

0
@@ -73,45 +73,3 @@ context "Template" do
0
       assert_equal(expected_template_name.nil? ? nil : site.templates[expected_template_name], site.templates.find_preferred(template_type, options[:custom]))
0
     end
0
 end
0
-
0
-context "Site Template" do
0
-  fixtures :sites, :sections
0
-
0
-  def setup
0
-    prepare_theme_fixtures
0
-  end
0
-
0
-  specify "should find preferred for site" do
0
-    assert_site_template_name :home, :section
0
-  end
0
-
0
-  specify "should find fallback for site with preferred template" do
0
-    FileUtils.rm File.join(THEME_ROOT, 'site-1', 'templates', 'home.liquid')
0
-    assert_site_template_name :section, :section
0
-  end
0
-
0
-  specify "should find preferred for site layout" do
0
-    FileUtils.cp File.join(THEME_ROOT, 'site-1', 'layouts', 'layout.liquid'), File.join(THEME_ROOT, 'site-1', 'layouts', 'custom_layout.liquid')
0
-    sites(:first).sections.home.update_attribute :layout, 'custom_layout'
0
-    assert_site_layout_name :custom_layout, :layout
0
-  end
0
-
0
-  specify "should find fallback for site with preferred layout" do
0
-    sites(:first).sections.home.update_attribute :layout, 'custom_layout'
0
-    assert_site_layout_name :layout
0
-  end
0
-
0
-  protected
0
-    def assert_site_template_name(expected_template_name, template_type = nil, options = {})
0
-      template_type ||= expected_template_name
0
-      site            = options[:site] || sites(:first)
0
-      section         = options[:section] || site.sections.home
0
-      assert_equal(expected_template_name.nil? ? nil : site.templates[expected_template_name], site.send(:set_preferred_template, section, template_type))
0
-    end
0
-    def assert_site_layout_name(expected_template_name, template_type = nil, options = {})
0
-      template_type ||= expected_template_name
0
-      site            = options[:site] || sites(:first)
0
-      section         = options[:section] || site.sections.home
0
-      assert_equal(expected_template_name.nil? ? nil : site.templates[expected_template_name], site.send(:set_layout_template, section, template_type))
0
-    end
0
-end