0
@@ -128,12 +128,11 @@ task :aok => [:specs, :rcov]
0
 
0
 require 'open3'
0
 
0
-desc "Run all specs"
0
-task :specs do
0
+def run_specs(glob)
0
   require "optparse"
0
   require "spec"
0
   examples, failures, errors, pending = 0, 0, 0, 0
0
-  Dir["spec/**/*_spec.rb"].each do |spec|
0
+  Dir[glob].each do |spec|
0
     response = Open3.popen3("spec #{File.expand_path(spec)} -f s -c") do |i,o,e|
0
       while out = o.gets
0
         STDOUT.puts out
0
@@ -155,67 +154,22 @@ task :specs do
0
     print "\e[31m"
0
   end
0
   puts "#{examples} examples, #{failures} failures, #{errors} errors, #{pending} pending"
0
-  print "\e[0m"
0
+  print "\e[0m"  
0
+end
0
+
0
+desc "Run all specs"
0
+task :specs do
0
+  run_specs("spec/**/*_spec.rb")
0
 end
0
 
0
 desc "Run private specs"
0
 task "specs:private" do
0
-  require "optparse"
0
-  require "spec"
0
-  examples, failures, errors, pending = 0, 0, 0, 0
0
-  Dir["spec/private/**/*_spec.rb"].each do |spec|
0
-    response = Open3.popen3("spec #{File.expand_path(spec)} -f s -c") do |i,o,e|
0
-      while out = o.gets
0
-        STDOUT.puts out
0
-        STDOUT.flush
0
-        if out =~ /\d+ example/
0
-          e, f, p = out.match(/(\d+) examples?, (\d+) failures?(?:, (\d+) pending?)?/)[1..-1]
0
-          examples += e.to_i; failures += f.to_i; pending += p.to_i          
0
-        end
0
-      end
0
-      errors += 1 if e.is_a?(IO)
0
-      STDOUT.puts e.read if e.is_a?(IO)
0
-    end
0
-  end
0
-  puts
0
-  puts "*** TOTALS ***"
0
-  if failures == 0
0
-    print "\e[32m"
0
-  else
0
-    print "\e[31m"
0
-  end
0
-  puts "#{examples} examples, #{failures} failures, #{errors} errors, #{pending} pending"
0
-  print "\e[0m"
0
+  run_specs("spec/private/**/*_spec.rb")
0
 end
0
 
0
 desc "Run public specs"
0
 task "specs:public" do
0
-  require "optparse"
0
-  require "spec"
0
-  examples, failures, errors, pending = 0, 0, 0, 0
0
-  Dir["spec/public/**/*_spec.rb"].each do |spec|
0
-    response = Open3.popen3("spec #{File.expand_path(spec)} -f s -c") do |i,o,e|
0
-      while out = o.gets
0
-        STDOUT.puts out
0
-        STDOUT.flush
0
-        if out =~ /\d+ example/
0
-          e, f, p = out.match(/(\d+) examples?, (\d+) failures?(?:, (\d+) pending?)?/)[1..-1]
0
-          examples += e.to_i; failures += f.to_i; pending += p.to_i          
0
-        end
0
-      end
0
-      errors += 1 if e.is_a?(IO)
0
-      STDOUT.puts e.read if e.is_a?(IO)
0
-    end
0
-  end
0
-  puts
0
-  puts "*** TOTALS ***"
0
-  if failures == 0
0
-    print "\e[32m"
0
-  else
0
-    print "\e[31m"
0
-  end
0
-  puts "#{examples} examples, #{failures} failures, #{errors} errors, #{pending} pending"
0
-  print "\e[0m"
0
+  run_specs("spec/public/**/*_spec.rb")
0
 end
0
 
0
 desc "Run coverage suite"

0
@@ -260,7 +260,7 @@ module Merb::RenderMixin
0
     
0
     # If a layout was provided, throw an error if it's not found
0
     if layout
0
-      template = _template_location(layout, layout.index(".") ? content_type : nil, "layout")      
0
+      template = _template_location(layout, layout.index(".") ? nil : content_type, "layout")      
0
       Merb::Template.template_for(_template_root / template) ||
0
         (raise TemplateNotFound, "No layout found at #{_template_root / template}.*")
0
     

0
@@ -20,11 +20,11 @@ module Merb::Test::Fixtures::Controllers
0
 
0
   class DisplayHtmlDefault < Display; end
0
 
0
-  class DisplayClassProvides < Display; 
0
+  class DisplayClassProvides < Display
0
     provides :xml
0
   end
0
 
0
-  class DisplayLocalProvides < Display; 
0
+  class DisplayLocalProvides < Display
0
     
0
     def index
0
       @obj = SomeModel.new
0
@@ -33,7 +33,7 @@ module Merb::Test::Fixtures::Controllers
0
     end
0
   end
0
   
0
-  class DisplayWithTemplate < DisplayClassProvides
0
+  class DisplayWithTemplate < Display
0
     layout :custom
0
   end
0
   

0
@@ -3,20 +3,17 @@ require File.join(File.dirname(__FILE__), "spec_helper")
0
 describe Merb::Controller, " displaying objects based on mime type" do
0
 
0
   before do
0
-    Merb.push_path(:layout, File.dirname(__FILE__) / "controllers" / "views" / "layouts")    
0
     Merb::Router.prepare do |r|
0
       r.default_routes
0
     end
0
   end
0
   
0
-  it "should default the mime-type to HTML" do
0
-    #dispatch_to(Merb::Test::Fixtures::Controllers::DisplayHtmlDefault, :index).body.should == "HTML: Default"
0
-    pending "Decide if there will be a to_html method on model instances?"
0
+  it "should default the mime-type to HTML (and raise since there's no to_html)" do
0
+    running { dispatch_to(Merb::Test::Fixtures::Controllers::DisplayHtmlDefault, :index) }.should raise_error(Merb::ControllerExceptions::NotAcceptable)
0
   end
0
   
0
   it "should use a template if specified" do
0
-    # dispatch_to(Merb::Test::Fixtures::Controllers::DisplayWithTemplate, :index).body.should == "HTML: Default"
0
-    pending "Decide if there will be a to_html method on model instances?"
0
+    dispatch_to(Merb::Test::Fixtures::Controllers::DisplayWithTemplate, :index).body.should == "Custom: Template"
0
   end
0
 
0
   it "should use other mime-types if they are provided on the class level" do