mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Adding a default recipe and making the recipe choice optional in setup.
--HG-- branch : recipe
This commit is contained in:
@@ -20,6 +20,7 @@ namespace Orchard.Specs.Hosting {
|
||||
private IEnumerable<string> _knownModules;
|
||||
private IEnumerable<string> _knownThemes;
|
||||
private IEnumerable<string> _knownBinAssemblies;
|
||||
private IEnumerable<string> _knownRecipes;
|
||||
|
||||
public WebHost(Path orchardTemp) {
|
||||
_orchardTemp = orchardTemp;
|
||||
@@ -97,6 +98,9 @@ namespace Orchard.Specs.Hosting {
|
||||
path => IsSpecFlowTestAssembly(path) && !_tempSite.Combine("bin").Combine(path.FileName).Exists,
|
||||
_tempSite.Combine("bin"));
|
||||
|
||||
Log("Copy Orchard recipes");
|
||||
_orchardWebPath.Combine("Modules").Combine("Orchard.Setup").Combine("Recipes").DeepCopy("*.xml", _tempSite.Combine("Modules").Combine("Orchard.Setup").Combine("Recipes"));
|
||||
|
||||
StartAspNetHost(virtualDirectory);
|
||||
|
||||
Log("ASP.NET host initialization completed in {0} sec", stopwatch.Elapsed.TotalSeconds);
|
||||
|
@@ -48,7 +48,6 @@ Scenario: Calling setup on a brand new install
|
||||
| SiteName | My Site |
|
||||
| AdminPassword | 6655321 |
|
||||
| ConfirmPassword | 6655321 |
|
||||
| Recipe | Minimal |
|
||||
And I hit "Finish Setup"
|
||||
And I go to "/"
|
||||
Then I should see "My Site"
|
||||
|
11
src/Orchard.Specs/Setup.feature.cs
generated
11
src/Orchard.Specs/Setup.feature.cs
generated
@@ -203,18 +203,15 @@ this.ScenarioSetup(scenarioInfo);
|
||||
table5.AddRow(new string[] {
|
||||
"ConfirmPassword",
|
||||
"6655321"});
|
||||
table5.AddRow(new string[] {
|
||||
"Recipe",
|
||||
"Minimal"});
|
||||
#line 46
|
||||
testRunner.When("I fill in", ((string)(null)), table5);
|
||||
#line 52
|
||||
#line 51
|
||||
testRunner.And("I hit \"Finish Setup\"");
|
||||
#line 53
|
||||
#line 52
|
||||
testRunner.And("I go to \"/\"");
|
||||
#line 54
|
||||
#line 53
|
||||
testRunner.Then("I should see \"My Site\"");
|
||||
#line 55
|
||||
#line 54
|
||||
testRunner.And("I should see \"Welcome, <strong><a href=\"/Users/Account/ChangePassword\">admin</a><" +
|
||||
"/strong>!\"");
|
||||
#line hidden
|
||||
|
Reference in New Issue
Block a user