From f39b27355801e164611d015e59193ed7d8ff7180 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Wed, 12 Aug 2015 14:47:24 +0100 Subject: [PATCH] Fixed some typos and corrected TinyMce dependency listings. --- src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs | 3 --- .../Extensions/ExtensionLoaderCoordinatorTests.cs | 8 ++++---- .../Environment/Extensions/ExtensionManagerTests.cs | 4 ++-- src/Orchard.Web/Modules/Orchard.Layouts/Module.txt | 2 +- src/Orchard/Environment/DefaultOrchardHost.cs | 2 +- .../Environment/Descriptor/IShellDescriptorManager.cs | 2 +- src/Orchard/Environment/ViewsBackgroundCompilation.cs | 2 +- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs b/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs index 301a1e703..24594d570 100644 --- a/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs +++ b/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs @@ -25,7 +25,6 @@ using Orchard.Tests.Stubs; using Orchard.Tests.Utility; using Orchard.WebApi.Routes; using IModelBinderProvider = Orchard.Mvc.ModelBinders.IModelBinderProvider; -using Orchard.Tasks; namespace Orchard.Tests.Environment { [TestFixture] @@ -139,8 +138,6 @@ namespace Orchard.Tests.Environment { } } - - [Test, Ignore("containers are disposed when calling BeginRequest, maybe by the StubVirtualPathMonitor")] public void NormalDependenciesShouldBeUniquePerRequestContainer() { var host = _lifetime.Resolve(); diff --git a/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs b/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs index 94f07fb6d..a087c3554 100644 --- a/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs +++ b/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs @@ -206,7 +206,7 @@ Features: Category: Content types AnotherWiki Editor: Description: A rich editor for wiki contents. - Dependencies: TinyMCE, AnotherWiki + Dependencies: TinyMce, AnotherWiki Category: Input methods AnotherWiki DistributionList: Description: Sends e-mail alerts when wiki contents gets published. @@ -241,7 +241,7 @@ Features: Assert.That(featureDescriptor.Description, Is.EqualTo("A rich editor for wiki contents.")); Assert.That(featureDescriptor.Category, Is.EqualTo("Input methods")); Assert.That(featureDescriptor.Dependencies.Count(), Is.EqualTo(2)); - Assert.That(featureDescriptor.Dependencies.Contains("TinyMCE")); + Assert.That(featureDescriptor.Dependencies.Contains("TinyMce")); Assert.That(featureDescriptor.Dependencies.Contains("AnotherWiki")); break; case "AnotherWiki DistributionList": @@ -287,7 +287,7 @@ Category: Content types Features: AnotherWiki Editor: Description: A rich editor for wiki contents. - Dependencies: TinyMCE, AnotherWiki + Dependencies: TinyMce, AnotherWiki Category: Input methods AnotherWiki DistributionList: Description: Sends e-mail alerts when wiki contents gets published. @@ -323,7 +323,7 @@ Features: Assert.That(featureDescriptor.Description, Is.EqualTo("A rich editor for wiki contents.")); Assert.That(featureDescriptor.Category, Is.EqualTo("Input methods")); Assert.That(featureDescriptor.Dependencies.Count(), Is.EqualTo(2)); - Assert.That(featureDescriptor.Dependencies.Contains("TinyMCE")); + Assert.That(featureDescriptor.Dependencies.Contains("TinyMce")); Assert.That(featureDescriptor.Dependencies.Contains("AnotherWiki")); break; case "AnotherWiki DistributionList": diff --git a/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs b/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs index f9926e01b..75a1d8ece 100644 --- a/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs +++ b/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs @@ -207,7 +207,7 @@ Features: Category: Content types AnotherWiki Editor: Description: A rich editor for wiki contents. - Dependencies: TinyMCE, AnotherWiki + Dependencies: TinyMce, AnotherWiki Category: Input methods AnotherWiki DistributionList: Description: Sends e-mail alerts when wiki contents gets published. @@ -243,7 +243,7 @@ Features: Assert.That(featureDescriptor.Description, Is.EqualTo("A rich editor for wiki contents.")); Assert.That(featureDescriptor.Category, Is.EqualTo("Input methods")); Assert.That(featureDescriptor.Dependencies.Count(), Is.EqualTo(2)); - Assert.That(featureDescriptor.Dependencies.Contains("TinyMCE")); + Assert.That(featureDescriptor.Dependencies.Contains("TinyMce")); Assert.That(featureDescriptor.Dependencies.Contains("AnotherWiki")); break; case "AnotherWiki DistributionList": diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt b/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt index 8bc8503b6..10617a485 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Module.txt @@ -10,7 +10,7 @@ Features: Orchard.Layouts: Name: Layouts Description: Provides tools to create layouts. - Dependencies: Common, Orchard.jQuery, Orchard.Forms, Orchard.Tokens, Orchard.MediaLibrary, TinyMCE + Dependencies: Common, Orchard.jQuery, Orchard.Forms, Orchard.Tokens, Orchard.MediaLibrary, TinyMce Category: Layout Orchard.Layouts.Snippets: Name: Layout Snippets diff --git a/src/Orchard/Environment/DefaultOrchardHost.cs b/src/Orchard/Environment/DefaultOrchardHost.cs index 2e10d25d2..a1e70d003 100644 --- a/src/Orchard/Environment/DefaultOrchardHost.cs +++ b/src/Orchard/Environment/DefaultOrchardHost.cs @@ -15,7 +15,7 @@ using Orchard.Logging; using Orchard.Utility.Extensions; namespace Orchard.Environment { - // All the event handlers that DefaultOrchardHost implements have to be declared in OrchardStarter + // All the event handlers that DefaultOrchardHost implements have to be declared in OrchardStarter. public class DefaultOrchardHost : IOrchardHost, IShellSettingsManagerEventHandler, IShellDescriptorManagerEventHandler { private readonly IHostLocalRestart _hostLocalRestart; private readonly IShellSettingsManager _shellSettingsManager; diff --git a/src/Orchard/Environment/Descriptor/IShellDescriptorManager.cs b/src/Orchard/Environment/Descriptor/IShellDescriptorManager.cs index 68437f97f..c39356695 100644 --- a/src/Orchard/Environment/Descriptor/IShellDescriptorManager.cs +++ b/src/Orchard/Environment/Descriptor/IShellDescriptorManager.cs @@ -16,7 +16,7 @@ namespace Orchard.Environment.Descriptor { /// /// Alters databased information to match information passed as arguments. - /// Prior SerialNumber used for optomistic concurrency, and an exception + /// Prior SerialNumber used for optimistic concurrency, and an exception /// should be thrown if the number in storage doesn't match what's provided. /// void UpdateShellDescriptor( diff --git a/src/Orchard/Environment/ViewsBackgroundCompilation.cs b/src/Orchard/Environment/ViewsBackgroundCompilation.cs index 67ae7ac1f..919fc9bd2 100644 --- a/src/Orchard/Environment/ViewsBackgroundCompilation.cs +++ b/src/Orchard/Environment/ViewsBackgroundCompilation.cs @@ -119,7 +119,7 @@ namespace Orchard.Environment { } private void CompileDirectory(CompilationContext context, string viewDirectory) { - // Prevent processing of the same directories multiple times (sligh performance optimization, + // Prevent processing of the same directories multiple times (slight performance optimization, // as the build manager second call to compile a view is essentially a "no-op". if (context.ProcessedDirectories.Contains(viewDirectory)) return;