From 571bdd686cc09dcc0f309debd1ee6a215462f790 Mon Sep 17 00:00:00 2001 From: Lucas Jenss Date: Mon, 1 Apr 2013 12:02:15 +0200 Subject: [PATCH] Move tests for symlinked files to separate test cases --- test/test_site.rb | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/test/test_site.rb b/test/test_site.rb index 17303f7d..42643b13 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -206,17 +206,29 @@ class TestSite < Test::Unit::TestCase Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true}) end site = Site.new(Jekyll.configuration) - - site.read_directories("symlink-test") - assert_equal [], site.pages - assert_equal [], site.static_files - stub(File).symlink?('symlink.js') {true} files = %w[symlink.js] assert_equal [], site.filter_entries(files) end should "not filter symlink entries when safe mode disabled" do + stub(File).symlink?('symlink.js') {true} + files = %w[symlink.js] + assert_equal files, @site.filter_entries(files) + end + + should "not include symlinks in safe mode" do + stub(Jekyll).configuration do + Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true}) + end + site = Site.new(Jekyll.configuration) + + site.read_directories("symlink-test") + assert_equal [], site.pages + assert_equal [], site.static_files + end + + should "include symlinks in unsafe mode" do stub(Jekyll).configuration do Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => false}) end @@ -225,10 +237,6 @@ class TestSite < Test::Unit::TestCase site.read_directories("symlink-test") assert_not_equal [], site.pages assert_not_equal [], site.static_files - - stub(File).symlink?('symlink.js') {true} - files = %w[symlink.js] - assert_equal files, @site.filter_entries(files) end context 'error handling' do