From e0b8539670b9cbc24175d9816241567e9eea74ae Mon Sep 17 00:00:00 2001
From: Shinnosuke Kondo <shinn.kondo@gmail.com>
Date: Mon, 13 Jul 2015 17:47:42 -0500
Subject: [PATCH]  Added a new case for test_clearner where a directory is not
 in keep_files, but its path contains a string in keep_files.

---
 test/test_cleaner.rb | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/test/test_cleaner.rb b/test/test_cleaner.rb
index 819dbf5c..c96394d7 100644
--- a/test/test_cleaner.rb
+++ b/test/test_cleaner.rb
@@ -37,6 +37,40 @@ class TestCleaner < JekyllUnitTest
     end
   end
 
+  context "not-nested directory in keep_files and similary named directory not in keep_files" do
+    setup do
+      clear_dest
+
+      FileUtils.mkdir_p(dest_dir('.git/child_dir'))
+      FileUtils.mkdir_p(dest_dir('username.github.io'))
+      FileUtils.touch(File.join(dest_dir('.git'), 'index.html'))
+      FileUtils.touch(File.join(dest_dir('username.github.io'), 'index.html'))
+
+      @site = fixture_site
+      @site.keep_files = ['.git']
+
+      @cleaner = Cleaner.new(@site)
+      @cleaner.cleanup!
+    end
+
+    teardown do
+      FileUtils.rm_rf(dest_dir('.git'))
+      FileUtils.rm_rf(dest_dir('.username.github.io'))
+    end
+
+    should "keep the file in the directory in keep_files" do
+      assert File.exist?(File.join(dest_dir('.git'), 'index.html'))
+    end
+
+    should "delete the file in the directory not in keep_files" do
+      assert !File.exist?(File.join(dest_dir('username.github.io'), 'index.html'))
+    end
+
+    should "delete the directory not in keep_files" do
+      assert !File.exist?(dest_dir('username.github.io'))
+    end
+  end
+
   context "directory containing no files and non-empty directories" do
     setup do
       clear_dest