mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Fixing the remaining SpecFlow tests to work with the new setup.
--HG-- branch : recipe
This commit is contained in:
Suha Can
@@ -2,7 +2,6 @@
|
||||
using Orchard.Environment.Configuration;
|
||||
using Orchard.Environment.Descriptor;
|
||||
using Orchard.Environment.Descriptor.Models;
|
||||
using Orchard.Environment.Extensions.Models;
|
||||
using Orchard.Specs.Hosting.Orchard.Web;
|
||||
using TechTalk.SpecFlow;
|
||||
|
||||
@@ -21,8 +20,8 @@ namespace Orchard.Specs.Bindings {
|
||||
webApp.GivenIHaveACleanSiteWith(
|
||||
virtualDirectory,
|
||||
TableData(
|
||||
new { extension = "Module", names = "Orchard.Setup, Orchard.Pages, Orchard.Blogs, Orchard.Messaging, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce" },
|
||||
new { extension = "Core", names = "Common, Dashboard, Feeds, HomePage, Navigation, Contents, Routable, Scheduling, Settings, Shapes, XmlRpc" },
|
||||
new { extension = "Module", names = "Orchard.Setup, Orchard.Pages, Orchard.Blogs, Orchard.Messaging, Orchard.Media, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.Lists, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce, Orchard.Packaging, Orchard.Recipes" },
|
||||
new { extension = "Core", names = "Common, Containers, Dashboard, Feeds, HomePage, Navigation, Contents, Routable, Scheduling, Settings, Shapes, XmlRpc" },
|
||||
new { extension = "Theme", names = "SafeMode, TheAdmin, TheThemeMachine" }));
|
||||
|
||||
webApp.WhenIGoTo("Setup");
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
|
||||
Scenario: I can create a new content type
|
||||
Given I have installed Orchard
|
||||
And I have installed "Orchard.ContentTypes"
|
||||
When I go to "Admin/ContentTypes"
|
||||
Then I should see "<a[^>]*>.*?Create new type</a>"
|
||||
When I go to "Admin/ContentTypes/Create"
|
||||
@@ -19,7 +18,6 @@ Scenario: I can create a new content type
|
||||
|
||||
Scenario: I can't create a content type with an already existing name
|
||||
Given I have installed Orchard
|
||||
And I have installed "Orchard.ContentTypes"
|
||||
When I go to "Admin/ContentTypes/Create"
|
||||
And I fill in
|
||||
| name | value |
|
||||
@@ -39,7 +37,6 @@ Scenario: I can't create a content type with an already existing name
|
||||
|
||||
Scenario: I can't create a content type with an already existing technical name
|
||||
Given I have installed Orchard
|
||||
And I have installed "Orchard.ContentTypes"
|
||||
When I go to "Admin/ContentTypes/Create"
|
||||
And I fill in
|
||||
| name | value |
|
||||
@@ -59,7 +56,6 @@ Scenario: I can't create a content type with an already existing technical name
|
||||
|
||||
Scenario: I can't rename a content type with an already existing name
|
||||
Given I have installed Orchard
|
||||
And I have installed "Orchard.ContentTypes"
|
||||
When I go to "Admin/ContentTypes/Create"
|
||||
And I fill in
|
||||
| name | value |
|
||||
|
||||
172
src/Orchard.Specs/ContentTypes.feature.cs
generated
172
src/Orchard.Specs/ContentTypes.feature.cs
generated
@@ -1,7 +1,7 @@
|
||||
// ------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by SpecFlow (http://www.specflow.org/).
|
||||
// SpecFlow Version:1.3.2.0
|
||||
// SpecFlow Version:1.5.0.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.2.0")]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.5.0.0")]
|
||||
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
[NUnit.Framework.TestFixtureAttribute()]
|
||||
[NUnit.Framework.DescriptionAttribute("Content Types")]
|
||||
@@ -31,7 +31,7 @@ namespace Orchard.Specs
|
||||
{
|
||||
testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
|
||||
TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Content Types", "In order to add new types to my site\r\nAs an adminitrator\r\nI want to create create" +
|
||||
" content types", ((string[])(null)));
|
||||
" content types", GenerationTargetLanguage.CSharp, ((string[])(null)));
|
||||
testRunner.OnFeatureStart(featureInfo);
|
||||
}
|
||||
|
||||
@@ -61,15 +61,13 @@ namespace Orchard.Specs
|
||||
#line 6
|
||||
this.ScenarioSetup(scenarioInfo);
|
||||
#line 7
|
||||
testRunner.Given("I have installed Orchard");
|
||||
testRunner.Given("I have installed Orchard");
|
||||
#line 8
|
||||
testRunner.And("I have installed \"Orchard.ContentTypes\"");
|
||||
testRunner.When("I go to \"Admin/ContentTypes\"");
|
||||
#line 9
|
||||
testRunner.When("I go to \"Admin/ContentTypes\"");
|
||||
testRunner.Then("I should see \"<a[^>]*>.*?Create new type</a>\"");
|
||||
#line 10
|
||||
testRunner.Then("I should see \"<a[^>]*>.*?Create new type</a>\"");
|
||||
#line 11
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
#line hidden
|
||||
TechTalk.SpecFlow.Table table1 = new TechTalk.SpecFlow.Table(new string[] {
|
||||
"name",
|
||||
@@ -80,14 +78,14 @@ testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
table1.AddRow(new string[] {
|
||||
"Name",
|
||||
"Event"});
|
||||
#line 12
|
||||
testRunner.And("I fill in", ((string)(null)), table1);
|
||||
#line 11
|
||||
testRunner.And("I fill in", ((string)(null)), table1);
|
||||
#line 15
|
||||
testRunner.And("I hit \"Create\"");
|
||||
#line 16
|
||||
testRunner.And("I hit \"Create\"");
|
||||
testRunner.And("I go to \"Admin/ContentTypes/\"");
|
||||
#line 17
|
||||
testRunner.And("I go to \"Admin/ContentTypes/\"");
|
||||
#line 18
|
||||
testRunner.Then("I should see \"Event\"");
|
||||
testRunner.Then("I should see \"Event\"");
|
||||
#line hidden
|
||||
testRunner.CollectScenarioErrors();
|
||||
}
|
||||
@@ -97,14 +95,12 @@ testRunner.Then("I should see \"Event\"");
|
||||
public virtual void ICanTCreateAContentTypeWithAnAlreadyExistingName()
|
||||
{
|
||||
TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("I can\'t create a content type with an already existing name", ((string[])(null)));
|
||||
#line 20
|
||||
#line 19
|
||||
this.ScenarioSetup(scenarioInfo);
|
||||
#line 20
|
||||
testRunner.Given("I have installed Orchard");
|
||||
#line 21
|
||||
testRunner.Given("I have installed Orchard");
|
||||
#line 22
|
||||
testRunner.And("I have installed \"Orchard.ContentTypes\"");
|
||||
#line 23
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
#line hidden
|
||||
TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] {
|
||||
"name",
|
||||
@@ -115,16 +111,16 @@ testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
table2.AddRow(new string[] {
|
||||
"Name",
|
||||
"Event"});
|
||||
#line 24
|
||||
testRunner.And("I fill in", ((string)(null)), table2);
|
||||
#line 22
|
||||
testRunner.And("I fill in", ((string)(null)), table2);
|
||||
#line 26
|
||||
testRunner.And("I hit \"Create\"");
|
||||
#line 27
|
||||
testRunner.And("I go to \"Admin/ContentTypes/\"");
|
||||
#line 28
|
||||
testRunner.And("I hit \"Create\"");
|
||||
testRunner.Then("I should see \"Event\"");
|
||||
#line 29
|
||||
testRunner.And("I go to \"Admin/ContentTypes/\"");
|
||||
#line 30
|
||||
testRunner.Then("I should see \"Event\"");
|
||||
#line 31
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
#line hidden
|
||||
TechTalk.SpecFlow.Table table3 = new TechTalk.SpecFlow.Table(new string[] {
|
||||
"name",
|
||||
@@ -135,14 +131,14 @@ testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
table3.AddRow(new string[] {
|
||||
"Name",
|
||||
"Event-2"});
|
||||
#line 32
|
||||
testRunner.And("I fill in", ((string)(null)), table3);
|
||||
#line 30
|
||||
testRunner.And("I fill in", ((string)(null)), table3);
|
||||
#line 34
|
||||
testRunner.And("I hit \"Create\"");
|
||||
#line 35
|
||||
testRunner.Then("I should see \"<h1[^>]*>.*?New Content Type.*?</h1>\"");
|
||||
#line 36
|
||||
testRunner.And("I hit \"Create\"");
|
||||
#line 37
|
||||
testRunner.Then("I should see \"<h1[^>]*>.*?New Content Type.*?</h1>\"");
|
||||
#line 38
|
||||
testRunner.And("I should see \"validation-summary-errors\"");
|
||||
testRunner.And("I should see \"validation-summary-errors\"");
|
||||
#line hidden
|
||||
testRunner.CollectScenarioErrors();
|
||||
}
|
||||
@@ -152,14 +148,12 @@ testRunner.And("I should see \"validation-summary-errors\"");
|
||||
public virtual void ICanTCreateAContentTypeWithAnAlreadyExistingTechnicalName()
|
||||
{
|
||||
TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("I can\'t create a content type with an already existing technical name", ((string[])(null)));
|
||||
#line 40
|
||||
#line 38
|
||||
this.ScenarioSetup(scenarioInfo);
|
||||
#line 41
|
||||
testRunner.Given("I have installed Orchard");
|
||||
#line 42
|
||||
testRunner.And("I have installed \"Orchard.ContentTypes\"");
|
||||
#line 43
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
#line 39
|
||||
testRunner.Given("I have installed Orchard");
|
||||
#line 40
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
#line hidden
|
||||
TechTalk.SpecFlow.Table table4 = new TechTalk.SpecFlow.Table(new string[] {
|
||||
"name",
|
||||
@@ -170,16 +164,16 @@ testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
table4.AddRow(new string[] {
|
||||
"Name",
|
||||
"Dinner"});
|
||||
#line 44
|
||||
testRunner.And("I fill in", ((string)(null)), table4);
|
||||
#line 41
|
||||
testRunner.And("I fill in", ((string)(null)), table4);
|
||||
#line 45
|
||||
testRunner.And("I hit \"Create\"");
|
||||
#line 46
|
||||
testRunner.And("I go to \"Admin/ContentTypes/\"");
|
||||
#line 47
|
||||
testRunner.Then("I should see \"Dinner\"");
|
||||
#line 48
|
||||
testRunner.And("I hit \"Create\"");
|
||||
#line 49
|
||||
testRunner.And("I go to \"Admin/ContentTypes/\"");
|
||||
#line 50
|
||||
testRunner.Then("I should see \"Dinner\"");
|
||||
#line 51
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
#line hidden
|
||||
TechTalk.SpecFlow.Table table5 = new TechTalk.SpecFlow.Table(new string[] {
|
||||
"name",
|
||||
@@ -190,14 +184,14 @@ testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
table5.AddRow(new string[] {
|
||||
"Name",
|
||||
"Dinner"});
|
||||
#line 52
|
||||
testRunner.And("I fill in", ((string)(null)), table5);
|
||||
#line 56
|
||||
testRunner.And("I hit \"Create\"");
|
||||
#line 57
|
||||
testRunner.Then("I should see \"<h1[^>]*>.*?New Content Type.*?</h1>\"");
|
||||
#line 58
|
||||
testRunner.And("I should see \"validation-summary-errors\"");
|
||||
#line 49
|
||||
testRunner.And("I fill in", ((string)(null)), table5);
|
||||
#line 53
|
||||
testRunner.And("I hit \"Create\"");
|
||||
#line 54
|
||||
testRunner.Then("I should see \"<h1[^>]*>.*?New Content Type.*?</h1>\"");
|
||||
#line 55
|
||||
testRunner.And("I should see \"validation-summary-errors\"");
|
||||
#line hidden
|
||||
testRunner.CollectScenarioErrors();
|
||||
}
|
||||
@@ -207,14 +201,12 @@ testRunner.And("I should see \"validation-summary-errors\"");
|
||||
public virtual void ICanTRenameAContentTypeWithAnAlreadyExistingName()
|
||||
{
|
||||
TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("I can\'t rename a content type with an already existing name", ((string[])(null)));
|
||||
#line 60
|
||||
#line 57
|
||||
this.ScenarioSetup(scenarioInfo);
|
||||
#line 61
|
||||
testRunner.Given("I have installed Orchard");
|
||||
#line 62
|
||||
testRunner.And("I have installed \"Orchard.ContentTypes\"");
|
||||
#line 63
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
#line 58
|
||||
testRunner.Given("I have installed Orchard");
|
||||
#line 59
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
#line hidden
|
||||
TechTalk.SpecFlow.Table table6 = new TechTalk.SpecFlow.Table(new string[] {
|
||||
"name",
|
||||
@@ -225,16 +217,16 @@ testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
table6.AddRow(new string[] {
|
||||
"Name",
|
||||
"Dinner"});
|
||||
#line 60
|
||||
testRunner.And("I fill in", ((string)(null)), table6);
|
||||
#line 64
|
||||
testRunner.And("I fill in", ((string)(null)), table6);
|
||||
#line 68
|
||||
testRunner.And("I hit \"Create\"");
|
||||
#line 69
|
||||
testRunner.And("I go to \"Admin/ContentTypes/\"");
|
||||
#line 70
|
||||
testRunner.Then("I should see \"Dinner\"");
|
||||
#line 71
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
testRunner.And("I hit \"Create\"");
|
||||
#line 65
|
||||
testRunner.And("I go to \"Admin/ContentTypes/\"");
|
||||
#line 66
|
||||
testRunner.Then("I should see \"Dinner\"");
|
||||
#line 67
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
#line hidden
|
||||
TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] {
|
||||
"name",
|
||||
@@ -245,16 +237,16 @@ testRunner.When("I go to \"Admin/ContentTypes/Create\"");
|
||||
table7.AddRow(new string[] {
|
||||
"Name",
|
||||
"Event"});
|
||||
#line 68
|
||||
testRunner.And("I fill in", ((string)(null)), table7);
|
||||
#line 72
|
||||
testRunner.And("I fill in", ((string)(null)), table7);
|
||||
#line 76
|
||||
testRunner.And("I hit \"Create\"");
|
||||
#line 77
|
||||
testRunner.And("I go to \"Admin/ContentTypes/\"");
|
||||
#line 78
|
||||
testRunner.Then("I should see \"Event\"");
|
||||
#line 79
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Edit/Dinner\"");
|
||||
testRunner.And("I hit \"Create\"");
|
||||
#line 73
|
||||
testRunner.And("I go to \"Admin/ContentTypes/\"");
|
||||
#line 74
|
||||
testRunner.Then("I should see \"Event\"");
|
||||
#line 75
|
||||
testRunner.When("I go to \"Admin/ContentTypes/Edit/Dinner\"");
|
||||
#line hidden
|
||||
TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] {
|
||||
"name",
|
||||
@@ -262,12 +254,12 @@ testRunner.When("I go to \"Admin/ContentTypes/Edit/Dinner\"");
|
||||
table8.AddRow(new string[] {
|
||||
"DisplayName",
|
||||
"Event"});
|
||||
#line 76
|
||||
testRunner.And("I fill in", ((string)(null)), table8);
|
||||
#line 79
|
||||
testRunner.And("I hit \"Save\"");
|
||||
#line 80
|
||||
testRunner.And("I fill in", ((string)(null)), table8);
|
||||
#line 83
|
||||
testRunner.And("I hit \"Save\"");
|
||||
#line 84
|
||||
testRunner.Then("I should see \"validation-summary-errors\"");
|
||||
testRunner.Then("I should see \"validation-summary-errors\"");
|
||||
#line hidden
|
||||
testRunner.CollectScenarioErrors();
|
||||
}
|
||||
|
||||
@@ -20,7 +20,6 @@ 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;
|
||||
|
||||
@@ -39,8 +39,8 @@ Scenario: Some of the initial form values are required
|
||||
Scenario: Calling setup on a brand new install
|
||||
Given I have a clean site with
|
||||
| extension | names |
|
||||
| Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Messaging, Orchard.Scripting, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce |
|
||||
| Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc |
|
||||
| Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Lists, Orchard.ContentTypes, Orchard.Messaging, Orchard.Media, Orchard.Scripting, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce, Orchard.Blogs, Orchard.Tags, Orchard.Packaging, Orchard.Recipes |
|
||||
| Core | Common, Containers, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc |
|
||||
| Theme | SafeMode, TheThemeMachine |
|
||||
And I am on "/Setup"
|
||||
When I fill in
|
||||
|
||||
8
src/Orchard.Specs/Setup.feature.cs
generated
8
src/Orchard.Specs/Setup.feature.cs
generated
@@ -176,13 +176,11 @@ this.ScenarioSetup(scenarioInfo);
|
||||
"names"});
|
||||
table4.AddRow(new string[] {
|
||||
"Module",
|
||||
"Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Messaging, Or" +
|
||||
"chard.Scripting, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard" +
|
||||
".Modules, Orchard.Widgets, Orchard.jQuery, TinyMce"});
|
||||
@"Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Lists, Orchard.ContentTypes, Orchard.Messaging, Orchard.Media, Orchard.Scripting, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce, Orchard.Blogs, Orchard.Tags, Orchard.Packaging, Orchard.Recipes"});
|
||||
table4.AddRow(new string[] {
|
||||
"Core",
|
||||
"Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, S" +
|
||||
"ettings, Shapes, XmlRpc"});
|
||||
"Common, Containers, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, S" +
|
||||
"cheduling, Settings, Shapes, XmlRpc"});
|
||||
table4.AddRow(new string[] {
|
||||
"Theme",
|
||||
"SafeMode, TheThemeMachine"});
|
||||
|
||||
Reference in New Issue
Block a user