diff --git a/src/Orchard.Specs/Modules.feature b/src/Orchard.Specs/Modules.feature
index 82edc99cf..1c094a2a8 100644
--- a/src/Orchard.Specs/Modules.feature
+++ b/src/Orchard.Specs/Modules.feature
@@ -12,7 +12,7 @@ Scenario: Installed modules are listed
| Options.SearchText | Themes |
And I hit "Search"
Then I should see "Modules
"
- And I should see "]*>Themes"
+ And I should see "]*>\s*Themes"
And the status should be 200 "OK"
Scenario: Features of installed modules are listed
diff --git a/src/Orchard.Specs/Modules.feature.cs b/src/Orchard.Specs/Modules.feature.cs
index 1daad6ee7..a774c8e80 100644
--- a/src/Orchard.Specs/Modules.feature.cs
+++ b/src/Orchard.Specs/Modules.feature.cs
@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.34014
+// Runtime Version:4.0.30319.0
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -92,7 +92,7 @@ this.ScenarioSetup(scenarioInfo);
#line 14
testRunner.Then("I should see \"Modules
\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 15
- testRunner.And("I should see \"]*>Themes\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I should see \"]*>\\s*Themes\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 16
testRunner.And("the status should be 200 \"OK\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
diff --git a/src/Orchard.Specs/Pages.feature b/src/Orchard.Specs/Pages.feature
index 0afb85f4f..5352b3df9 100644
--- a/src/Orchard.Specs/Pages.feature
+++ b/src/Orchard.Specs/Pages.feature
@@ -14,7 +14,7 @@ Scenario: In the admin (menu) there is a link to create a Page
And I fill in
| name | value |
| Title.Title | Super Duper |
- | LayoutPart.LayoutEditor.Data | { "elements": [ { "typeName": "Orchard.Layouts.Elements.Text", "state": "Content=This+is+super."} ] } |
+ | LayoutPart.LayoutEditor.Data | { "type": "Content", "data": "TypeName=Orchard.Layouts.Elements.Text&Content=This+is+super", "isTemplated": false, "contentType": "Orchard.Layouts.Elements.Text", "contentTypeLabel": "Text", "contentTypeClass": "text", "html": "This is super", "hasEditor": true } |
And I hit "Publish Now"
And I go to "super-duper"
Then I should see "]*>.*?Super Duper.*?"
@@ -25,7 +25,7 @@ Scenario: In the admin (menu) there is a link to create a Page
And I fill in
| name | value |
| Title.Title | Super Duper |
- | LayoutPart.LayoutEditor.Data | { "elements": [ { "typeName": "Orchard.Layouts.Elements.Text", "state": "Content=This+is+super+number+two."} ] } |
+ | LayoutPart.LayoutEditor.Data | { "type": "Content", "data": "TypeName=Orchard.Layouts.Elements.Text&Content=This+is+super+number+two", "isTemplated": false, "contentType": "Orchard.Layouts.Elements.Text", "contentTypeLabel": "Text", "contentTypeClass": "text", "html": "This is super number two", "hasEditor": true } |
And I hit "Publish Now"
And I go to "super-duper-2"
Then I should see "]*>.*?Super Duper.*?"
@@ -36,7 +36,6 @@ Scenario: In the admin (menu) there is a link to create a Page
And I fill in
| name | value |
| Title.Title | Another |
- | LayoutPart.LayoutEditor.Data | { "elements": [ { "typeName": "Orchard.Layouts.Elements.Text", "state": "Content=This+is+the+draft+of+a+new+homepage."} ] } |
| Autoroute.PromoteToHomePage | true |
And I hit "Publish Now"
And I go to "/"
@@ -49,7 +48,6 @@ Scenario: In the admin (menu) there is a link to create a Page
And I fill in
| name | value |
| Title.Title | Drafty |
- | LayoutPart.LayoutEditor.Data | { "elements": [ { "typeName": "Orchard.Layouts.Elements.Text", "state": "Content=This+is+the+draft+of+a+new+homepage."} ] } |
| Autoroute.PromoteToHomePage | true |
And I hit "Save"
And I go to "/"
diff --git a/src/Orchard.Specs/Pages.feature.cs b/src/Orchard.Specs/Pages.feature.cs
index ebb572ca5..7ea3cf7d5 100644
--- a/src/Orchard.Specs/Pages.feature.cs
+++ b/src/Orchard.Specs/Pages.feature.cs
@@ -89,8 +89,7 @@ this.ScenarioSetup(scenarioInfo);
"Super Duper"});
table1.AddRow(new string[] {
"LayoutPart.LayoutEditor.Data",
- "{ \"elements\": [ { \"typeName\": \"Orchard.Layouts.Elements.Text\", \"state\": \"Content=" +
- "This+is+super.\"} ] }"});
+ @"{ ""type"": ""Content"", ""data"": ""TypeName=Orchard.Layouts.Elements.Text&Content=This+is+super"", ""isTemplated"": false, ""contentType"": ""Orchard.Layouts.Elements.Text"", ""contentTypeLabel"": ""Text"", ""contentTypeClass"": ""text"", ""html"": ""This is super"", ""hasEditor"": true }"});
#line 14
testRunner.And("I fill in", ((string)(null)), table1, "And ");
#line 18
@@ -112,8 +111,7 @@ this.ScenarioSetup(scenarioInfo);
"Super Duper"});
table2.AddRow(new string[] {
"LayoutPart.LayoutEditor.Data",
- "{ \"elements\": [ { \"typeName\": \"Orchard.Layouts.Elements.Text\", \"state\": \"Content=" +
- "This+is+super+number+two.\"} ] }"});
+ @"{ ""type"": ""Content"", ""data"": ""TypeName=Orchard.Layouts.Elements.Text&Content=This+is+super+number+two"", ""isTemplated"": false, ""contentType"": ""Orchard.Layouts.Elements.Text"", ""contentTypeLabel"": ""Text"", ""contentTypeClass"": ""text"", ""html"": ""This is super number two"", ""hasEditor"": true }"});
#line 25
testRunner.And("I fill in", ((string)(null)), table2, "And ");
#line 29
@@ -133,26 +131,22 @@ this.ScenarioSetup(scenarioInfo);
table3.AddRow(new string[] {
"Title.Title",
"Another"});
- table3.AddRow(new string[] {
- "LayoutPart.LayoutEditor.Data",
- "{ \"elements\": [ { \"typeName\": \"Orchard.Layouts.Elements.Text\", \"state\": \"Content=" +
- "This+is+the+draft+of+a+new+homepage.\"} ] }"});
table3.AddRow(new string[] {
"Autoroute.PromoteToHomePage",
"true"});
#line 36
testRunner.And("I fill in", ((string)(null)), table3, "And ");
-#line 41
+#line 40
testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line 42
+#line 41
testRunner.And("I go to \"/\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line 43
+#line 42
testRunner.Then("I should see \"Another
\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
-#line 44
+#line 43
testRunner.When("I go to \"another\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
-#line 45
+#line 44
testRunner.Then("the status should be 404 \"Not Found\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
-#line 48
+#line 47
testRunner.When("I go to \"Admin/Contents/Create/Page\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
TechTalk.SpecFlow.Table table4 = new TechTalk.SpecFlow.Table(new string[] {
@@ -161,20 +155,16 @@ this.ScenarioSetup(scenarioInfo);
table4.AddRow(new string[] {
"Title.Title",
"Drafty"});
- table4.AddRow(new string[] {
- "LayoutPart.LayoutEditor.Data",
- "{ \"elements\": [ { \"typeName\": \"Orchard.Layouts.Elements.Text\", \"state\": \"Content=" +
- "This+is+the+draft+of+a+new+homepage.\"} ] }"});
table4.AddRow(new string[] {
"Autoroute.PromoteToHomePage",
"true"});
-#line 49
+#line 48
testRunner.And("I fill in", ((string)(null)), table4, "And ");
-#line 54
+#line 52
testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line 55
+#line 53
testRunner.And("I go to \"/\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line 56
+#line 54
testRunner.Then("I should see \"Another
\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
this.ScenarioCleanup();
diff --git a/src/Orchard.Specs/Users.feature b/src/Orchard.Specs/Users.feature
index 7fcbe9942..dafcf1ebd 100644
--- a/src/Orchard.Specs/Users.feature
+++ b/src/Orchard.Specs/Users.feature
@@ -256,11 +256,12 @@ Scenario: I should be able to filter users by status
| Options.Search | user1 |
And I hit "Filter"
Then I should see "]*>user1"
- When I follow "Disable"
+ When I hit "Disable"
And I am redirected
Then I should see "User user1 disabled"
When I fill in
| name | value |
+ | Options.Search | |
| Options.Filter | Pending |
And I hit "Filter"
Then I should see "]*>user1"
@@ -268,20 +269,23 @@ Scenario: I should be able to filter users by status
And I should not see "]*>admin"
When I fill in
| name | value |
- | Options.Filter | EmailPending |
+ | Options.Search | |
+ | Options.Filter | EmailPending |
And I hit "Filter"
Then I should not see "]*>user1"
And I should not see "]*>user2"
And I should not see "]*>admin"
When I fill in
| name | value |
- | Options.Filter | Approved |
+ | Options.Search | |
+ | Options.Filter | Approved |
And I hit "Filter"
Then I should not see "]*>user1"
And I should see "]*>user2"
And I should see "]*>admin"
When I fill in
| name | value |
+ | Options.Search | |
| Options.Filter | All |
And I hit "Filter"
Then I should see "]*>user1"
diff --git a/src/Orchard.Specs/Users.feature.cs b/src/Orchard.Specs/Users.feature.cs
index 2eecf6ab1..e1d2337e2 100644
--- a/src/Orchard.Specs/Users.feature.cs
+++ b/src/Orchard.Specs/Users.feature.cs
@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.34014
+// Runtime Version:4.0.30319.0
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -712,7 +712,7 @@ this.ScenarioSetup(scenarioInfo);
#line 258
testRunner.Then("I should see \"]*>user1\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 259
- testRunner.When("I follow \"Disable\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I hit \"Disable\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 260
testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 261
@@ -721,69 +721,81 @@ this.ScenarioSetup(scenarioInfo);
TechTalk.SpecFlow.Table table23 = new TechTalk.SpecFlow.Table(new string[] {
"name",
"value"});
+ table23.AddRow(new string[] {
+ "Options.Search",
+ ""});
table23.AddRow(new string[] {
"Options.Filter",
"Pending"});
#line 262
testRunner.When("I fill in", ((string)(null)), table23, "When ");
-#line 265
- testRunner.And("I hit \"Filter\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 266
- testRunner.Then("I should see \"]*>user1\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+ testRunner.And("I hit \"Filter\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 267
- testRunner.And("I should not see \"]*>user2\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.Then("I should see \"]*>user1\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 268
+ testRunner.And("I should not see \"]*>user2\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 269
testRunner.And("I should not see \"]*>admin\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table24 = new TechTalk.SpecFlow.Table(new string[] {
"name",
"value"});
+ table24.AddRow(new string[] {
+ "Options.Search",
+ ""});
table24.AddRow(new string[] {
"Options.Filter",
"EmailPending"});
-#line 269
+#line 270
testRunner.When("I fill in", ((string)(null)), table24, "When ");
-#line 272
- testRunner.And("I hit \"Filter\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line 273
- testRunner.Then("I should not see \"]*>user1\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 274
- testRunner.And("I should not see \"]*>user2\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I hit \"Filter\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 275
+ testRunner.Then("I should not see \"]*>user1\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line 276
+ testRunner.And("I should not see \"]*>user2\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 277
testRunner.And("I should not see \"]*>admin\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table25 = new TechTalk.SpecFlow.Table(new string[] {
"name",
"value"});
+ table25.AddRow(new string[] {
+ "Options.Search",
+ ""});
table25.AddRow(new string[] {
"Options.Filter",
"Approved"});
-#line 276
+#line 278
testRunner.When("I fill in", ((string)(null)), table25, "When ");
-#line 279
- testRunner.And("I hit \"Filter\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line 280
- testRunner.Then("I should not see \"]*>user1\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
-#line 281
- testRunner.And("I should see \"]*>user2\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 282
+ testRunner.And("I hit \"Filter\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 283
+ testRunner.Then("I should not see \"]*>user1\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line 284
+ testRunner.And("I should see \"]*>user2\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 285
testRunner.And("I should see \"]*>admin\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table26 = new TechTalk.SpecFlow.Table(new string[] {
"name",
"value"});
+ table26.AddRow(new string[] {
+ "Options.Search",
+ ""});
table26.AddRow(new string[] {
"Options.Filter",
"All"});
-#line 283
- testRunner.When("I fill in", ((string)(null)), table26, "When ");
#line 286
+ testRunner.When("I fill in", ((string)(null)), table26, "When ");
+#line 290
testRunner.And("I hit \"Filter\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line 287
+#line 291
testRunner.Then("I should see \"]*>user1\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
-#line 288
+#line 292
testRunner.And("I should see \"]*>user2\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line 289
+#line 293
testRunner.And("I should see \"]*>admin\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
this.ScenarioCleanup();
@@ -796,13 +808,13 @@ this.ScenarioSetup(scenarioInfo);
{
TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("I should not be able to add users with invalid email addresses", new string[] {
"email"});
-#line 291
+#line 295
this.ScenarioSetup(scenarioInfo);
-#line 292
+#line 296
testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
-#line 293
+#line 297
testRunner.When("I go to \"admin/users\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
-#line 294
+#line 298
testRunner.And("I follow \"Add a new user\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table27 = new TechTalk.SpecFlow.Table(new string[] {
@@ -820,11 +832,11 @@ this.ScenarioSetup(scenarioInfo);
table27.AddRow(new string[] {
"ConfirmPassword",
"a12345!"});
-#line 295
+#line 299
testRunner.And("I fill in", ((string)(null)), table27, "And ");
-#line 301
+#line 305
testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line 302
+#line 306
testRunner.Then("I should see \"You must specify a valid email address.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
this.ScenarioCleanup();
@@ -837,13 +849,13 @@ this.ScenarioSetup(scenarioInfo);
{
TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("I should be able to add users with valid email addresses", new string[] {
"email"});
-#line 304
+#line 308
this.ScenarioSetup(scenarioInfo);
-#line 305
+#line 309
testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
-#line 306
+#line 310
testRunner.When("I go to \"admin/users\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
-#line 307
+#line 311
testRunner.And("I follow \"Add a new user\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line hidden
TechTalk.SpecFlow.Table table28 = new TechTalk.SpecFlow.Table(new string[] {
@@ -861,13 +873,13 @@ this.ScenarioSetup(scenarioInfo);
table28.AddRow(new string[] {
"ConfirmPassword",
"a12345!"});
-#line 308
+#line 312
testRunner.And("I fill in", ((string)(null)), table28, "And ");
-#line 314
+#line 318
testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line 315
+#line 319
testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line 316
+#line 320
testRunner.Then("I should see \"User created\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
this.ScenarioCleanup();