From a6eb5740e79893cfadc499ba72cbc013d2df5161 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Sun, 18 Jul 2010 19:22:47 -0700 Subject: [PATCH] Fix profiling setup "build profiling" is back to a working state. --HG-- branch : dev --- src/Orchard.Profile/Tests/Profiling.feature | 18 ++++----- .../Tests/Profiling.feature.cs | 38 ++++++++++--------- .../profiling-setup-commands.txt | 2 +- .../Orchard.Blogs/Handlers/BlogHandler.cs | 2 + .../Commands/ProfilingCommands.cs | 2 + 5 files changed, 35 insertions(+), 27 deletions(-) diff --git a/src/Orchard.Profile/Tests/Profiling.feature b/src/Orchard.Profile/Tests/Profiling.feature index 352c133c1..267b90d37 100644 --- a/src/Orchard.Profile/Tests/Profiling.feature +++ b/src/Orchard.Profile/Tests/Profiling.feature @@ -1,17 +1,17 @@ Feature: Profiling - In order to profile the site - As a developer - I want to generate a fixed number of repeatable requests + In order to profile the site + As a developer + I want to generate a fixed number of repeatable requests Scenario: Warmup - Given I am logged in - When I go to "/admin" - When I go to "/blog0" - When I go to "/" + Given I am logged in + When I go to "/admin" + When I go to "/blog0" + When I go to "/" Scenario: Dashboard - Given I am logged in - When I go to "/admin" 40 times + Given I am logged in + When I go to "/admin" 40 times Scenario: Hitting blogs Given I am logged in diff --git a/src/Orchard.Profile/Tests/Profiling.feature.cs b/src/Orchard.Profile/Tests/Profiling.feature.cs index 8673be112..ae57373ee 100644 --- a/src/Orchard.Profile/Tests/Profiling.feature.cs +++ b/src/Orchard.Profile/Tests/Profiling.feature.cs @@ -1,18 +1,21 @@ // ------------------------------------------------------------------------------ // // This code was generated by SpecFlow (http://www.specflow.org/). -// SpecFlow Version:1.2.0.0 -// Runtime Version:2.0.50727.4927 +// SpecFlow Version:1.3.2.0 +// Runtime Version:4.0.30319.1 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // // ------------------------------------------------------------------------------ -namespace Orchard.Profile.Tests +#region Designer generated code +namespace Orchard.Specs.Le.Tests { using TechTalk.SpecFlow; + [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.3.2.0")] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [NUnit.Framework.TestFixtureAttribute()] [NUnit.Framework.DescriptionAttribute("Profiling")] public partial class ProfilingFeature @@ -58,13 +61,13 @@ namespace Orchard.Profile.Tests #line 6 this.ScenarioSetup(scenarioInfo); #line 7 - testRunner.Given("I am logged in"); +testRunner.Given("I am logged in"); #line 8 - testRunner.When("I go to \"/admin\""); +testRunner.When("I go to \"/admin\""); #line 9 - testRunner.When("I go to \"/blog0\""); +testRunner.When("I go to \"/blog0\""); #line 10 - testRunner.When("I go to \"/\""); +testRunner.When("I go to \"/\""); #line hidden testRunner.CollectScenarioErrors(); } @@ -77,9 +80,9 @@ this.ScenarioSetup(scenarioInfo); #line 12 this.ScenarioSetup(scenarioInfo); #line 13 - testRunner.Given("I am logged in"); +testRunner.Given("I am logged in"); #line 14 - testRunner.When("I go to \"/admin\" 40 times"); +testRunner.When("I go to \"/admin\" 40 times"); #line hidden testRunner.CollectScenarioErrors(); } @@ -92,17 +95,17 @@ this.ScenarioSetup(scenarioInfo); #line 16 this.ScenarioSetup(scenarioInfo); #line 17 - testRunner.Given("I am logged in"); +testRunner.Given("I am logged in"); #line 18 - testRunner.When("I go to \"/blog0\" 10 times"); +testRunner.When("I go to \"/blog0\" 10 times"); #line 19 - testRunner.When("I go to \"/blog1\" 10 times"); +testRunner.When("I go to \"/blog1\" 10 times"); #line 20 - testRunner.When("I go to \"/blog2\" 10 times"); +testRunner.When("I go to \"/blog2\" 10 times"); #line 21 - testRunner.When("I go to \"/blog3\" 10 times"); +testRunner.When("I go to \"/blog3\" 10 times"); #line 22 - testRunner.When("I go to \"/blog4\" 10 times"); +testRunner.When("I go to \"/blog4\" 10 times"); #line hidden testRunner.CollectScenarioErrors(); } @@ -115,11 +118,12 @@ this.ScenarioSetup(scenarioInfo); #line 24 this.ScenarioSetup(scenarioInfo); #line 25 - testRunner.Given("I am logged in"); +testRunner.Given("I am logged in"); #line 26 - testRunner.When("I go to \"/\" 40 times"); +testRunner.When("I go to \"/\" 40 times"); #line hidden testRunner.CollectScenarioErrors(); } } } +#endregion diff --git a/src/Orchard.Profile/profiling-setup-commands.txt b/src/Orchard.Profile/profiling-setup-commands.txt index 674aa40a3..fcf8ea401 100644 --- a/src/Orchard.Profile/profiling-setup-commands.txt +++ b/src/Orchard.Profile/profiling-setup-commands.txt @@ -1,3 +1,3 @@ -setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Orchard.Framework,Common,Dashboard,Feeds,HomePage,Navigation,Scheduling,Settings,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Modules,Orchard.Themes,Orchard.MultiTenancy,Orchard.Pages,Orchard.Blogs,Orchard.Comments,Futures.Widgets,Orchard.Media,Orchard.Tags,Orchard.DevTools +setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,PublishLater,HomePage,Contents,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Modules,Orchard.Themes,Orchard.MultiTenancy,Orchard.Pages,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Futures.Widgets,Orchard.Media,Orchard.Tags,Orchard.DevTools add profiling data feature disable Orchard.DevTools diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogHandler.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogHandler.cs index 0ed267507..586b32414 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogHandler.cs @@ -2,6 +2,7 @@ using JetBrains.Annotations; using Orchard.Blogs.Drivers; using Orchard.Blogs.Models; using Orchard.ContentManagement.Handlers; +using Orchard.Core.Common.Models; using Orchard.Core.Routable.Models; using Orchard.Data; @@ -10,6 +11,7 @@ namespace Orchard.Blogs.Handlers { public class BlogHandler : ContentHandler { public BlogHandler(IRepository repository) { Filters.Add(new ActivatingFilter(BlogDriver.ContentType.Name)); + Filters.Add(new ActivatingFilter(BlogDriver.ContentType.Name)); Filters.Add(new ActivatingFilter(BlogDriver.ContentType.Name)); Filters.Add(StorageFilter.For(repository)); } diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ProfilingCommands.cs b/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ProfilingCommands.cs index 5b441d204..21f065a90 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ProfilingCommands.cs +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ProfilingCommands.cs @@ -28,6 +28,7 @@ namespace Orchard.DevTools.Commands { var page = _contentManager.Create("Page", VersionOptions.Draft); page.As().Owner = admin; page.As().Slug = pageName; + page.As().Path = pageName; page.As().Title = pageName; page.As().Text = pageName; page.As().OnMainMenu = true; @@ -39,6 +40,7 @@ namespace Orchard.DevTools.Commands { var blog = _contentManager.New("Blog"); blog.As().Owner = admin; blog.As().Slug = blogName; + blog.As().Path = blogName; blog.As().Title = blogName; blog.As().OnMainMenu = true; blog.As().MenuPosition = "6." + index;