lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-04-28 14:07:08 -07:00
parent 0b3dbcb161 ee29c52141
commit 02c6835627
27 changed files with 1210 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Orchard.Specs/Bindings/OrchardSiteFactory.cs
View File

@@ -47,23 +47,11 @@ namespace Orchard.Specs.Bindings {
descriptor.EnabledFeatures.Concat(new[] { new ShellFeature { Name = name } }),
descriptor.Parameters);
}
Trace.WriteLine("This call to Host.Reinitialize should not be needed, eventually");
MvcApplication.Host.Reinitialize_Obsolete();
});
}
[When(@"I cycle the app domain")]
public void WhenICycleTheAppDomain() {
var webApp = Binding<WebAppHosting>();
webApp.Host.Execute(() => {
Trace.WriteLine("This call to Host.Reinitialize should not be needed, eventually");
MvcApplication.Host.Reinitialize_Obsolete();
});
}
[Given(@"I have tenant ""(.*)\"" on ""(.*)\"" as ""(.*)\""")]
public void GivenIHaveTenantOnSiteAsName(string shellName, string hostName, string siteName) {
var webApp = Binding<WebAppHosting>();
@@ -76,7 +64,6 @@ namespace Orchard.Specs.Bindings {
using (var environment = MvcApplication.CreateStandaloneEnvironment("Default")) {
environment.Resolve<IShellSettingsManager>().SaveSettings(shellSettings);
}
MvcApplication.Host.Reinitialize_Obsolete();
});
webApp.WhenIGoToPathOnHost("Setup", hostName);

2
src/Orchard.Specs/Modules.feature
View File

@@ -19,6 +19,6 @@ Scenario: Edit module shows its features
Scenario: Features of installed modules are listed
Given I have installed Orchard
When I go to "admin/modules/features"
Then I should see "<h2>Available Features</h2>"
Then I should see "<h1>Manage Features</h1>"
And I should see "<h3>Common</h3>"
And the status should be 200 OK

2
src/Orchard.Specs/Modules.feature.cs generated
View File

@@ -102,7 +102,7 @@ this.ScenarioSetup(scenarioInfo);
#line 21
testRunner.When("I go to \"admin/modules/features\"");
#line 22
testRunner.Then("I should see \"<h2>Available Features</h2>\"");
testRunner.Then("I should see \"<h1>Manage Features</h1>\"");
#line 23
testRunner.And("I should see \"<h3>Common</h3>\"");
#line 24

2
src/Orchard.Specs/MultiTenancy.feature
View File

@@ -79,6 +79,6 @@ Scenario: Listing tenants from command line
Given I have installed Orchard
And I have installed "Orchard.MultiTenancy"
And I have tenant "Alpha" on "example.org" as "New-site-name"
When I execute >orchard tenant list
When I execute >tenant list
Then I should see "Name: Alpha"
And I should see "Request Url Host: example.org"

2
src/Orchard.Specs/MultiTenancy.feature.cs generated
View File

@@ -8,7 +8,7 @@
// the code is regenerated.
// </auto-generated>
// ------------------------------------------------------------------------------
namespace Orchard.Specs
namespace Orchard.Tests
{
using TechTalk.SpecFlow;