Stubbing out configuration with RR and making sure include tags get rendered
This commit is contained in:
		
							parent
							
								
									1423ea91a0
								
							
						
					
					
						commit
						ab262a2ab5
					
				|  | @ -11,7 +11,7 @@ module Jekyll | ||||||
|         return "Include file '#{@file}' contains invalid characters or sequences" |         return "Include file '#{@file}' contains invalid characters or sequences" | ||||||
|       end |       end | ||||||
| 
 | 
 | ||||||
|       Dir.chdir(File.join('.', '_includes')) do |       Dir.chdir(File.join('.', context.registers[:site].source, '_includes')) do | ||||||
|         choices = Dir['**/*'].reject { |x| File.symlink?(x) } |         choices = Dir['**/*'].reject { |x| File.symlink?(x) } | ||||||
|         if choices.include?(@file) |         if choices.include?(@file) | ||||||
|           source = File.read(@file) |           source = File.read(@file) | ||||||
|  |  | ||||||
|  | @ -3,10 +3,13 @@ require File.join(File.dirname(__FILE__), *%w[.. lib jekyll]) | ||||||
| require 'test/unit' | require 'test/unit' | ||||||
| require 'redgreen' | require 'redgreen' | ||||||
| require 'shoulda' | require 'shoulda' | ||||||
|  | require 'rr' | ||||||
| 
 | 
 | ||||||
| include Jekyll | include Jekyll | ||||||
| 
 | 
 | ||||||
| class Test::Unit::TestCase | class Test::Unit::TestCase | ||||||
|  |   include RR::Adapters::TestUnit | ||||||
|  | 
 | ||||||
|   def dest_dir |   def dest_dir | ||||||
|     File.join(File.dirname(__FILE__), *%w[dest]) |     File.join(File.dirname(__FILE__), *%w[dest]) | ||||||
|   end |   end | ||||||
|  |  | ||||||
|  | @ -13,9 +13,8 @@ class TestPost < Test::Unit::TestCase | ||||||
|   context "A Post" do |   context "A Post" do | ||||||
|     setup do |     setup do | ||||||
|       clear_dest |       clear_dest | ||||||
|       @source = File.join(File.dirname(__FILE__), *%w[source]) |       stub(Jekyll).configuration { Jekyll::DEFAULTS } | ||||||
|       @configuration = Jekyll.configuration 'source' => @source, 'destination' => dest_dir |       @site = Site.new(Jekyll.configuration) | ||||||
|       @site = Site.new(@configuration) |  | ||||||
|     end |     end | ||||||
| 
 | 
 | ||||||
|     should "ensure valid posts are valid" do |     should "ensure valid posts are valid" do | ||||||
|  | @ -126,7 +125,7 @@ class TestPost < Test::Unit::TestCase | ||||||
|           assert_equal "<<< <p>url: /2008/11/21/complex.html<br />\ndate: #{Time.parse("2008-11-21")}<br />\nid: /2008/11/21/complex</p> >>>", post.output |           assert_equal "<<< <p>url: /2008/11/21/complex.html<br />\ndate: #{Time.parse("2008-11-21")}<br />\nid: /2008/11/21/complex</p> >>>", post.output | ||||||
|         end |         end | ||||||
| 
 | 
 | ||||||
|         should_eventually "include templates" do |         should "include templates" do | ||||||
|           post = setup_post("2008-12-13-include.markdown") |           post = setup_post("2008-12-13-include.markdown") | ||||||
|           post.site.source = File.join(File.dirname(__FILE__), 'source') |           post.site.source = File.join(File.dirname(__FILE__), 'source') | ||||||
|           do_render(post) |           do_render(post) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue