diff --git a/src/Orchard.Profile/profiling-setup-commands.txt b/src/Orchard.Profile/profiling-setup-commands.txt index 20adbea21..ab5170b2f 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:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,PublishLater,HomePage,Contents,ContentsLocation,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Orchard.Widgets,Orchard.Media,Orchard.Tags,Orchard.Experimental +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.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Orchard.Widgets,Orchard.Media,Orchard.Tags,Orchard.Experimental add profiling data feature disable Orchard.Experimental diff --git a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs index 1952b43e9..3ce6fc274 100644 --- a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs +++ b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs @@ -17,7 +17,7 @@ namespace Orchard.Specs.Bindings { webApp.GivenIHaveACleanSiteWith(TableData( new { extension = "module", names = "Orchard.Setup, Orchard.Modules, Orchard.Packaging, Orchard.Themes, Orchard.Widgets, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce" }, - new { extension = "core", names = "Common, Dashboard, Feeds, HomePage, Navigation, Contents, ContentsLocation, PublishLater, Routable, Scheduling, Settings, Shapes, XmlRpc" }, + new { extension = "core", names = "Common, Dashboard, Feeds, HomePage, Navigation, Contents, PublishLater, Routable, Scheduling, Settings, Shapes, XmlRpc" }, new { extension = "theme", names = "SafeMode, TheAdmin, TheThemeMachine" })); webApp.WhenIGoTo("Setup"); diff --git a/src/Orchard.Specs/Setup.feature b/src/Orchard.Specs/Setup.feature index 6c19d152c..64f07df9d 100644 --- a/src/Orchard.Specs/Setup.feature +++ b/src/Orchard.Specs/Setup.feature @@ -7,7 +7,7 @@ Scenario: Root request shows setup form Given I have a clean site with | extension | names | | module | Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Orchard.jQuery, TinyMce | - | core | Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc | + | core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc | | theme | SafeMode | When I go to "/Default.aspx" Then I should see "Welcome to Orchard" @@ -18,7 +18,7 @@ Scenario: Setup folder also shows setup form Given I have a clean site with | extension | names | | module | Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Orchard.jQuery, TinyMce | - | core | Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc | + | core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc | | theme | SafeMode | When I go to "/Setup" Then I should see "Welcome to Orchard" @@ -29,7 +29,7 @@ Scenario: Some of the initial form values are required Given I have a clean site with | extension | names | | module | Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Orchard.jQuery, TinyMce | - | core | Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc | + | core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc | | theme | SafeMode | When I go to "/Setup" And I hit "Finish Setup" @@ -40,7 +40,7 @@ Scenario: Calling setup on a brand new install Given I have a clean site with | extension | names | | module | Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Orchard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce | - | core | Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc | + | core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc | | theme | SafeMode, TheThemeMachine | And I am on "/Setup" When I fill in diff --git a/src/Orchard.Specs/Setup.feature.cs b/src/Orchard.Specs/Setup.feature.cs index d75908c76..49b0f1512 100644 --- a/src/Orchard.Specs/Setup.feature.cs +++ b/src/Orchard.Specs/Setup.feature.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // This code was generated by SpecFlow (http://www.specflow.org/). -// SpecFlow Version:1.3.5.2 +// 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 @@ -14,7 +14,7 @@ namespace Orchard.Specs using TechTalk.SpecFlow; - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.3.5.2")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.3.2.0")] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [NUnit.Framework.TestFixtureAttribute()] [NUnit.Framework.DescriptionAttribute("Setup")] @@ -70,8 +70,8 @@ this.ScenarioSetup(scenarioInfo); "chard.jQuery, TinyMce"}); table1.AddRow(new string[] { "core", - "Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routa" + - "ble, PublishLater, Scheduling, Settings, Shapes, XmlRpc"}); + "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater," + + " Scheduling, Settings, Shapes, XmlRpc"}); table1.AddRow(new string[] { "theme", "SafeMode"}); @@ -106,8 +106,8 @@ this.ScenarioSetup(scenarioInfo); "chard.jQuery, TinyMce"}); table2.AddRow(new string[] { "core", - "Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routa" + - "ble, PublishLater, Scheduling, Settings, Shapes, XmlRpc"}); + "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater," + + " Scheduling, Settings, Shapes, XmlRpc"}); table2.AddRow(new string[] { "theme", "SafeMode"}); @@ -142,8 +142,8 @@ this.ScenarioSetup(scenarioInfo); "chard.jQuery, TinyMce"}); table3.AddRow(new string[] { "core", - "Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routa" + - "ble, PublishLater, Scheduling, Settings, Shapes, XmlRpc"}); + "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater," + + " Scheduling, Settings, Shapes, XmlRpc"}); table3.AddRow(new string[] { "theme", "SafeMode"}); @@ -180,8 +180,8 @@ this.ScenarioSetup(scenarioInfo); "chard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce"}); table4.AddRow(new string[] { "core", - "Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routa" + - "ble, PublishLater, Scheduling, Settings, Shapes, XmlRpc"}); + "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater," + + " Scheduling, Settings, Shapes, XmlRpc"}); table4.AddRow(new string[] { "theme", "SafeMode, TheThemeMachine"}); diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index f4ff8d165..870f8f384 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -71,7 +71,6 @@ namespace Orchard.Setup.Services { "Shapes", "PublishLater", "Contents", - "ContentsLocation", "Dashboard", "Reports", "Feeds",