Skip to content

Commit 88ce3f3

Browse files
[deploy] disable zipping of assets by default. Addresses #93.
1 parent 0536164 commit 88ce3f3

14 files changed

+93
-198
lines changed

Tests_WebCompiler/AutoPipelineNoGzipTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public void CreatePipeline()
2525
input = "../../../TestCases/Scss/test.scss";
2626
output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css" };
2727
expected_output = "../../../TestCases/MinCss/test.min.css";
28-
DeleteOutputFiles();
2928
}
3029
[Test]
3130
public void CallTest() => Test();

Tests_WebCompiler/AutoPipelineRealCompileOnlyTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public void CreatePipeline()
2121
input = "../../../TestCases/Scss/site.scss";
2222
output_files = new List<string> { "../../../TestCases/Scss/site.css" };
2323
expected_output = "../../../TestCases/Css/site.css";
24-
DeleteOutputFiles();
2524
}
2625
[Test]
2726
public void CallTest() => Test();

Tests_WebCompiler/AutoPipelineRealJustZipTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public void CreatePipeline()
2525
input = "../../../TestCases/MinCss/site.min.css";
2626
output_files = new List<string> { "../../../TestCases/MinCss/site.min.css.gz" };
2727
expected_output = "../../../TestCases/GzCss/site.min.css.gz";
28-
DeleteOutputFiles();
2928
}
3029
[Test]
3130
public void CallTest() => Test();

Tests_WebCompiler/AutoPipelineRealNoGzipTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public void CreatePipeline()
2020
input = "../../../TestCases/Scss/site.scss";
2121
output_files = new List<string> { "../../../TestCases/Scss/site.css", "../../../TestCases/Scss/site.min.css" };
2222
expected_output = "../../../TestCases/MinCss/site.min.css";
23-
DeleteOutputFiles();
2423
}
2524
[Test]
2625
public void CallTest() => Test();

Tests_WebCompiler/AutoPipelineRealTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public void CreatePipeline()
2525
input = "../../../TestCases/Scss/site.scss";
2626
output_files = new List<string> { "../../../TestCases/Scss/site.css", "../../../TestCases/Scss/site.min.css", "../../../TestCases/Scss/site.min.css.gz" };
2727
expected_output = "../../../TestCases/GzCss/site.min.css.gz";
28-
DeleteOutputFiles();
2928
}
3029
[Test]
3130
public void CallTest() => Test();

Tests_WebCompiler/AutoPipelineScssTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public void CreatePipeline()
2525
input = "../../../TestCases/Scss/test.scss";
2626
output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css", "../../../TestCases/Scss/test.min.css.gz" };
2727
expected_output = "../../../TestCases/GzCss/test.min.css.gz";
28-
DeleteOutputFiles();
2928
}
3029
[Test]
3130
public void CallTest() => Test();

Tests_WebCompiler/CompileMinifyTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public void CreatePipeline()
1919
input = "../../../TestCases/Scss/test.scss";
2020
output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css" };
2121
expected_output = "../../../TestCases/MinCss/test.min.css";
22-
DeleteOutputFiles();
2322
}
2423
[Test]
2524
public void CallTest() => Test();

Tests_WebCompiler/CompileMinifyZipMoveCleanupTests.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ public void CreatePipeline()
1616
.Then(new CssAutoprefixer(new CssAutoprefixSettings()))
1717
.Then(new CssMinifier(new CssMinifySettings { TermSemicolons = false }))
1818
.Then(new Zipper())
19-
.Then(new Place("../../../TestCases/", "../../../TestCases/Scss/"))
2019
.Then(new Cleaner());
2120
input = "../../../TestCases/Scss/test.scss";
22-
output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/test.min.css.gz" };
21+
output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css.gz" };
2322
expected_output = "../../../TestCases/GzCss/test.min.css.gz";
24-
DeleteOutputFiles();
2523
}
2624
[Test]
2725
public void CallTest() => Test();

Tests_WebCompiler/MinifyTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public void CreatePipeline()
1818
input = "../../../TestCases/Css/test.css";
1919
output_files = new List<string> { "../../../TestCases/Css/test.min.css" };
2020
expected_output = "../../../TestCases/MinCss/test.min.css";
21-
DeleteOutputFiles();
2221
}
2322
[Test]
2423
public void CallTest() => Test();

Tests_WebCompiler/TestsBase.cs

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,31 @@ public class TestsBase
1313
{
1414
protected Func<string, CompilationStep> pipeline;
1515
protected string input;
16+
protected List<string> input_files;
1617
protected List<string> output_files;
1718
protected List<string> unexpected_files;
19+
protected List<string> temporary_files;
1820
protected string expected_output;
1921
[TearDown]
22+
protected void DeleteTestCreatedFiles()
23+
{
24+
DeleteTemporaryFiles();
25+
DeleteOutputFiles();
26+
var generated_files = output_files?.Concat(temporary_files ?? Enumerable.Empty<string>()).ToList() ?? new List<string>();
27+
var dirs = generated_files.Select(Path.GetDirectoryName).Select(Path.GetFullPath).ToList();
28+
var input_dirs = (input_files ?? Enumerable.Empty<string>()).Append(input).Select(Path.GetDirectoryName).Where(d => d != null).Select(Path.GetFullPath).ToList();
29+
foreach (var dir in dirs.OrderByDescending(d => d.Count(c => c == '\\' || c == '/')))
30+
{
31+
if (input_dirs.Any(dir.StartsWith))
32+
{
33+
continue;
34+
}
35+
if (Directory.Exists(dir))
36+
{
37+
Directory.Delete(dir);
38+
}
39+
}
40+
}
2041
protected void DeleteOutputFiles()
2142
{
2243
if (output_files == null)
@@ -31,6 +52,20 @@ protected void DeleteOutputFiles()
3152
}
3253
}
3354
}
55+
protected void DeleteTemporaryFiles()
56+
{
57+
if (temporary_files == null)
58+
{
59+
return;
60+
}
61+
foreach (var tmp_file in temporary_files)
62+
{
63+
if (File.Exists(tmp_file))
64+
{
65+
File.Delete(tmp_file);
66+
}
67+
}
68+
}
3469
protected void Test()
3570
{
3671
var timestamp = ProcessFile();

0 commit comments

Comments
 (0)