Skip to content

Commit

Permalink
[deploy] disable zipping of assets by default. Addresses #93.
Browse files Browse the repository at this point in the history
  • Loading branch information
@stefanloerwald
stefanloerwald committed Sep 4, 2024
1 parent 231b742 commit 0536164
Show file tree
Hide file tree
Showing 20 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion Tests_WebCompiler/AutoPipelineNoGzipTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public void CreatePipeline()
input = "../../../TestCases/Scss/test.scss";
output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css" };
expected_output = "../../../TestCases/MinCss/test.min.css";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/AutoPipelineRealCompileOnlyTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public void CreatePipeline()
input = "../../../TestCases/Scss/site.scss";
output_files = new List<string> { "../../../TestCases/Scss/site.css" };
expected_output = "../../../TestCases/Css/site.css";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/AutoPipelineRealJustZipTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public void CreatePipeline()
input = "../../../TestCases/MinCss/site.min.css";
output_files = new List<string> { "../../../TestCases/MinCss/site.min.css.gz" };
expected_output = "../../../TestCases/GzCss/site.min.css.gz";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/AutoPipelineRealNoGzipTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public void CreatePipeline()
input = "../../../TestCases/Scss/site.scss";
output_files = new List<string> { "../../../TestCases/Scss/site.css", "../../../TestCases/Scss/site.min.css" };
expected_output = "../../../TestCases/MinCss/site.min.css";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/AutoPipelineRealTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public void CreatePipeline()
input = "../../../TestCases/Scss/site.scss";
output_files = new List<string> { "../../../TestCases/Scss/site.css", "../../../TestCases/Scss/site.min.css", "../../../TestCases/Scss/site.min.css.gz" };
expected_output = "../../../TestCases/GzCss/site.min.css.gz";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/AutoPipelineScssTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public void CreatePipeline()
input = "../../../TestCases/Scss/test.scss";
output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css", "../../../TestCases/Scss/test.min.css.gz" };
expected_output = "../../../TestCases/GzCss/test.min.css.gz";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/CompileMinifyTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public void CreatePipeline()
input = "../../../TestCases/Scss/test.scss";
output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css" };
expected_output = "../../../TestCases/MinCss/test.min.css";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/CompileMinifyZipMoveCleanupTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public void CreatePipeline()
input = "../../../TestCases/Scss/test.scss";
output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/test.min.css.gz" };
expected_output = "../../../TestCases/GzCss/test.min.css.gz";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/CompileMinifyZipMoveNowhereCleanupTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public void CreatePipeline()
input = "../../../TestCases/Scss/test.scss";
output_files = new List<string> { "../../../TestCases/Scss/test.min.css.gz" };
expected_output = "../../../TestCases/GzCss/test.min.css.gz";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/CompileMinifyZipTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public void CreatePipeline()
input = "../../../TestCases/Scss/test.scss";
output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css", "../../../TestCases/Scss/test.min.css.gz" };
expected_output = "../../../TestCases/GzCss/test.min.css.gz";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/CompileZipTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public void CreatePipeline()
input = "../../../TestCases/Scss/test.scss";
output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.css.gz" };
expected_output = "../../../TestCases/GzCss/test.css.gz";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/MinifyClassVariablesJsTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public void CreatePipeline()
input = "../../../TestCases/Js/classVariables.js";
output_files = new List<string> { "../../../TestCases/Js/classVariables.min.js" };
expected_output = "../../../TestCases/MinJs/classVariables.min.js";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/MinifyJsTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public void CreatePipeline()
input = "../../../TestCases/Js/test.js";
output_files = new List<string> { "../../../TestCases/Js/test.min.js" };
expected_output = "../../../TestCases/MinJs/test.min.js";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/MinifyTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void CreatePipeline()
input = "../../../TestCases/Css/test.css";
output_files = new List<string> { "../../../TestCases/Css/test.min.css" };
expected_output = "../../../TestCases/MinCss/test.min.css";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/NoPreserveTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public void CreatePipeline()
output_files = new List<string> { "../../../output/test.min.css" };
unexpected_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css" };
expected_output = "../../../TestCases/MinCss/test.min.css";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
/// <summary>
/// Even if we do not preserve the intermediate files, the output file should only be changed, if the source file changed.
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/RecompileTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public void CreatePipeline()
input = "../../../TestCases/Scss/test.scss";
output_files = new List<string> { "../../../TestCases/Scss/test.css", "../../../TestCases/Scss/test.min.css" };
expected_output = "../../../TestCases/MinCss/test.min.css";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public async Task CallTest()
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/ScssTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void CreatePipeline()
input = "../../../TestCases/Scss/test.scss";
output_files = new List<string> { "../../../TestCases/Scss/test.css" };
expected_output = "../../../TestCases/Css/test.css";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/TestsBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class TestsBase
protected List<string> unexpected_files;
protected string expected_output;
[TearDown]
protected void DeleteTemporaryFiles()
protected void DeleteOutputFiles()
{
if (output_files == null)
{
Expand Down
44 changes: 22 additions & 22 deletions Tests_WebCompiler/WholeProgramTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void UseConfig()
File.Delete(tmp_file);
}
}
DeleteTemporaryFiles();
DeleteOutputFiles();
File.WriteAllText("webcompilerconfiguration.json", DefaultConfigFile);
Assert.That(Program.Main("../../../TestCases/Scss/site.scss", "-c", "webcompilerconfiguration.json"), Is.EqualTo(0));
File.Delete("webcompilerconfiguration.json");
Expand All @@ -124,7 +124,7 @@ public void UseConfig()
{
Assert.That(File.Exists(non_output_file), Is.False, $"Non-Output {non_output_file} should NOT exist");
}
DeleteTemporaryFiles();
DeleteOutputFiles();
foreach (var tmp_file in temporary_files)
{
Assert.That(File.Exists(tmp_file), Is.True, $"Temporary {tmp_file} should exist");
Expand Down Expand Up @@ -159,7 +159,7 @@ public void UseConfigIgnoreFile()
File.Delete(tmp_file);
}
}
DeleteTemporaryFiles();
DeleteOutputFiles();
File.WriteAllText("webcompilerconfiguration.json", ConfigFileIgnoringSiteScss);
Assert.That(Program.Main("../../../TestCases/Scss/site.scss", "-c", "webcompilerconfiguration.json"), Is.EqualTo(0));
File.Delete("webcompilerconfiguration.json");
Expand All @@ -171,7 +171,7 @@ public void UseConfigIgnoreFile()
{
Assert.That(File.Exists(non_output_file), Is.False, $"Non-Output {non_output_file} should NOT exist");
}
DeleteTemporaryFiles();
DeleteOutputFiles();
foreach (var tmp_file in temporary_files)
{
Assert.That(File.Exists(tmp_file), Is.True, $"Temporary {tmp_file} should exist");
Expand Down Expand Up @@ -204,15 +204,15 @@ public void UseConfigWithOverride()
File.Delete(tmp_file);
}
}
DeleteTemporaryFiles();
DeleteOutputFiles();
File.WriteAllText("webcompilerconfiguration.json", DefaultConfigFile);
Assert.That(Program.Main("../../../TestCases/Scss/site.scss", "-c", "webcompilerconfiguration.json", "-m", "enable", "-z", "enable"), Is.EqualTo(0));
File.Delete("webcompilerconfiguration.json");
foreach (var output_file in output_files)
{
Assert.That(File.Exists(output_file), Is.True, $"Output {output_file} should exist");
}
DeleteTemporaryFiles();
DeleteOutputFiles();
foreach (var tmp_file in temporary_files)
{
Assert.That(File.Exists(tmp_file), Is.True, $"Temporary {tmp_file} should exist");
Expand Down Expand Up @@ -250,7 +250,7 @@ public void RejectOutdatedConfig()
File.Delete(tmp_file);
}
}
DeleteTemporaryFiles();
DeleteOutputFiles();
File.WriteAllText("webcompilerconfiguration.json", OutdatedConfigFile);
Assert.That(Program.Main("../../../TestCases/Scss/site.scss", "-c", "webcompilerconfiguration.json"), Is.Not.EqualTo(0));
File.Delete("webcompilerconfiguration.json");
Expand All @@ -262,7 +262,7 @@ public void RejectOutdatedConfig()
{
Assert.That(File.Exists(non_output_file), Is.False, $"Non-Output {non_output_file} should NOT exist");
}
DeleteTemporaryFiles();
DeleteOutputFiles();
foreach (var tmp_file in temporary_files)
{
Assert.That(File.Exists(tmp_file), Is.False, $"Temporary {tmp_file} should exist");
Expand Down Expand Up @@ -302,7 +302,7 @@ public void UseConfigWithRecursion()
File.Delete(tmp_file);
}
}
DeleteTemporaryFiles();
DeleteOutputFiles();
File.WriteAllText("webcompilerconfiguration.json", DefaultConfigFile);
Assert.That(Program.Main("../../../TestCases/Scss/sub", "-r", "-c", "webcompilerconfiguration.json"), Is.EqualTo(0));
File.Delete("webcompilerconfiguration.json");
Expand All @@ -314,7 +314,7 @@ public void UseConfigWithRecursion()
{
Assert.That(File.Exists(non_output_file), Is.False, $"Non-Output {non_output_file} should NOT exist");
}
DeleteTemporaryFiles();
DeleteOutputFiles();
foreach (var tmp_file in temporary_files)
{
Assert.That(File.Exists(tmp_file), $"Temporary {tmp_file} should exist");
Expand Down Expand Up @@ -352,13 +352,13 @@ public void OutputAtSamePlace()
File.Delete(tmp_file);
}
}
DeleteTemporaryFiles();
DeleteOutputFiles();
Assert.That(Program.Main("../../../TestCases/Js/test.js", "../../../TestCases/MinCss/site.min.css", "-r", "../../../TestCases/Css", "-z", "enable"), Is.EqualTo(0));
foreach (var output_file in output_files)
{
Assert.That(File.Exists(output_file), $"Output {output_file} should exist");
}
DeleteTemporaryFiles();
DeleteOutputFiles();
foreach (var tmp_file in temporary_files)
{
Assert.That(File.Exists(tmp_file), $"Temporary {tmp_file} should exist");
Expand Down Expand Up @@ -396,13 +396,13 @@ public void OutputAtSamePlaceUnnecessarilySpecified()
File.Delete(tmp_file);
}
}
DeleteTemporaryFiles();
DeleteOutputFiles();
Assert.That(Program.Main("../../../TestCases/Js/test.js", "../../../TestCases/MinCss/site.min.css", "-r", "../../../TestCases/Css", "-o", "../../../TestCases", "-z", "enable"), Is.EqualTo(0));
foreach (var output_file in output_files)
{
Assert.That(File.Exists(output_file), $"Output {output_file} should exist");
}
DeleteTemporaryFiles();
DeleteOutputFiles();
foreach (var tmp_file in temporary_files)
{
Assert.That(File.Exists(tmp_file), $"Temporary {tmp_file} should exist");
Expand Down Expand Up @@ -445,13 +445,13 @@ public void OutputWithPreservation()
File.Delete(tmp_file);
}
}
DeleteTemporaryFiles();
DeleteOutputFiles();
Assert.That(Program.Main("../../../TestCases/Js/test.js", "../../../TestCases/MinCss/site.min.css", "-r", "../../../TestCases/Css", "-o", "../../../output/path", "-z", "enable"), Is.EqualTo(0));
foreach (var output_file in output_files)
{
Assert.That(File.Exists(output_file), $"Output {output_file} should exist");
}
DeleteTemporaryFiles();
DeleteOutputFiles();
foreach (var tmp_file in temporary_files)
{
Assert.That(File.Exists(tmp_file), $"Temporary {tmp_file} should exist");
Expand Down Expand Up @@ -500,9 +500,9 @@ public void OutputWithoutPreserve()
File.Delete(tmp_file);
}
}
DeleteTemporaryFiles();
DeleteOutputFiles();
Assert.That(Program.Main("../../../TestCases/Js/test.js", "../../../TestCases/MinCss/site.min.css", "-r", "../../../TestCases/Css", "-o", "../../../output/path/", "-p", "d"), Is.EqualTo(0));
DeleteTemporaryFiles();
DeleteOutputFiles();
foreach (var tmp_file in temporary_files)
{
Assert.That(File.Exists(tmp_file), Is.False, $"Temporary {tmp_file} should not exist");
Expand Down Expand Up @@ -533,13 +533,13 @@ public void OutputPathNotFullyUsed()
File.Delete(tmp_file);
}
}
DeleteTemporaryFiles();
DeleteOutputFiles();
_ = Directory.CreateDirectory("Css");
File.Copy("../../../TestCases/Css/site.css", "Css/site.css", overwrite: true);
Assert.That(Program.Main("Css/site.css", "-o", "wwwroot/css", "-p", "d", "-z", "d"), Is.EqualTo(0));
Assert.That(File.Exists(output_files.Last()), "output needs to exist");
File.Delete("Css/site.css");
DeleteTemporaryFiles();
DeleteOutputFiles();
foreach (var tmp_file in temporary_files)
{
Assert.That(File.Exists(tmp_file), Is.False, $"Temporary {tmp_file} should not exist");
Expand Down Expand Up @@ -594,7 +594,7 @@ public void ScssFilesAndFoldersConfiguredToBeIgnoredAreIgnored()
File.Delete(tmp_file);
}
}
DeleteTemporaryFiles();
DeleteOutputFiles();

var config = @"{
""Minifiers"": {
Expand Down Expand Up @@ -634,7 +634,7 @@ public void ScssFilesAndFoldersConfiguredToBeIgnoredAreIgnored()
{
Assert.That(File.Exists(non_output_file), Is.False, $"Non-Output {non_output_file} should NOT exist");
}
DeleteTemporaryFiles();
DeleteOutputFiles();
foreach (var tmp_file in temporary_files)
{
Assert.That(File.Exists(tmp_file), $"Temporary {tmp_file} should exist");
Expand Down
2 changes: 1 addition & 1 deletion Tests_WebCompiler/ZipperTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public void CreatePipeline()
input = "../../../TestCases/Css/test.css";
output_files = new List<string> { "../../../TestCases/Css/test.css.gz" };
expected_output = "../../../TestCases/GzCss/test.css.gz";
DeleteTemporaryFiles();
DeleteOutputFiles();
}
[Test]
public void CallTest() => Test();
Expand Down

0 comments on commit 0536164

Please sign in to comment.