From e55dbb0db8586d2204f1aac77655d6d989f976c3 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 26 May 2023 09:12:14 +0200 Subject: [PATCH 1/5] Changed Loader and Setter delegates of the LazyFields of LocalizationPart to (#8693) use Store/Retrieve implementations rather than go directly to the Record. --- .../Handlers/LocalizationPartHandler.cs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Handlers/LocalizationPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Localization/Handlers/LocalizationPartHandler.cs index bd4baa765..138287afe 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Handlers/LocalizationPartHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Localization/Handlers/LocalizationPartHandler.cs @@ -31,22 +31,26 @@ namespace Orchard.Localization.Handlers { protected static void PropertySetHandlers(ActivatedContentContext context, LocalizationPart localizationPart) { localizationPart.CultureField.Setter(cultureRecord => { - localizationPart.Record.CultureId = cultureRecord.Id; + localizationPart.Store(r => r.CultureId, + cultureRecord != null ? cultureRecord.Id : 0); return cultureRecord; }); - + localizationPart.MasterContentItemField.Setter(masterContentItem => { - localizationPart.Record.MasterContentItemId = masterContentItem.ContentItem.Id; + localizationPart.Store(r => r.MasterContentItemId, + masterContentItem.ContentItem.Id); return masterContentItem; - }); + }); } protected void LazyLoadHandlers(LocalizationPart localizationPart) { - localizationPart.CultureField.Loader(() => - _cultureManager.GetCultureById(localizationPart.Record.CultureId)); + localizationPart.CultureField.Loader(() => + _cultureManager.GetCultureById( + localizationPart.Retrieve(r => r.CultureId))); localizationPart.MasterContentItemField.Loader(() => - _contentManager.Get(localizationPart.Record.MasterContentItemId, VersionOptions.AllVersions)); + _contentManager.Get( + localizationPart.Retrieve(r => r.MasterContentItemId), VersionOptions.AllVersions)); } } } From a215e606b7014b26986c7e4c8ffd0fab0c0148bb Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 26 May 2023 09:16:04 +0200 Subject: [PATCH 2/5] Added dictionaries to memorize results of queries and avoid repeating them (#8690) within a request. --- .../Services/DefaultMenuProvider.cs | 20 ++++++++++++---- .../Navigation/TaxonomyNavigationProvider.cs | 23 +++++++++++++++---- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/Orchard.Web/Core/Navigation/Services/DefaultMenuProvider.cs b/src/Orchard.Web/Core/Navigation/Services/DefaultMenuProvider.cs index 5a25e62d7..b33ba88da 100644 --- a/src/Orchard.Web/Core/Navigation/Services/DefaultMenuProvider.cs +++ b/src/Orchard.Web/Core/Navigation/Services/DefaultMenuProvider.cs @@ -1,4 +1,5 @@ -using System.Web; +using System.Collections.Generic; +using System.Web; using Orchard.ContentManagement; using Orchard.ContentManagement.Aspects; using Orchard.Core.Navigation.Models; @@ -11,13 +12,22 @@ namespace Orchard.Core.Navigation.Services { public DefaultMenuProvider(IContentManager contentManager) { _contentManager = contentManager; + + _menuPartsMemory = new Dictionary>(); } + // Prevent doing the same query for MenuParts more than once on a same request + // in case we are building the same menu several times. + private Dictionary> _menuPartsMemory; + public void GetMenu(IContent menu, NavigationBuilder builder) { - var menuParts = _contentManager - .Query() - .Where(x => x.MenuId == menu.Id) - .List(); + if (!_menuPartsMemory.ContainsKey(menu.Id)) { + _menuPartsMemory[menu.Id] = _contentManager + .Query() + .Where(x => x.MenuId == menu.Id) + .List(); + } + var menuParts = _menuPartsMemory[menu.Id]; foreach (var menuPart in menuParts) { if (menuPart != null) { diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Navigation/TaxonomyNavigationProvider.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Navigation/TaxonomyNavigationProvider.cs index 6ca41931c..681e67095 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Navigation/TaxonomyNavigationProvider.cs +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Navigation/TaxonomyNavigationProvider.cs @@ -22,8 +22,16 @@ namespace Orchard.Taxonomies.Navigation { ITaxonomyService taxonomyService) { _contentManager = contentManager; _taxonomyService = taxonomyService; + + _termsMemory = new Dictionary(); } + // Prevent doing the same query for terms more than once on a same request + // in case we are building menus from the same starting taxonomies. Key is a + // string to "combine" the Id of the root TermPart and the flag telling to + // add that root to the results. + private Dictionary _termsMemory; + public IEnumerable Filter(IEnumerable items) { foreach (var item in items) { @@ -34,14 +42,21 @@ namespace Orchard.Taxonomies.Navigation { var rootTerm = _taxonomyService.GetTerm(taxonomyNavigationPart.TermId); TermPart[] allTerms; - + string memoryKey; if (rootTerm != null) { - // if DisplayRootTerm is specified add it to the menu items to render - allTerms = _taxonomyService.GetChildren(rootTerm, taxonomyNavigationPart.DisplayRootTerm).ToArray(); + memoryKey = $"{rootTerm.Id}_{taxonomyNavigationPart.DisplayRootTerm}"; + if (!_termsMemory.ContainsKey(memoryKey)) { + // if DisplayRootTerm is specified add it to the menu items to render + _termsMemory[memoryKey] = _taxonomyService.GetChildren(rootTerm, taxonomyNavigationPart.DisplayRootTerm).ToArray(); + } } else { - allTerms = _taxonomyService.GetTerms(taxonomyNavigationPart.TaxonomyId).ToArray(); + memoryKey = taxonomyNavigationPart.TaxonomyId.ToString(); + if (!_termsMemory.ContainsKey(memoryKey)) { + _termsMemory[memoryKey] = _taxonomyService.GetTerms(taxonomyNavigationPart.TaxonomyId).ToArray(); + } } + allTerms = _termsMemory[memoryKey]; var rootLevel = rootTerm != null ? rootTerm.GetLevels() From 9122abbdec97748fa8fb19ed5b66b3bde2c1495a Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 26 May 2023 09:16:57 +0200 Subject: [PATCH 3/5] Added missing module dependency (#8694) https://github.com/OrchardCMS/Orchard/blob/610b3c4f53ce9a4bdbe26a5a095bd606bfabc811/src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ModuleStep.cs#L14 if feature PackagingServices is not enabled, `ModuleStep` cannot be constructed by Autofac, causing several things to fail (e.g. import/export). --- src/Orchard.Web/Modules/Orchard.Recipes/Module.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Module.txt b/src/Orchard.Web/Modules/Orchard.Recipes/Module.txt index a9cd52ec6..37e60333f 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Module.txt @@ -7,3 +7,4 @@ OrchardVersion: 1.10.3 Description: Provides Orchard Recipes. FeatureDescription: Implementation of Orchard recipes. Category: Core +Dependencies: PackagingServices From bf0c71c4f09275d749fc98c695a76edb41e33df5 Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Mon, 19 Jun 2023 10:04:24 +0200 Subject: [PATCH 4/5] Added lock on md5 variable to avoid concurrent hash generations for feature list. (#8697) --- .../Extensions/ExtensionManager.cs | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Orchard/Environment/Extensions/ExtensionManager.cs b/src/Orchard/Environment/Extensions/ExtensionManager.cs index 0c275be01..19420c45c 100644 --- a/src/Orchard/Environment/Extensions/ExtensionManager.cs +++ b/src/Orchard/Environment/Extensions/ExtensionManager.cs @@ -25,7 +25,7 @@ namespace Orchard.Environment.Extensions { private readonly ICacheManager _cacheManager; private readonly IParallelCacheContext _parallelCacheContext; private readonly IEnumerable _loaders; - + public Localizer T { get; set; } public ILogger Logger { get; set; } @@ -107,14 +107,16 @@ namespace Orchard.Environment.Extensions { Logger.Information("Loading features"); // generate a cachekey by hashing the ids of all feature descriptors - var cacheKey = BitConverter.ToString( - _md5.ComputeHash( - Encoding.UTF8.GetBytes( - string.Join(";", - featureDescriptors - .Select(fd => fd.Id) - .OrderBy(x => x))))); - + string cacheKey; + lock (_md5) { + cacheKey = BitConverter.ToString( + _md5.ComputeHash( + Encoding.UTF8.GetBytes( + string.Join(";", + featureDescriptors + .Select(fd => fd.Id) + .OrderBy(x => x))))); + } var result = _cacheManager.Get(cacheKey, true, From 731b223f8277f71f65b1a2137fadac9ed97d6758 Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Wed, 28 Jun 2023 15:11:46 +0200 Subject: [PATCH 5/5] 8686: Fixing build and tests on 1.10.x (#8687) * Fixing that RecipeManagerTests failed due to HttpContext not being available * Fixing OwnerEditor tests in CommonPartProviderTests as the owner editor now checks for a different permission since 5b0c82d1ad39526253eb2a5caf74dbcb8615860a * Fixing typo in CommonPartProviderTests.UpdateModelStub class name * Fixing that test cases for invalid path in FileSystemStorageProviderTests broke in a3e9bef3ca084aedc0dbdcc6e82d31f4497b2007 (issue #6802, PR #6919) I should review PRs more carefully! * Fixing CurrentCultureWorkContextTests * Fixing indentation in DefaultDateFormatterTests * Updating Orchard.Azure.Web's required version of System.Web.Mvc to match the rest of the solution * Orchard.Specs: Fixing assembly loading errors when starting up the web host by adding binding redirects * Adding empty compile workflow from dev * Adding the compile workflow's actual contents * Changing default shell to pwsh (msbuild was not found in cmd?) * Adding msbuild to PATH * Removing unused references to System.Net.Http * Replacing System.Net.Http references with its NuGet package to pin the correct version number (experimental) * Upgrading Microsoft.CodeDom.Providers.DotNetCompilerPlatform to 4.1.0 (latest) to get rid of old System.Http.Net dependency * Orchard.proj: Spec target actually depends on only the Compile target, not Package-Stage (experimental) * Compile workflow: Testing the Test and Spec targets * Fixing Test step * Fixing compile workflow to also mark Razor compilation warnings as errors * Restoring Orchard.Specs/Hosting/Orchard.Web/Web.config to match Orchard.Web's web.config closer so that it loads assemblies from the Dependencies folder. This fixes the error with Autofac not being able to resolve dependencies for DefaultOrchardShell * Orchard.Specs/Hosting/Orchard.Web/Global.asax.cs: Workaround for AntiForgeryToken bug in ASP.NET MVC since version 5.2.4 https://github.com/aspnet/AspNetWebStack/issues/162 * Revert "Replacing System.Net.Http references with its NuGet package to pin the correct version number (experimental)" This reverts commit 087f2849b116fd1e1d890a8e5ea867a644f05426. * Revert "Upgrading Microsoft.CodeDom.Providers.DotNetCompilerPlatform to 4.1.0 (latest) to get rid of old System.Http.Net dependency" This reverts commit be2ba866e34b9140e92365ede4876c375a0053f2. * Reverting the addition of assembly binding redirects to Orchard.Specs/Hosting/Simple.Web/Web.config since it doesn't need them like Orchard.Specs/Hosting/Orchard.Web/Web.config does * Disabling Test and Spec execution for now * Orchard.Framework: Making the System.Net.Http not-private to prevent an outdated version sticking around * Orchard.Workflows: Adding assembly binding redirect for System.Net.Http to avoid Razor compilation warning * Moving the System.Net.Http assembly redirect to Orchard.Web * Specs: Fixing "I can create browse blog posts on several pages" Blog test's usage of "I should not see" and correcting the parameters too because unlike "I should see", this is not a regex match, just contains * Specs: Fixing "I can create browse blog posts on several pages" Blog test's flakyness due to timing because the blog posts are created quickly after one another and the lack of millisecond-precision can cause the blog posts to appear out of order of creation * Specs: Media test simplified since the Orchard.Media feature is deprecated * Adding step to the Compile workflow to upload the MSBuild binlog results * Pinning the referenced version of System.Net.Http to 4.2.0.0 to prevent Razor compilation warning System.Net.Http is known to have such problems across different framework versions ways of referencing it The original warning is: ASPNETCOMPILER : error : The following assembly has dependencies on a version of the .NET Framework that is higher than the target and might not load correctly during runtime causing a failure: Orchard.Workflows, Version=1.10.3.0, Culture=neutral, PublicKeyToken=null. The dependencies are: System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a. You should either ensure that the dependent assembly is correct for the target framework, or ensure that the target framework you are addressing is that of the dependent assembly. [D:\a\Orchard\Orchard\src\Orchard.Web\Modules\Orchard.Workflows\Orchard.Workflows.csproj * Re-enabling the Test step * Re-enabling the Specs step * Marking System.Net.Http references as private (copy local) to make sure that it's always available, because it requires a specific version * Revert "Marking System.Net.Http references as private (copy local) to make sure that it's always available, because it requires a specific version" This reverts commit e4f563223689b5cf88a143634a75e8b999a55a76. * Orchard.Specs: Adding Settings feature * Orchard.Specs: Updating DateTime.CreatingAndUsingDateTimeFieldsInAnotherCulture structure without functional change * Orchard.Specs: Updating Settings.AddingANewSiteCultureAndSelectingItAsTheDefaultWorks to correctly detect that a culture that wasn't added before can be set as default * Fixing Newtonsoft.Json references * Specs: Workaround for the DefineDefaultCulture binding and removing the Settings feature which is now redundant with CreatingAndUsingDateTimeFieldsInAnotherCulture * Updating the compile workflow to run the build + tests on PR, dev and 1.10.x commits * Adding the compile workflow to the solution --- .github/workflows/compile.yml | 33 +++ Orchard.proj | 2 +- .../Orchard.Azure.Web.csproj | 8 +- .../Orchard.Azure.Web/packages.config | 4 +- .../Providers/CommonPartProviderTests.cs | 16 +- src/Orchard.Specs/Bindings/Settings.cs | 19 +- src/Orchard.Specs/Bindings/WebAppHosting.cs | 6 + src/Orchard.Specs/Blogs.feature | 16 +- src/Orchard.Specs/Blogs.feature.cs | 280 ++++++++++-------- src/Orchard.Specs/DateTime.feature | 10 +- src/Orchard.Specs/DateTime.feature.cs | 12 +- .../Hosting/Orchard.Web/Global.asax.cs | 5 +- .../Hosting/Orchard.Web/Web.config | 18 ++ src/Orchard.Specs/Media.feature | 30 +- src/Orchard.Specs/Media.feature.cs | 41 +-- src/Orchard.Specs/Orchard.Specs.csproj | 2 +- .../Recipes/Services/RecipeManagerTests.cs | 3 +- .../CurrentCultureWorkContextTests.cs | 45 ++- .../Localization/DefaultDateFormatterTests.cs | 2 +- .../Orchard.Framework.Tests.csproj | 2 +- .../Storage/FileSystemStorageProviderTests.cs | 45 ++- .../Modules/Orchard.AuditTrail/Web.config | 1 + .../Tests/Orchard.Messaging.Tests.csproj | 5 +- .../Modules/Orchard.JobsQueue/Web.config | 1 + .../Orchard.Layouts/Orchard.Layouts.csproj | 1 - .../Orchard.Recipes/Services/RecipeManager.cs | 13 +- .../Modules/Orchard.Roles/Web.config | 1 + .../Orchard.Taxonomies.csproj | 1 - .../Modules/Orchard.Users/Web.config | 1 + .../Orchard.Workflows.csproj | 2 +- .../Modules/Orchard.Workflows/Web.config | 1 + .../Modules/Upgrade/Upgrade.csproj | 1 - src/Orchard.Web/Web.config | 2 +- src/Orchard.sln | 14 +- .../Media/FileSystemStorageProvider.cs | 1 + src/Orchard/Orchard.Framework.csproj | 4 +- src/Orchard/Validation/PathValidation.cs | 2 +- 37 files changed, 370 insertions(+), 280 deletions(-) create mode 100644 .github/workflows/compile.yml diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml new file mode 100644 index 000000000..8b4518b86 --- /dev/null +++ b/.github/workflows/compile.yml @@ -0,0 +1,33 @@ +name: Compile + +on: + workflow_dispatch: + pull_request: + push: + branches: + - dev + - 1.10.x + +jobs: + compile: + name: Compile + defaults: + run: + shell: pwsh + runs-on: windows-latest + + steps: + - name: Clone repository + uses: actions/checkout@v3.1.0 + + - name: Restore NuGet packages + run: nuget restore src/Orchard.sln + + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.3.1 + + - name: Compile + run: msbuild Orchard.proj /m /t:Compile /p:MvcBuildViews=true /p:TreatWarningsAsErrors=true -WarnAsError + + - name: Test + run: msbuild Orchard.proj /m /t:Test diff --git a/Orchard.proj b/Orchard.proj index 6d43596bd..2537a7fd3 100644 --- a/Orchard.proj +++ b/Orchard.proj @@ -181,7 +181,7 @@ - + diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj index 5a749f29b..03cc68035 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj +++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj @@ -138,8 +138,8 @@ ..\packages\MySql.Data.6.7.9\lib\net45\MySql.Data.dll True - - ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll True @@ -191,8 +191,8 @@ False - - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll True diff --git a/src/Orchard.Azure/Orchard.Azure.Web/packages.config b/src/Orchard.Azure/Orchard.Azure.Web/packages.config index 7d0615129..bee13f369 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/packages.config +++ b/src/Orchard.Azure/Orchard.Azure.Web/packages.config @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs b/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs index c0008ad59..06c1a21ac 100644 --- a/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs +++ b/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs @@ -177,7 +177,7 @@ namespace Orchard.Core.Tests.Common.Providers { contentManager.UpdateEditor(item.ContentItem, updateModel.Object); } - class UpdatModelStub : IUpdateModel { + class UpdateModelStub : IUpdateModel { ModelStateDictionary _modelState = new ModelStateDictionary(); @@ -215,11 +215,11 @@ namespace Orchard.Core.Tests.Common.Providers { var user = contentManager.New("User"); _authn.Setup(x => x.GetAuthenticatedUser()).Returns(user); - _authz.Setup(x => x.TryCheckAccess(StandardPermissions.SiteOwner, user, item)).Returns(true); + _authz.Setup(x => x.TryCheckAccess(OwnerEditorPermissions.MayEditContentOwner, user, item)).Returns(true); item.Owner = user; - var updater = new UpdatModelStub() { Owner = null }; + var updater = new UpdateModelStub() { Owner = null }; contentManager.UpdateEditor(item.ContentItem, updater); } @@ -232,11 +232,11 @@ namespace Orchard.Core.Tests.Common.Providers { var user = contentManager.New("User"); _authn.Setup(x => x.GetAuthenticatedUser()).Returns(user); - _authz.Setup(x => x.TryCheckAccess(StandardPermissions.SiteOwner, user, item)).Returns(true); + _authz.Setup(x => x.TryCheckAccess(OwnerEditorPermissions.MayEditContentOwner, user, item)).Returns(true); item.Owner = user; - var updater = new UpdatModelStub() { Owner = "" }; + var updater = new UpdateModelStub() { Owner = "" }; _container.Resolve().Discover = b => b.Describe("Parts_Common_Owner_Edit").From(TestFeature()) @@ -255,11 +255,11 @@ namespace Orchard.Core.Tests.Common.Providers { var user = contentManager.New("User"); _authn.Setup(x => x.GetAuthenticatedUser()).Returns(user); - _authz.Setup(x => x.TryCheckAccess(StandardPermissions.SiteOwner, user, item)).Returns(true); + _authz.Setup(x => x.TryCheckAccess(OwnerEditorPermissions.MayEditContentOwner, user, item)).Returns(true); item.Owner = user; - var updater = new UpdatModelStub() { Owner = "" }; + var updater = new UpdateModelStub() { Owner = "" }; _container.Resolve().Discover = b => b.Describe("Parts_Common_Owner_Edit").From(TestFeature()) @@ -384,7 +384,7 @@ namespace Orchard.Core.Tests.Common.Providers { _clock.Advance(TimeSpan.FromMinutes(1)); var editUtc = _clock.UtcNow; - var updater = new UpdatModelStub() { Owner = "" }; + var updater = new UpdateModelStub() { Owner = "" }; contentManager.UpdateEditor(item.ContentItem, updater); Assert.That(item.CreatedUtc, Is.EqualTo(createUtc)); diff --git a/src/Orchard.Specs/Bindings/Settings.cs b/src/Orchard.Specs/Bindings/Settings.cs index 607c01ab0..4bd67b750 100644 --- a/src/Orchard.Specs/Bindings/Settings.cs +++ b/src/Orchard.Specs/Bindings/Settings.cs @@ -1,15 +1,7 @@ -using System; -using NUnit.Framework; -using Orchard.ContentManagement; -using Orchard.ContentManagement.Aspects; -using Orchard.Core.Contents; -using Orchard.Data; -using Orchard.Security; -using Orchard.Security.Permissions; +using System.Linq; +using Orchard.Localization.Services; using Orchard.Specs.Hosting.Orchard.Web; using TechTalk.SpecFlow; -using Orchard.Localization.Services; -using System.Linq; namespace Orchard.Specs.Bindings { [Binding] @@ -20,7 +12,7 @@ namespace Orchard.Specs.Bindings { var webApp = Binding(); webApp.Host.Execute(() => { - using ( var environment = MvcApplication.CreateStandaloneEnvironment("Default") ) { + using (var environment = MvcApplication.CreateStandaloneEnvironment("Default")) { var orchardServices = environment.Resolve(); var cultureManager = environment.Resolve(); @@ -30,6 +22,11 @@ namespace Orchard.Specs.Bindings { } orchardServices.WorkContext.CurrentSite.SiteCulture = cultureName; + + // Restarting the shell to reset the cache, because the cache entry storing the list of available + // cultures isn't invalidated by the signal in DefaultCultureManager.ListCultures when running + // inside the test webhost. + MvcApplication.RestartTenant("Default"); } }); } diff --git a/src/Orchard.Specs/Bindings/WebAppHosting.cs b/src/Orchard.Specs/Bindings/WebAppHosting.cs index e6790ece3..f8ff9458e 100644 --- a/src/Orchard.Specs/Bindings/WebAppHosting.cs +++ b/src/Orchard.Specs/Bindings/WebAppHosting.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; +using System.Threading; using System.Web; using Castle.Core.Logging; using HtmlAgilityPack; @@ -364,6 +365,11 @@ namespace Orchard.Specs.Bindings { } } + [When(@"I wait ""(.*)""")] + public void WhenIWait(int waitMilliseconds) { + Thread.Sleep(waitMilliseconds); + } + [Then(@"the status should be (.*) ""(.*)""")] public void ThenTheStatusShouldBe(int statusCode, string statusDescription) { Assert.That(Details.StatusCode, Is.EqualTo(statusCode)); diff --git a/src/Orchard.Specs/Blogs.feature b/src/Orchard.Specs/Blogs.feature index 3b1cfdacc..f693c571d 100644 --- a/src/Orchard.Specs/Blogs.feature +++ b/src/Orchard.Specs/Blogs.feature @@ -171,6 +171,7 @@ Scenario: I can create browse blog posts on several pages And I go to "admin/blogs" And I follow "My Blog" And I follow "New Post" where class name has "primaryAction" + And I wait "1000" And I fill in | name | value | | Title.Title | My Post 1 | @@ -179,6 +180,7 @@ Scenario: I can create browse blog posts on several pages And I go to "admin/blogs" And I follow "My Blog" And I follow "New Post" where class name has "primaryAction" + And I wait "1000" And I fill in | name | value | | Title.Title | My Post 2 | @@ -187,6 +189,7 @@ Scenario: I can create browse blog posts on several pages And I go to "admin/blogs" And I follow "My Blog" And I follow "New Post" where class name has "primaryAction" + And I wait "1000" And I fill in | name | value | | Title.Title | My Post 3 | @@ -195,6 +198,7 @@ Scenario: I can create browse blog posts on several pages And I go to "admin/blogs" And I follow "My Blog" And I follow "New Post" where class name has "primaryAction" + And I wait "1000" And I fill in | name | value | | Title.Title | My Post 4 | @@ -203,6 +207,7 @@ Scenario: I can create browse blog posts on several pages And I go to "admin/blogs" And I follow "My Blog" And I follow "New Post" where class name has "primaryAction" + And I wait "1000" And I fill in | name | value | | Title.Title | My Post 5 | @@ -211,6 +216,7 @@ Scenario: I can create browse blog posts on several pages And I go to "admin/blogs" And I follow "My Blog" And I follow "New Post" where class name has "primaryAction" + And I wait "1000" And I fill in | name | value | | Title.Title | My Post 6 | @@ -219,6 +225,7 @@ Scenario: I can create browse blog posts on several pages And I go to "admin/blogs" And I follow "My Blog" And I follow "New Post" where class name has "primaryAction" + And I wait "1000" And I fill in | name | value | | Title.Title | My Post 7 | @@ -227,6 +234,7 @@ Scenario: I can create browse blog posts on several pages And I go to "admin/blogs" And I follow "My Blog" And I follow "New Post" where class name has "primaryAction" + And I wait "1000" And I fill in | name | value | | Title.Title | My Post 8 | @@ -235,6 +243,7 @@ Scenario: I can create browse blog posts on several pages And I go to "admin/blogs" And I follow "My Blog" And I follow "New Post" where class name has "primaryAction" + And I wait "1000" And I fill in | name | value | | Title.Title | My Post 9 | @@ -243,6 +252,7 @@ Scenario: I can create browse blog posts on several pages And I go to "admin/blogs" And I follow "My Blog" And I follow "New Post" where class name has "primaryAction" + And I wait "1000" And I fill in | name | value | | Title.Title | My Post 10 | @@ -251,6 +261,7 @@ Scenario: I can create browse blog posts on several pages And I go to "admin/blogs" And I follow "My Blog" And I follow "New Post" where class name has "primaryAction" + And I wait "1000" And I fill in | name | value | | Title.Title | My Post 11 | @@ -259,6 +270,7 @@ Scenario: I can create browse blog posts on several pages And I go to "admin/blogs" And I follow "My Blog" And I follow "New Post" where class name has "primaryAction" + And I wait "1000" And I fill in | name | value | | Title.Title | My Post 12 | @@ -269,12 +281,12 @@ Scenario: I can create browse blog posts on several pages Then I should see "]*>.*?My Blog.*?" And I should see "]*>.*?My Post 12.*?" And I should see "]*>.*?My Post 11.*?" - And I should not see "]*>.*?My Post 10.*?" + And I should not see "My Post 2" When I go to "my-blog?page=2" Then I should see "]*>.*?My Blog.*?" And I should see "]*>.*?My Post 1.*?" And I should see "]*>.*?My Post 2.*?" - And I should not see "]*>.*?My Post 3.*?" + And I should not see "My Post 3" Scenario: I can create a new blog with a percent sign in the title and it gets stripped out of the slug Given I have installed Orchard diff --git a/src/Orchard.Specs/Blogs.feature.cs b/src/Orchard.Specs/Blogs.feature.cs index 15357d321..6ada69748 100644 --- a/src/Orchard.Specs/Blogs.feature.cs +++ b/src/Orchard.Specs/Blogs.feature.cs @@ -525,6 +525,8 @@ this.ScenarioSetup(scenarioInfo); testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 173 testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 174 + testRunner.And("I wait \"1000\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden TechTalk.SpecFlow.Table table15 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -532,18 +534,20 @@ this.ScenarioSetup(scenarioInfo); table15.AddRow(new string[] { "Title.Title", "My Post 1"}); -#line 174 +#line 175 testRunner.And("I fill in", ((string)(null)), table15, "And "); -#line 177 - testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 178 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 179 - testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 180 - testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 181 + testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 182 testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 183 + testRunner.And("I wait \"1000\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden TechTalk.SpecFlow.Table table16 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -551,18 +555,20 @@ this.ScenarioSetup(scenarioInfo); table16.AddRow(new string[] { "Title.Title", "My Post 2"}); -#line 182 +#line 184 testRunner.And("I fill in", ((string)(null)), table16, "And "); -#line 185 - testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 186 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 187 - testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 188 - testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 189 + testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 190 + testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 191 testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 192 + testRunner.And("I wait \"1000\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden TechTalk.SpecFlow.Table table17 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -570,18 +576,20 @@ this.ScenarioSetup(scenarioInfo); table17.AddRow(new string[] { "Title.Title", "My Post 3"}); -#line 190 - testRunner.And("I fill in", ((string)(null)), table17, "And "); #line 193 - testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 194 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 195 - testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I fill in", ((string)(null)), table17, "And "); #line 196 - testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 197 + testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 198 + testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 199 + testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 200 testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 201 + testRunner.And("I wait \"1000\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden TechTalk.SpecFlow.Table table18 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -589,18 +597,20 @@ this.ScenarioSetup(scenarioInfo); table18.AddRow(new string[] { "Title.Title", "My Post 4"}); -#line 198 - testRunner.And("I fill in", ((string)(null)), table18, "And "); -#line 201 - testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 202 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 203 - testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 204 - testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I fill in", ((string)(null)), table18, "And "); #line 205 + testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 206 + testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 207 + testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 208 + testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 209 testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 210 + testRunner.And("I wait \"1000\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden TechTalk.SpecFlow.Table table19 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -608,18 +618,20 @@ this.ScenarioSetup(scenarioInfo); table19.AddRow(new string[] { "Title.Title", "My Post 5"}); -#line 206 - testRunner.And("I fill in", ((string)(null)), table19, "And "); -#line 209 - testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 210 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 211 + testRunner.And("I fill in", ((string)(null)), table19, "And "); +#line 214 + testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 215 + testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 216 testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 212 +#line 217 testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 213 +#line 218 testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 219 + testRunner.And("I wait \"1000\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden TechTalk.SpecFlow.Table table20 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -627,18 +639,20 @@ this.ScenarioSetup(scenarioInfo); table20.AddRow(new string[] { "Title.Title", "My Post 6"}); -#line 214 - testRunner.And("I fill in", ((string)(null)), table20, "And "); -#line 217 - testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 218 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 219 - testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 220 + testRunner.And("I fill in", ((string)(null)), table20, "And "); +#line 223 + testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 224 + testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 225 + testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 226 testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 221 +#line 227 testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 228 + testRunner.And("I wait \"1000\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden TechTalk.SpecFlow.Table table21 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -646,18 +660,20 @@ this.ScenarioSetup(scenarioInfo); table21.AddRow(new string[] { "Title.Title", "My Post 7"}); -#line 222 - testRunner.And("I fill in", ((string)(null)), table21, "And "); -#line 225 - testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 226 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 227 - testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 228 - testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 229 + testRunner.And("I fill in", ((string)(null)), table21, "And "); +#line 232 + testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 233 + testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 234 + testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 235 + testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 236 testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 237 + testRunner.And("I wait \"1000\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden TechTalk.SpecFlow.Table table22 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -665,27 +681,8 @@ this.ScenarioSetup(scenarioInfo); table22.AddRow(new string[] { "Title.Title", "My Post 8"}); -#line 230 - testRunner.And("I fill in", ((string)(null)), table22, "And "); -#line 233 - testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 234 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 235 - testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 236 - testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 237 - testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line hidden - TechTalk.SpecFlow.Table table23 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table23.AddRow(new string[] { - "Title.Title", - "My Post 9"}); #line 238 - testRunner.And("I fill in", ((string)(null)), table23, "And "); + testRunner.And("I fill in", ((string)(null)), table22, "And "); #line 241 testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 242 @@ -696,6 +693,29 @@ this.ScenarioSetup(scenarioInfo); testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 245 testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 246 + testRunner.And("I wait \"1000\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line hidden + TechTalk.SpecFlow.Table table23 = new TechTalk.SpecFlow.Table(new string[] { + "name", + "value"}); + table23.AddRow(new string[] { + "Title.Title", + "My Post 9"}); +#line 247 + testRunner.And("I fill in", ((string)(null)), table23, "And "); +#line 250 + testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 251 + testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 252 + testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 253 + testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 254 + testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 255 + testRunner.And("I wait \"1000\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden TechTalk.SpecFlow.Table table24 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -703,18 +723,20 @@ this.ScenarioSetup(scenarioInfo); table24.AddRow(new string[] { "Title.Title", "My Post 10"}); -#line 246 +#line 256 testRunner.And("I fill in", ((string)(null)), table24, "And "); -#line 249 +#line 259 testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 250 +#line 260 testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 251 +#line 261 testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 252 +#line 262 testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 253 +#line 263 testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 264 + testRunner.And("I wait \"1000\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden TechTalk.SpecFlow.Table table25 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -722,18 +744,20 @@ this.ScenarioSetup(scenarioInfo); table25.AddRow(new string[] { "Title.Title", "My Post 11"}); -#line 254 +#line 265 testRunner.And("I fill in", ((string)(null)), table25, "And "); -#line 257 +#line 268 testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 258 +#line 269 testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 259 +#line 270 testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 260 +#line 271 testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 261 +#line 272 testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 273 + testRunner.And("I wait \"1000\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden TechTalk.SpecFlow.Table table26 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -741,34 +765,34 @@ this.ScenarioSetup(scenarioInfo); table26.AddRow(new string[] { "Title.Title", "My Post 12"}); -#line 262 - testRunner.And("I fill in", ((string)(null)), table26, "And "); -#line 265 - testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 266 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 267 - testRunner.Then("I should see \"Your Blog Post has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 268 - testRunner.When("I go to \"my-blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 269 - testRunner.Then("I should see \"]*>.*?My Blog.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 270 - testRunner.And("I should see \"]*>.*?My Post 12.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 271 - testRunner.And("I should see \"]*>.*?My Post 11.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 272 - testRunner.And("I should not see \"]*>.*?My Post 10.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 273 - testRunner.When("I go to \"my-blog?page=2\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line 274 - testRunner.Then("I should see \"]*>.*?My Blog.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 275 - testRunner.And("I should see \"]*>.*?My Post 1.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 276 - testRunner.And("I should see \"]*>.*?My Post 2.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I fill in", ((string)(null)), table26, "And "); #line 277 - testRunner.And("I should not see \"]*>.*?My Post 3.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 278 + testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 279 + testRunner.Then("I should see \"Your Blog Post has been created.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 280 + testRunner.When("I go to \"my-blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); +#line 281 + testRunner.Then("I should see \"]*>.*?My Blog.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 282 + testRunner.And("I should see \"]*>.*?My Post 12.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 283 + testRunner.And("I should see \"]*>.*?My Post 11.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 284 + testRunner.And("I should not see \"My Post 2\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 285 + testRunner.When("I go to \"my-blog?page=2\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); +#line 286 + testRunner.Then("I should see \"]*>.*?My Blog.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); +#line 287 + testRunner.And("I should see \"]*>.*?My Post 1.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 288 + testRunner.And("I should see \"]*>.*?My Post 2.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 289 + testRunner.And("I should not see \"My Post 3\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden this.ScenarioCleanup(); } @@ -780,11 +804,11 @@ this.ScenarioSetup(scenarioInfo); { TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("I can create a new blog with a percent sign in the title and it gets stripped out" + " of the slug", ((string[])(null))); -#line 279 +#line 291 this.ScenarioSetup(scenarioInfo); -#line 280 +#line 292 testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line 281 +#line 293 testRunner.When("I go to \"admin/blogs/create\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden TechTalk.SpecFlow.Table table27 = new TechTalk.SpecFlow.Table(new string[] { @@ -793,15 +817,15 @@ this.ScenarioSetup(scenarioInfo); table27.AddRow(new string[] { "Title.Title", "My Blog"}); -#line 282 +#line 294 testRunner.And("I fill in", ((string)(null)), table27, "And "); -#line 285 +#line 297 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 286 +#line 298 testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 287 +#line 299 testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 288 +#line 300 testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden TechTalk.SpecFlow.Table table28 = new TechTalk.SpecFlow.Table(new string[] { @@ -813,15 +837,15 @@ this.ScenarioSetup(scenarioInfo); table28.AddRow(new string[] { "Body.Text", "Hi there."}); -#line 289 +#line 301 testRunner.And("I fill in", ((string)(null)), table28, "And "); -#line 293 +#line 305 testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 294 +#line 306 testRunner.And("I go to \"my-blog/my-post-with-a-sign\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 295 +#line 307 testRunner.Then("I should see \"]*>.*?My Post with a % Sign.*?\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 296 +#line 308 testRunner.And("I should see \"Hi there.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden this.ScenarioCleanup(); diff --git a/src/Orchard.Specs/DateTime.feature b/src/Orchard.Specs/DateTime.feature index f925977ed..a93363993 100644 --- a/src/Orchard.Specs/DateTime.feature +++ b/src/Orchard.Specs/DateTime.feature @@ -173,7 +173,7 @@ Scenario: Creating and using date time fields in another culture And I go to "Admin/ContentTypes/" Then I should see "Event" - # Adding a Date field + # Adding a Date field and changing its settings When I go to "Admin/ContentTypes/Edit/Event" And I follow "Add Field" And I fill in @@ -184,15 +184,15 @@ Scenario: Creating and using date time fields in another culture And I hit "Save" And I am redirected Then I should see "The \"Date of the event\" field has been added." - - # Date & Time are inputted based on current culture - When I have "fr-FR" as the default culture - And I go to "Admin/ContentTypes/Edit/Event" + When I go to "Admin/ContentTypes/Edit/Event" And I fill in | name | value | | Fields[EventDate].DateTimeFieldSettings.Display | DateAndTime | | Fields[EventDate].DateTimeFieldSettings.Required | true | And I hit "Save" + + # Date & Time are validated based on current culture + When I have "fr-FR" as the default culture When I go to "Admin/Contents/Create/Event" And I fill in | name | value | diff --git a/src/Orchard.Specs/DateTime.feature.cs b/src/Orchard.Specs/DateTime.feature.cs index 2efc6aa89..267a106c7 100644 --- a/src/Orchard.Specs/DateTime.feature.cs +++ b/src/Orchard.Specs/DateTime.feature.cs @@ -452,10 +452,8 @@ this.ScenarioSetup(scenarioInfo); testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 186 testRunner.Then("I should see \"The \\\"Date of the event\\\" field has been added.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 189 - testRunner.When("I have \"fr-FR\" as the default culture", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 190 - testRunner.And("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 187 + testRunner.When("I go to \"Admin/ContentTypes/Edit/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden TechTalk.SpecFlow.Table table18 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -466,10 +464,12 @@ this.ScenarioSetup(scenarioInfo); table18.AddRow(new string[] { "Fields[EventDate].DateTimeFieldSettings.Required", "true"}); -#line 191 +#line 188 testRunner.And("I fill in", ((string)(null)), table18, "And "); -#line 195 +#line 192 testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); +#line 195 + testRunner.When("I have \"fr-FR\" as the default culture", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line 196 testRunner.When("I go to \"Admin/Contents/Create/Event\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line hidden diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Global.asax.cs b/src/Orchard.Specs/Hosting/Orchard.Web/Global.asax.cs index f98e7cf48..b74924eed 100644 --- a/src/Orchard.Specs/Hosting/Orchard.Web/Global.asax.cs +++ b/src/Orchard.Specs/Hosting/Orchard.Web/Global.asax.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Web; +using System.Web.Helpers; using System.Web.Mvc; using System.Web.Routing; using Autofac; @@ -16,6 +17,7 @@ namespace Orchard.Specs.Hosting.Orchard.Web { } protected void Application_Start() { + AntiForgeryConfig.SuppressXFrameOptionsHeader = true; RegisterRoutes(RouteTable.Routes); _container = OrchardStarter.CreateHostContainer(MvcSingletons); _host = _container.Resolve(); @@ -29,6 +31,7 @@ namespace Orchard.Specs.Hosting.Orchard.Web { protected void Application_BeginRequest() { Context.Items["originalHttpContext"] = Context; + HttpContext.Current.Response.AddHeader("X-Frame-Options", "SAMEORIGIN"); _host.BeginRequest(); } @@ -66,7 +69,7 @@ namespace Orchard.Specs.Hosting.Orchard.Web { State = TenantState.Uninitialized }; } - + return _host.CreateStandaloneEnvironment(settings); } } diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Web.config b/src/Orchard.Specs/Hosting/Orchard.Web/Web.config index 1319a3e7b..8ba9b717a 100644 --- a/src/Orchard.Specs/Hosting/Orchard.Web/Web.config +++ b/src/Orchard.Specs/Hosting/Orchard.Web/Web.config @@ -141,4 +141,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Specs/Media.feature b/src/Orchard.Specs/Media.feature index 4f4b6dfb7..2696dbfba 100644 --- a/src/Orchard.Specs/Media.feature +++ b/src/Orchard.Specs/Media.feature @@ -1,31 +1,13 @@ Feature: Media management In order to reference images and such from content As an author - I want to upload and manage files in a media folder + I want to access the Media Library Scenario: Media admin is available Given I have installed Orchard - And I have installed "Orchard.Media" + And I have installed "Orchard.MediaLibrary" - # Accessing the media page - When I go to "admin/media" - Then I should see "Media" - And the status should be 200 "OK" - - # Creating a folder - When I go to "admin/media/create" - And I fill in - | name | value | - | Name | Hello World | - And I hit "Save" - And I am redirected - Then I should see "Media" - And I should see "Hello World" - And the status should be 200 "OK" - - # Editing a media with limited rights - When I go to "admin/media/edit?name=..\..\bin&mediaPath=..\..\bin" - And I am redirected - Then I should see "Media" - And I should see "Editing failed: Invalid path" - And the status should be 200 "OK" + # Accessing the Media Library page + When I go to "Admin/Orchard.MediaLibrary" + Then I should see "Media Library" + And the status should be 200 "OK" diff --git a/src/Orchard.Specs/Media.feature.cs b/src/Orchard.Specs/Media.feature.cs index 55efb6a0a..798b7a9b2 100644 --- a/src/Orchard.Specs/Media.feature.cs +++ b/src/Orchard.Specs/Media.feature.cs @@ -33,7 +33,7 @@ namespace Orchard.Specs { testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner(); TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Media management", " In order to reference images and such from content\r\n As an author\r\n I want to" + - " upload and manage files in a media folder", ProgrammingLanguage.CSharp, ((string[])(null))); + " access the Media Library", ProgrammingLanguage.CSharp, ((string[])(null))); testRunner.OnFeatureStart(featureInfo); } @@ -75,44 +75,13 @@ this.ScenarioSetup(scenarioInfo); #line 7 testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); #line 8 - testRunner.And("I have installed \"Orchard.Media\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("I have installed \"Orchard.MediaLibrary\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line 11 - testRunner.When("I go to \"admin/media\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); + testRunner.When("I go to \"Admin/Orchard.MediaLibrary\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); #line 12 - testRunner.Then("I should see \"Media\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); + testRunner.Then("I should see \"Media Library\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); #line 13 - testRunner.And("the status should be 200 \"OK\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 16 - testRunner.When("I go to \"admin/media/create\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line hidden - TechTalk.SpecFlow.Table table1 = new TechTalk.SpecFlow.Table(new string[] { - "name", - "value"}); - table1.AddRow(new string[] { - "Name", - "Hello World"}); -#line 17 - testRunner.And("I fill in", ((string)(null)), table1, "And "); -#line 20 - testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 21 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 22 - testRunner.Then("I should see \"Media\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 23 - testRunner.And("I should see \"Hello World\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 24 - testRunner.And("the status should be 200 \"OK\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 27 - testRunner.When("I go to \"admin/media/edit?name=..\\..\\bin&mediaPath=..\\..\\bin\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 28 - testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 29 - testRunner.Then("I should see \"Media\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line 30 - testRunner.And("I should see \"Editing failed: Invalid path\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 31 - testRunner.And("the status should be 200 \"OK\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); + testRunner.And("the status should be 200 \"OK\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); #line hidden this.ScenarioCleanup(); } diff --git a/src/Orchard.Specs/Orchard.Specs.csproj b/src/Orchard.Specs/Orchard.Specs.csproj index 787f44c65..9eada9333 100644 --- a/src/Orchard.Specs/Orchard.Specs.csproj +++ b/src/Orchard.Specs/Orchard.Specs.csproj @@ -535,4 +535,4 @@ --> - + \ No newline at end of file diff --git a/src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs b/src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs index 9ead3ec3a..6510fe3b6 100644 --- a/src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs +++ b/src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Configuration; using System.IO; using System.Linq; using System.Xml; @@ -14,6 +13,7 @@ using Orchard.Environment.Extensions.Folders; using Orchard.Environment.Extensions.Loaders; using Orchard.FileSystems.AppData; using Orchard.FileSystems.WebSite; +using Orchard.Mvc; using Orchard.Recipes.Events; using Orchard.Recipes.Models; using Orchard.Recipes.Services; @@ -93,6 +93,7 @@ namespace Orchard.Tests.Modules.Recipes.Services { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); + builder.RegisterType().As(); } public override void Init() { diff --git a/src/Orchard.Tests/Localization/CurrentCultureWorkContextTests.cs b/src/Orchard.Tests/Localization/CurrentCultureWorkContextTests.cs index 7cb8741f9..db14dc7ca 100644 --- a/src/Orchard.Tests/Localization/CurrentCultureWorkContextTests.cs +++ b/src/Orchard.Tests/Localization/CurrentCultureWorkContextTests.cs @@ -1,7 +1,13 @@ -using Autofac; +using System.IO; +using Autofac; +using NHibernate; using NUnit.Framework; +using Orchard.Caching; +using Orchard.Data; +using Orchard.Localization.Records; using Orchard.Localization.Services; using Orchard.Mvc; +using Orchard.Tests.ContentManagement; using Orchard.Tests.Stubs; namespace Orchard.Tests.Localization { @@ -10,25 +16,56 @@ namespace Orchard.Tests.Localization { private IContainer _container; private IWorkContextStateProvider _currentCultureStateProvider; private WorkContext _workContext; + private ISessionFactory _sessionFactory; + private ISession _session; + private string _databaseFileName; + private const string _testCulture = "fr-CA"; + + [TestFixtureSetUp] + public void InitFixture() { + _databaseFileName = Path.GetTempFileName(); + _sessionFactory = DataUtility.CreateSessionFactory( + _databaseFileName, + typeof(CultureRecord)); + } [SetUp] public void Init() { + _session = _sessionFactory.OpenSession(); + var builder = new ContainerBuilder(); _workContext = new StubWorkContext(); - builder.RegisterInstance(new StubCultureSelector("fr-CA")).As(); + builder.RegisterInstance(new StubCultureSelector(_testCulture)).As(); builder.RegisterInstance(new StubHttpContext("~/")); builder.RegisterInstance(_workContext); builder.RegisterType().As(); builder.RegisterType().As(); + builder.RegisterType().As(); + builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>)); + builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As(); + builder.RegisterType().As(); + _session = _sessionFactory.OpenSession(); + builder.RegisterInstance(new TestTransactionManager(_session)).As(); _container = builder.Build(); _currentCultureStateProvider = _container.Resolve(); + _container.Resolve().AddCulture(_testCulture); + } + + [TearDown] + public void Term() { + _session.Close(); + } + + [TestFixtureTearDown] + public void TermFixture() { + File.Delete(_databaseFileName); } [Test] public void CultureManagerReturnsCultureFromSelectors() { var actualCulture = _currentCultureStateProvider.Get("CurrentCulture")(_workContext); - var expectedCulture = "fr-CA"; - Assert.That(actualCulture, Is.EqualTo(expectedCulture)); + Assert.That(actualCulture, Is.EqualTo(_testCulture)); } } } \ No newline at end of file diff --git a/src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs b/src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs index a2135f09c..9a5cf113d 100644 --- a/src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs +++ b/src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs @@ -13,7 +13,7 @@ using Orchard.Localization.Services; namespace Orchard.Tests.Localization { [TestFixture()] - [Category("longrunning")] + [Category("longrunning")] public class DefaultDateFormatterTests { [SetUp] diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index 1449ee13c..0758a2d8b 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -133,7 +133,7 @@ ..\..\lib\sqlce\System.Data.SqlServerCe.dll True - + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll diff --git a/src/Orchard.Tests/Storage/FileSystemStorageProviderTests.cs b/src/Orchard.Tests/Storage/FileSystemStorageProviderTests.cs index 80885263e..1d4250ed6 100644 --- a/src/Orchard.Tests/Storage/FileSystemStorageProviderTests.cs +++ b/src/Orchard.Tests/Storage/FileSystemStorageProviderTests.cs @@ -1,10 +1,9 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading; using NUnit.Framework; -using System; -using Orchard.Environment; using Orchard.Environment.Configuration; using Orchard.FileSystems.Media; @@ -215,8 +214,8 @@ namespace Orchard.Tests.Storage { [Test] public void GetFileFailsInInvalidPath() { - Assert.That(() => _storageProvider.GetFile(@"../InvalidFile.txt"), Throws.InstanceOf(typeof(ArgumentException))); - Assert.That(() => _storageProvider.GetFile(@"../../InvalidFile.txt"), Throws.InstanceOf(typeof(ArgumentException))); + Assert.That(() => _storageProvider.GetFile(@"../InvalidFile.txt"), Throws.InstanceOf(typeof(OrchardException))); + Assert.That(() => _storageProvider.GetFile(@"../../InvalidFile.txt"), Throws.InstanceOf(typeof(OrchardException))); // Valid get one level up within the storage provider domain _storageProvider.CreateFile(@"test.txt"); @@ -226,8 +225,8 @@ namespace Orchard.Tests.Storage { [Test] public void ListFilesFailsInInvalidPath() { - Assert.That(() => _storageProvider.ListFiles(@"../InvalidFolder"), Throws.InstanceOf(typeof(ArgumentException))); - Assert.That(() => _storageProvider.ListFiles(@"../../InvalidFolder"), Throws.InstanceOf(typeof(ArgumentException))); + Assert.That(() => _storageProvider.ListFiles(@"../InvalidFolder"), Throws.InstanceOf(typeof(OrchardException))); + Assert.That(() => _storageProvider.ListFiles(@"../../InvalidFolder"), Throws.InstanceOf(typeof(OrchardException))); // Valid get one level up within the storage provider domain Assert.That(_storageProvider.ListFiles(@"SubFolder1"), Is.Not.Null); @@ -236,8 +235,8 @@ namespace Orchard.Tests.Storage { [Test] public void ListFoldersFailsInInvalidPath() { - Assert.That(() => _storageProvider.ListFolders(@"../InvalidFolder"), Throws.InstanceOf(typeof(ArgumentException))); - Assert.That(() => _storageProvider.ListFolders(@"../../InvalidFolder"), Throws.InstanceOf(typeof(ArgumentException))); + Assert.That(() => _storageProvider.ListFolders(@"../InvalidFolder"), Throws.InstanceOf(typeof(OrchardException))); + Assert.That(() => _storageProvider.ListFolders(@"../../InvalidFolder"), Throws.InstanceOf(typeof(OrchardException))); // Valid get one level up within the storage provider domain Assert.That(_storageProvider.ListFolders(@"SubFolder1"), Is.Not.Null); @@ -255,8 +254,8 @@ namespace Orchard.Tests.Storage { [Test] public void CreateFolderFailsInInvalidPath() { - Assert.That(() => _storageProvider.CreateFolder(@"../InvalidFolder1"), Throws.InstanceOf(typeof(ArgumentException))); - Assert.That(() => _storageProvider.CreateFolder(@"../../InvalidFolder1"), Throws.InstanceOf(typeof(ArgumentException))); + Assert.That(() => _storageProvider.CreateFolder(@"../InvalidFolder1"), Throws.InstanceOf(typeof(OrchardException))); + Assert.That(() => _storageProvider.CreateFolder(@"../../InvalidFolder1"), Throws.InstanceOf(typeof(OrchardException))); // Valid create one level up within the storage provider domain _storageProvider.CreateFolder(@"SubFolder1\..\ValidFolder1"); @@ -265,8 +264,8 @@ namespace Orchard.Tests.Storage { [Test] public void DeleteFolderFailsInInvalidPath() { - Assert.That(() => _storageProvider.DeleteFolder(@"../InvalidFolder1"), Throws.InstanceOf(typeof(ArgumentException))); - Assert.That(() => _storageProvider.DeleteFolder(@"../../InvalidFolder1"), Throws.InstanceOf(typeof(ArgumentException))); + Assert.That(() => _storageProvider.DeleteFolder(@"../InvalidFolder1"), Throws.InstanceOf(typeof(OrchardException))); + Assert.That(() => _storageProvider.DeleteFolder(@"../../InvalidFolder1"), Throws.InstanceOf(typeof(OrchardException))); // Valid create one level up within the storage provider domain Assert.That(GetFolder("SubFolder1"), Is.Not.Null); @@ -277,8 +276,8 @@ namespace Orchard.Tests.Storage { [Test] public void RenameFolderFailsInInvalidPath() { Assert.That(GetFolder(@"SubFolder1/SubSubFolder1"), Is.Not.Null); - Assert.That(() => _storageProvider.RenameFolder(@"SubFolder1", @"../SubSubFolder1"), Throws.InstanceOf(typeof(ArgumentException))); - Assert.That(() => _storageProvider.RenameFolder(@"SubFolder1", @"../../SubSubFolder1"), Throws.InstanceOf(typeof(ArgumentException))); + Assert.That(() => _storageProvider.RenameFolder(@"SubFolder1", @"../SubSubFolder1"), Throws.InstanceOf(typeof(OrchardException))); + Assert.That(() => _storageProvider.RenameFolder(@"SubFolder1", @"../../SubSubFolder1"), Throws.InstanceOf(typeof(OrchardException))); // Valid move one level up within the storage provider domain _storageProvider.RenameFolder(@"SubFolder1\SubSubFolder1", @"SubFolder1\..\SubSubFolder1"); @@ -291,8 +290,8 @@ namespace Orchard.Tests.Storage { [Test] public void DeleteFileFailsInInvalidPath() { - Assert.That(() => _storageProvider.DeleteFile(@"../test.txt"), Throws.InstanceOf(typeof(ArgumentException))); - Assert.That(() => _storageProvider.DeleteFile(@"../test.txt"), Throws.InstanceOf(typeof(ArgumentException))); + Assert.That(() => _storageProvider.DeleteFile(@"../test.txt"), Throws.InstanceOf(typeof(OrchardException))); + Assert.That(() => _storageProvider.DeleteFile(@"../test.txt"), Throws.InstanceOf(typeof(OrchardException))); // Valid move one level up within the storage provider domain _storageProvider.CreateFile(@"test.txt"); @@ -308,8 +307,8 @@ namespace Orchard.Tests.Storage { [Test] public void RenameFileFailsInInvalidPath() { - Assert.That(() => _storageProvider.RenameFile(@"../test.txt", "invalid.txt"), Throws.InstanceOf(typeof(ArgumentException))); - Assert.That(() => _storageProvider.RenameFile(@"../test.txt", "invalid.txt"), Throws.InstanceOf(typeof(ArgumentException))); + Assert.That(() => _storageProvider.RenameFile(@"../test.txt", "invalid.txt"), Throws.InstanceOf(typeof(OrchardException))); + Assert.That(() => _storageProvider.RenameFile(@"../test.txt", "invalid.txt"), Throws.InstanceOf(typeof(OrchardException))); // Valid move one level up within the storage provider domain _storageProvider.CreateFile(@"test.txt"); @@ -322,8 +321,8 @@ namespace Orchard.Tests.Storage { [Test] public void CreateFileFailsInInvalidPath() { - Assert.That(() => _storageProvider.CreateFile(@"../InvalidFolder1.txt"), Throws.InstanceOf(typeof(ArgumentException))); - Assert.That(() => _storageProvider.CreateFile(@"../../InvalidFolder1.txt"), Throws.InstanceOf(typeof(ArgumentException))); + Assert.That(() => _storageProvider.CreateFile(@"../InvalidFolder1.txt"), Throws.InstanceOf(typeof(OrchardException))); + Assert.That(() => _storageProvider.CreateFile(@"../../InvalidFolder1.txt"), Throws.InstanceOf(typeof(OrchardException))); // Valid create one level up within the storage provider domain _storageProvider.CreateFile(@"SubFolder1\..\ValidFolder1.txt"); @@ -335,8 +334,8 @@ namespace Orchard.Tests.Storage { _storageProvider.CreateFile(@"test.txt"); using (Stream stream = GetFile("test.txt").OpenRead()) { - Assert.That(() => _storageProvider.SaveStream(@"../newTest.txt", stream), Throws.InstanceOf(typeof(ArgumentException))); - Assert.That(() => _storageProvider.SaveStream(@"../../newTest.txt", stream), Throws.InstanceOf(typeof(ArgumentException))); + Assert.That(() => _storageProvider.SaveStream(@"../newTest.txt", stream), Throws.InstanceOf(typeof(OrchardException))); + Assert.That(() => _storageProvider.SaveStream(@"../../newTest.txt", stream), Throws.InstanceOf(typeof(OrchardException))); // Valid create one level up within the storage provider domain _storageProvider.SaveStream(@"SubFolder1\..\newTest.txt", stream); diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config b/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config index d27f3e6d4..c323e6354 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config @@ -29,6 +29,7 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Tests/Orchard.Messaging.Tests.csproj b/src/Orchard.Web/Modules/Orchard.JobsQueue/Tests/Orchard.Messaging.Tests.csproj index 239aaa277..4fd4acae4 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Tests/Orchard.Messaging.Tests.csproj +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Tests/Orchard.Messaging.Tests.csproj @@ -44,9 +44,8 @@ False ..\..\..\..\..\lib\moq\Moq.dll - - False - ..\..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\..\..\lib\nunit\nunit.framework.dll diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config b/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config index 3cd573478..94bd30067 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config @@ -29,6 +29,7 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj index d0fd1dd7d..c40355259 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj @@ -69,7 +69,6 @@ 3.5 - ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeManager.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeManager.cs index c787a212f..434b33850 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeManager.cs +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeManager.cs @@ -3,6 +3,7 @@ using System.Linq; using log4net; using Orchard.Data; using Orchard.Logging; +using Orchard.Mvc; using Orchard.Recipes.Events; using Orchard.Recipes.Models; @@ -12,20 +13,20 @@ namespace Orchard.Recipes.Services { private readonly IRecipeScheduler _recipeScheduler; private readonly IRecipeExecuteEventHandler _recipeExecuteEventHandler; private readonly IRepository _recipeStepResultRecordRepository; - private readonly IWorkContextAccessor _workContextAccessor; + private readonly IHttpContextAccessor _httpContextAccessor; public RecipeManager( IRecipeStepQueue recipeStepQueue, IRecipeScheduler recipeScheduler, IRecipeExecuteEventHandler recipeExecuteEventHandler, IRepository recipeStepResultRecordRepository, - IWorkContextAccessor workContextAccessor) { + IHttpContextAccessor httpContextAccessor) { _recipeStepQueue = recipeStepQueue; _recipeScheduler = recipeScheduler; _recipeExecuteEventHandler = recipeExecuteEventHandler; _recipeStepResultRecordRepository = recipeStepResultRecordRepository; - _workContextAccessor = workContextAccessor; + _httpContextAccessor = httpContextAccessor; RecipeExecutionTimeout = 600; } @@ -57,9 +58,9 @@ namespace Orchard.Recipes.Services { } // Sets the request timeout to a configurable amount of seconds to give enough time to execute custom recipes. - var workContext = _workContextAccessor.GetContext(); - if (workContext?.HttpContext != null) { - workContext.HttpContext.Server.ScriptTimeout = RecipeExecutionTimeout; + var httpContext = _httpContextAccessor.Current(); + if (httpContext != null) { + httpContext.Server.ScriptTimeout = RecipeExecutionTimeout; } var executionId = Guid.NewGuid().ToString("n"); diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Web.config b/src/Orchard.Web/Modules/Orchard.Roles/Web.config index 3cd573478..94bd30067 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Roles/Web.config @@ -29,6 +29,7 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj index 2e2e019db..3428cdd4e 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj @@ -70,7 +70,6 @@ 3.5 - ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll diff --git a/src/Orchard.Web/Modules/Orchard.Users/Web.config b/src/Orchard.Web/Modules/Orchard.Users/Web.config index 3cd573478..94bd30067 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Users/Web.config @@ -29,6 +29,7 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj b/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj index e4c2a91a4..7ee84ed83 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj @@ -70,7 +70,7 @@ 3.5 - + diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config index 3cd573478..94bd30067 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config @@ -29,6 +29,7 @@ + diff --git a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj index 0b128ac4e..50dd89d1f 100644 --- a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj +++ b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj @@ -75,7 +75,6 @@ 3.5 - ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index 0d024841d..71284090d 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -204,7 +204,7 @@ - + diff --git a/src/Orchard.sln b/src/Orchard.sln index 167dee8c3..556dc0dbe 100644 --- a/src/Orchard.sln +++ b/src/Orchard.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29926.136 +# Visual Studio Version 17 +VisualStudioVersion = 17.6.33815.320 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}" EndProject @@ -278,6 +278,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Conditions", "Orcha EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Resources", "Orchard.Web\Modules\Orchard.Resources\Orchard.Resources.csproj", "{D4E8F7C8-2DB2-4C50-A422-DA1DF1E3CC73}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{C149D676-DC9E-4C3E-A218-955EFBBC4B74}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{1A90D20E-90DF-4988-8E35-0A4C1275EC46}" + ProjectSection(SolutionItems) = preProject + ..\.github\workflows\compile.yml = ..\.github\workflows\compile.yml + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CodeCoverage|Any CPU = CodeCoverage|Any CPU @@ -1191,9 +1198,10 @@ Global {90EBEE36-B5CD-42A8-A21B-76270E2C5D24} = {DF3909B0-1DDD-4D8A-9919-56FC438E25E2} {98251EAE-A41B-47B2-AA91-E28B8482DA70} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {D4E8F7C8-2DB2-4C50-A422-DA1DF1E3CC73} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} + {1A90D20E-90DF-4988-8E35-0A4C1275EC46} = {C149D676-DC9E-4C3E-A218-955EFBBC4B74} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {3585D970-275B-4363-9F61-CD37CFC9DCD3} EnterpriseLibraryConfigurationToolBinariesPath = packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4 + SolutionGuid = {3585D970-275B-4363-9F61-CD37CFC9DCD3} EndGlobalSection EndGlobal diff --git a/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs b/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs index e932271dc..ab0abfd26 100644 --- a/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs +++ b/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs @@ -395,6 +395,7 @@ namespace Orchard.FileSystems.Media { /// The relative path to the file to be created. /// The stream to be saved. /// If the stream can't be saved due to access permissions. + /// If the path is invalid. public void SaveStream(string path, Stream inputStream) { // Create the file. // The CreateFile method will map the still relative path diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 1ed5bd2d1..9ad2d40c4 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -108,9 +108,7 @@ 3.5 - - True - + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll diff --git a/src/Orchard/Validation/PathValidation.cs b/src/Orchard/Validation/PathValidation.cs index 3d0b5b864..85370a87a 100644 --- a/src/Orchard/Validation/PathValidation.cs +++ b/src/Orchard/Validation/PathValidation.cs @@ -15,7 +15,7 @@ namespace Orchard.Validation { /// The base path which boundaries are not to be transposed. /// The path to determine. /// The mapped path if valid. - /// If the path is invalid. + /// If the path is invalid. public static string ValidatePath(string basePath, string mappedPath) { bool valid = false;