From ddbd7fa681a80ae640bb87499881a60ccf000b5f Mon Sep 17 00:00:00 2001 From: Albert Hajdu Date: Fri, 20 May 2016 12:03:41 +0200 Subject: [PATCH 1/8] Opening orchard-upgrade-1.10.1 branch --HG-- branch : orchard-upgrade-1.10.1 From 47d6964565e78f24743853211b488dc0e33a7246 Mon Sep 17 00:00:00 2001 From: Albert Hajdu Date: Fri, 20 May 2016 12:11:45 +0200 Subject: [PATCH 2/8] Upgrading to Orchard 1.10.1 --HG-- branch : orchard-upgrade-1.10.1 --- Module.txt | 2 +- Piedone.Combinator.Tests/Piedone.Combinator.Tests.csproj | 2 +- Piedone.Combinator.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Module.txt b/Module.txt index dc7f283..3c0bfd5 100644 --- a/Module.txt +++ b/Module.txt @@ -3,7 +3,7 @@ AntiForgery: enabled Author: Piedone Website: https://github.com/Lombiq/Combinator Version: 2.0 -OrchardVersion: 1.10 +OrchardVersion: 1.10.1 Description: Combines and minifies external stylesheets and javascript files. Minifications uses the YUI Compressor (http://yuicompressor.codeplex.com/), the original code for sprite generation is from Sprite Generator (http://spritegenerator.codeplex.com/) and stylesheets are parsed with ExCSS (https://github.com/TylerBrinks/ExCSS). Features: Piedone.Combinator: diff --git a/Piedone.Combinator.Tests/Piedone.Combinator.Tests.csproj b/Piedone.Combinator.Tests/Piedone.Combinator.Tests.csproj index 594eb16..cdfcc49 100644 --- a/Piedone.Combinator.Tests/Piedone.Combinator.Tests.csproj +++ b/Piedone.Combinator.Tests/Piedone.Combinator.Tests.csproj @@ -1,4 +1,4 @@ - + Debug diff --git a/Piedone.Combinator.csproj b/Piedone.Combinator.csproj index c89a554..9be4987 100644 --- a/Piedone.Combinator.csproj +++ b/Piedone.Combinator.csproj @@ -1,4 +1,4 @@ - + From 9cb7d9792c7cc362a2b81404c6c706484beddbc1 Mon Sep 17 00:00:00 2001 From: Albert Hajdu Date: Fri, 20 May 2016 16:54:14 +0200 Subject: [PATCH 3/8] Opening branch --HG-- branch : issue/BTLR-63 From f692296424a98741b3022c15a1ef5f164fdbc98f Mon Sep 17 00:00:00 2001 From: Albert Hajdu Date: Mon, 23 May 2016 09:14:23 +0200 Subject: [PATCH 4/8] Closing branch --HG-- branch : orchard-upgrade-1.10.1 From a640d47a05072aca846b9dbb9427f57e3e5d65f7 Mon Sep 17 00:00:00 2001 From: Albert Hajdu Date: Wed, 25 May 2016 15:17:31 +0200 Subject: [PATCH 5/8] Fixing tests by adding the correct stub --HG-- branch : issue/BTLR-63 --- Piedone.Combinator.Tests/Services/CacheFileServiceTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Piedone.Combinator.Tests/Services/CacheFileServiceTests.cs b/Piedone.Combinator.Tests/Services/CacheFileServiceTests.cs index 2be1f31..273e3d6 100644 --- a/Piedone.Combinator.Tests/Services/CacheFileServiceTests.cs +++ b/Piedone.Combinator.Tests/Services/CacheFileServiceTests.cs @@ -50,7 +50,7 @@ public override void Register(ContainerBuilder builder) builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>)); builder.RegisterInstance(_clock).As(); builder.RegisterInstance(new Mock().Object).As(); - builder.RegisterType().As(); + builder.RegisterType().As(); builder.Register(c => { From 3b9419dd172a9f206d970b5b94b854c225170890 Mon Sep 17 00:00:00 2001 From: Albert Hajdu Date: Mon, 30 May 2016 12:09:09 +0200 Subject: [PATCH 6/8] Removing unused reference --HG-- branch : issue/BTLR-63 --- Piedone.Combinator.Tests/Piedone.Combinator.Tests.csproj | 9 +++------ Piedone.Combinator.Tests/packages.config | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Piedone.Combinator.Tests/Piedone.Combinator.Tests.csproj b/Piedone.Combinator.Tests/Piedone.Combinator.Tests.csproj index cdfcc49..1331336 100644 --- a/Piedone.Combinator.Tests/Piedone.Combinator.Tests.csproj +++ b/Piedone.Combinator.Tests/Piedone.Combinator.Tests.csproj @@ -1,4 +1,4 @@ - + Debug @@ -12,7 +12,8 @@ Piedone.Combinator.Tests v4.5.2 512 - + + 3.5 publish\ @@ -84,10 +85,6 @@ ..\..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll True - - ..\..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True - ..\..\..\..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll True diff --git a/Piedone.Combinator.Tests/packages.config b/Piedone.Combinator.Tests/packages.config index c1d48ae..7431428 100644 --- a/Piedone.Combinator.Tests/packages.config +++ b/Piedone.Combinator.Tests/packages.config @@ -2,7 +2,6 @@ - \ No newline at end of file From 61c4e75f0356d99cb9d369429a2cf0aeef5744bf Mon Sep 17 00:00:00 2001 From: Albert Hajdu Date: Sun, 12 Jun 2016 16:05:59 +0200 Subject: [PATCH 7/8] Adding comment to the failing tests --HG-- branch : issue/BTLR-63 --- .../Services/CacheFileServiceTests.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Piedone.Combinator.Tests/Services/CacheFileServiceTests.cs b/Piedone.Combinator.Tests/Services/CacheFileServiceTests.cs index 273e3d6..bf90897 100644 --- a/Piedone.Combinator.Tests/Services/CacheFileServiceTests.cs +++ b/Piedone.Combinator.Tests/Services/CacheFileServiceTests.cs @@ -74,13 +74,16 @@ public override void Init() SaveTestResources(); } - + + /// + /// This test fails with FileLoadException because of this issue: https://github.com/OrchardCMS/Orchard/issues/6933 + /// [Test] public void SaveShouldBePersistent() { // Todo: adjust mocking that CombinatorResource's context can be filled and so the GetCombinedResources() method tested // if it returns the correct data - + var storageProvider = _container.Resolve(); Assert.That(storageProvider.GetFile(storageProvider.Combine("_PiedoneModules", storageProvider.Combine("Combinator", storageProvider.Combine("Styles", CacheFileService.ConvertFingerprintToStorageFormat(_cssResourcesFingerprint) + "-1.css")))), Is.Not.Null); @@ -94,6 +97,9 @@ public void SaveShouldBePersistent() Assert.That(_cacheFileService.Exists(_cssResourcesFingerprint, new CombinatorSettings()), Is.True); } + /// + /// This test fails with FileLoadException because of this issue: https://github.com/OrchardCMS/Orchard/issues/6933 + /// [Test] public void EmtpyShouldDeleteAll() { @@ -224,12 +230,12 @@ public bool FolderExists(string path) { return CreatedFiles.Any(p => p.StartsWith(path)); } - + public string GetStoragePath(string url) { return FileSystemStorageProvider.GetStoragePath(url); } - + public void CopyFile(string originalPath, string duplicatePath) { FileSystemStorageProvider.CopyFile(originalPath, duplicatePath); From 55c337ae3ac5a7fe919c75d9d850afd0fcfe78a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Sun, 12 Jun 2016 20:15:18 +0200 Subject: [PATCH 8/8] Close branch issue/BTLR-63 --HG-- branch : issue/BTLR-63