From 4d5ef16ee0aa79c09cfbc37b83280c555195c277 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 1 Mar 2012 11:03:27 -0800 Subject: [PATCH] Fixing functional tests --- .hgsubstate | 2 +- .../Bindings/OrchardSiteFactory.cs | 2 +- src/Orchard.Specs/Lists.feature | 2 + src/Orchard.Specs/Lists.feature.cs | 52 ++++++++++--------- 4 files changed, 32 insertions(+), 26 deletions(-) diff --git a/.hgsubstate b/.hgsubstate index 7b08e9db7..7ddc9ad23 100644 --- a/.hgsubstate +++ b/.hgsubstate @@ -1,4 +1,4 @@ -aa41eccbfa3f1a732ec1a40ea8e49bfe74d572d6 src/Orchard.Web/Modules/Orchard.Autoroute +d695b7235fc4f1edf216a610ced8fb9c6e7f29d6 src/Orchard.Web/Modules/Orchard.Autoroute 1f316804967aea8eebbab1bb343bb44d96a368b8 src/Orchard.Web/Modules/Orchard.Forms 7a1553d61ec49f709395a409a8edfe0956ab991c src/Orchard.Web/Modules/Orchard.Rules dab42f20280f46c25c6c78ef13870f9a063bd026 src/Orchard.Web/Modules/Orchard.TaskLease diff --git a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs index 9f96fdbd6..e61fe4635 100644 --- a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs +++ b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs @@ -23,7 +23,7 @@ namespace Orchard.Specs.Bindings { webApp.GivenIHaveACleanSiteWith( virtualDirectory, TableData( - new { extension = "Module", names = "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.Lists, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce, Orchard.Packaging, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Tokens, Orchard.Autoroute" }, + new { extension = "Module", names = "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" }, new { extension = "Core", names = "Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title" }, new { extension = "Theme", names = "SafeMode, TheAdmin, TheThemeMachine" })); diff --git a/src/Orchard.Specs/Lists.feature b/src/Orchard.Specs/Lists.feature index c3200d28c..660b86f19 100644 --- a/src/Orchard.Specs/Lists.feature +++ b/src/Orchard.Specs/Lists.feature @@ -5,6 +5,7 @@ Scenario: I can create a new list Given I have installed Orchard + And I have installed "Orchard.Lists" When I go to "Admin/Contents/Create/List" And I fill in | name | value | @@ -15,6 +16,7 @@ Scenario: I can create a new list Scenario: I can add content items to a list Given I have installed Orchard + And I have installed "Orchard.Lists" And I have a containable content type "MyType" When I go to "Admin/Contents/Create/List" And I fill in diff --git a/src/Orchard.Specs/Lists.feature.cs b/src/Orchard.Specs/Lists.feature.cs index 16dc943d5..2be4264bc 100644 --- a/src/Orchard.Specs/Lists.feature.cs +++ b/src/Orchard.Specs/Lists.feature.cs @@ -75,6 +75,8 @@ this.ScenarioSetup(scenarioInfo); #line 7 testRunner.Given("I have installed Orchard"); #line 8 + testRunner.And("I have installed \"Orchard.Lists\""); +#line 9 testRunner.When("I go to \"Admin/Contents/Create/List\""); #line hidden TechTalk.SpecFlow.Table table1 = new TechTalk.SpecFlow.Table(new string[] { @@ -83,13 +85,13 @@ this.ScenarioSetup(scenarioInfo); table1.AddRow(new string[] { "Title.Title", "MyList"}); -#line 9 +#line 10 testRunner.And("I fill in", ((string)(null)), table1); -#line 12 - testRunner.And("I hit \"Save\""); #line 13 - testRunner.And("I go to \"Admin/Contents/List/List\""); + testRunner.And("I hit \"Save\""); #line 14 + testRunner.And("I go to \"Admin/Contents/List/List\""); +#line 15 testRunner.Then("I should see \"MyList\""); #line hidden this.ScenarioCleanup(); @@ -100,13 +102,15 @@ this.ScenarioSetup(scenarioInfo); public virtual void ICanAddContentItemsToAList() { TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("I can add content items to a list", ((string[])(null))); -#line 16 -this.ScenarioSetup(scenarioInfo); #line 17 - testRunner.Given("I have installed Orchard"); +this.ScenarioSetup(scenarioInfo); #line 18 - testRunner.And("I have a containable content type \"MyType\""); + testRunner.Given("I have installed Orchard"); #line 19 + testRunner.And("I have installed \"Orchard.Lists\""); +#line 20 + testRunner.And("I have a containable content type \"MyType\""); +#line 21 testRunner.When("I go to \"Admin/Contents/Create/List\""); #line hidden TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] { @@ -115,23 +119,23 @@ this.ScenarioSetup(scenarioInfo); table2.AddRow(new string[] { "Title.Title", "MyList"}); -#line 20 +#line 22 testRunner.And("I fill in", ((string)(null)), table2); -#line 23 - testRunner.And("I hit \"Save\""); -#line 24 - testRunner.And("I go to \"Admin/Contents/List/List\""); #line 25 - testRunner.Then("I should see \"MyList\""); + testRunner.And("I hit \"Save\""); #line 26 - testRunner.When("I follow \"Contained Items\""); + testRunner.And("I go to \"Admin/Contents/List/List\""); #line 27 - testRunner.Then("I should see \"The \'MyList\' List has no content items.\""); + testRunner.Then("I should see \"MyList\""); #line 28 - testRunner.When("I follow \"Create New Content\" where href has \"ReturnUrl\""); + testRunner.When("I follow \"Contained Items\""); #line 29 - testRunner.Then("I should see \"MyType\""); + testRunner.Then("I should see \"The \'MyList\' List has no content items.\""); #line 30 + testRunner.When("I follow \"Create New Content\" where href has \"ReturnUrl\""); +#line 31 + testRunner.Then("I should see \"MyType\""); +#line 32 testRunner.When("I follow \"MyType\" where href has \"ReturnUrl\""); #line hidden TechTalk.SpecFlow.Table table3 = new TechTalk.SpecFlow.Table(new string[] { @@ -140,15 +144,15 @@ this.ScenarioSetup(scenarioInfo); table3.AddRow(new string[] { "Title.Title", "MyContentItem"}); -#line 31 +#line 33 testRunner.And("I fill in", ((string)(null)), table3); -#line 34 - testRunner.And("I hit \"Save\""); -#line 35 - testRunner.And("I am redirected"); #line 36 - testRunner.Then("I should see \"Manage MyList\""); + testRunner.And("I hit \"Save\""); #line 37 + testRunner.And("I am redirected"); +#line 38 + testRunner.Then("I should see \"Manage MyList\""); +#line 39 testRunner.And("I should see \"MyContentItem\""); #line hidden this.ScenarioCleanup();