Merge with default

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-03-01 14:01:09 -08:00
2 changed files with 6 additions and 6 deletions

View File

@@ -39,9 +39,9 @@ Scenario: Some of the initial form values are required
Scenario: Calling setup on a brand new install Scenario: Calling setup on a brand new install
Given I have a clean site with Given I have a clean site with
| extension | names | | extension | names |
| Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Lists, Orchard.ContentTypes, Orchard.Messaging, Orchard.Media, Orchard.MediaPicker, Orchard.Scripting, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce, Orchard.Blogs, Orchard.Tags, Orchard.Packaging, Orchard.Recipes, Orchard.Warmup, Orchard.Autoroute, Orchard.Tokens, Orchard.Alias | | Module | Orchard.Setup, Orchard.Pages, Orchard.Blogs, Orchard.Messaging, Orchard.Media, Orchard.MediaPicker, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce, Orchard.Packaging, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields |
| Core | Common, Containers, Contents, Dashboard, Feeds, Navigation, Scheduling, Settings, Shapes, XmlRpc, Title | | Core | Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title |
| Theme | SafeMode, TheThemeMachine | | Theme | SafeMode, TheAdmin, TheThemeMachine |
And I am on "/Setup" And I am on "/Setup"
When I fill in When I fill in
| name | value | | name | value |

View File

@@ -188,14 +188,14 @@ this.ScenarioSetup(scenarioInfo);
"names"}); "names"});
table4.AddRow(new string[] { table4.AddRow(new string[] {
"Module", "Module",
@"Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Lists, Orchard.ContentTypes, Orchard.Messaging, Orchard.Media, Orchard.MediaPicker, Orchard.Scripting, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce, Orchard.Blogs, Orchard.Tags, Orchard.Packaging, Orchard.Recipes, Orchard.Warmup, Orchard.Autoroute, Orchard.Tokens, Orchard.Alias"}); @"Orchard.Setup, Orchard.Pages, Orchard.Blogs, Orchard.Messaging, Orchard.Media, Orchard.MediaPicker, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce, Orchard.Packaging, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields"});
table4.AddRow(new string[] { table4.AddRow(new string[] {
"Core", "Core",
"Common, Containers, Contents, Dashboard, Feeds, Navigation, Scheduling, Settings," + "Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings," +
" Shapes, XmlRpc, Title"}); " Shapes, XmlRpc, Title"});
table4.AddRow(new string[] { table4.AddRow(new string[] {
"Theme", "Theme",
"SafeMode, TheThemeMachine"}); "SafeMode, TheAdmin, TheThemeMachine"});
#line 40 #line 40
testRunner.Given("I have a clean site with", ((string)(null)), table4); testRunner.Given("I have a clean site with", ((string)(null)), table4);
#line 45 #line 45