Fixed bug where including includes from an include threw an exception.
This commit is contained in:
		
							parent
							
								
									2f2e45bedf
								
							
						
					
					
						commit
						52342fe6e1
					
				| 
						 | 
					@ -35,7 +35,7 @@ module Jekyll
 | 
				
			||||||
    'server'       => false,
 | 
					    'server'       => false,
 | 
				
			||||||
    'server_port'  => 4000,
 | 
					    'server_port'  => 4000,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    'source'       => '.',
 | 
					    'source'       => Dir.pwd,
 | 
				
			||||||
    'destination'  => File.join('.', '_site'),
 | 
					    'destination'  => File.join('.', '_site'),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    'lsi'          => false,
 | 
					    'lsi'          => false,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/helper'
 | 
				
			||||||
class TestConfiguration < Test::Unit::TestCase
 | 
					class TestConfiguration < Test::Unit::TestCase
 | 
				
			||||||
  context "loading configuration" do
 | 
					  context "loading configuration" do
 | 
				
			||||||
    setup do
 | 
					    setup do
 | 
				
			||||||
      @path = './_config.yml'
 | 
					      @path = File.join(Dir.pwd, '_config.yml')
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    should "fire warning with no _config.yml" do
 | 
					    should "fire warning with no _config.yml" do
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue