Merge branch 'fix-tests'

concordion · May 5, 2015 · 21bfaf3 · 21bfaf3
2 parents 0174a33 + 4dc64aa
commit 21bfaf3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/Concordion.Test/Integration/FileTarget_Fixture.cs b/Concordion.Test/Integration/FileTarget_Fixture.cs
@@ -13,11 +13,10 @@ namespace Concordion.Test.Integration
     public class FileTarget_Fixture
     {
         [Test]
-        [Ignore("needs to be evaluated based on Java version")]
         public void Test_Can_Get_File_Path_Successfully()
         {
-            var resource = new Mock<Resource>("\\blah\\blah.txt");
-            resource.Expect(x => x.Path).Returns("\\blah\\blah.txt");
+            var resource = new Mock<Resource>("blah\\blah.txt");
+            resource.Expect(x => x.Path).Returns("blah\\blah.txt");
 
             var target = new FileTarget(@"c:\temp");
 

diff --git a/Concordion/Internal/FileTarget.cs b/Concordion/Internal/FileTarget.cs
@@ -92,15 +92,7 @@ private bool IsFreshEnough(string source)
 
         public string GetTargetPath(Resource resource)
         {
-            string path = Path.Combine(BaseDirectory, resource.Path);
-            //use html as file extension - place original extenion name at the end of file name
-            if (!path.EndsWith(".html"))
-            {
-                path = path.Remove(path.LastIndexOf('.'), 1);
-                path = path + ".html";
-
-            }
-            return path;
+            return Path.Combine(this.BaseDirectory, resource.Path);
         }
 
         #endregion