mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
Updated some of the MultiTenancy SpecFlow tests
Need to add more to cover database preconfiguration --HG-- branch : dev
This commit is contained in:
@@ -64,7 +64,7 @@ Scenario: A new tenant with preconfigured database goes to the setup screen
|
|||||||
| name | value |
|
| name | value |
|
||||||
| Name | Scott |
|
| Name | Scott |
|
||||||
| RequestUrlHost | scott.example.org |
|
| RequestUrlHost | scott.example.org |
|
||||||
| DatabaseOptions | True |
|
| DataProvider | SQLite |
|
||||||
And I hit "Save"
|
And I hit "Save"
|
||||||
And I am redirected
|
And I am redirected
|
||||||
And I go to "/Setup" on host scott.example.org
|
And I go to "/Setup" on host scott.example.org
|
||||||
|
|||||||
4
src/Orchard.Specs/MultiTenancy.feature.cs
generated
4
src/Orchard.Specs/MultiTenancy.feature.cs
generated
@@ -225,8 +225,8 @@ this.ScenarioSetup(scenarioInfo);
|
|||||||
"RequestUrlHost",
|
"RequestUrlHost",
|
||||||
"scott.example.org"});
|
"scott.example.org"});
|
||||||
table4.AddRow(new string[] {
|
table4.AddRow(new string[] {
|
||||||
"DatabaseOptions",
|
"DataProvider",
|
||||||
"True"});
|
"SQLite"});
|
||||||
#line 63
|
#line 63
|
||||||
testRunner.And("I fill in", ((string)(null)), table4);
|
testRunner.And("I fill in", ((string)(null)), table4);
|
||||||
#line 68
|
#line 68
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ namespace Orchard.Setup.Controllers {
|
|||||||
|
|
||||||
public ActionResult Index() {
|
public ActionResult Index() {
|
||||||
var initialSettings = _setupService.Prime();
|
var initialSettings = _setupService.Prime();
|
||||||
return IndexViewResult(new SetupViewModel { AdminUsername = "admin", DatabaseIsPreconfigured = !(string.IsNullOrEmpty(initialSettings.DataProvider) || string.Equals(initialSettings.DataProvider, "none", StringComparison.OrdinalIgnoreCase))});
|
return IndexViewResult(new SetupViewModel { AdminUsername = "admin", DatabaseIsPreconfigured = !string.IsNullOrEmpty(initialSettings.DataProvider)});
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpPost, ActionName("Index")]
|
[HttpPost, ActionName("Index")]
|
||||||
|
|||||||
Reference in New Issue
Block a user