Fixing some spec flows.

--HG--
branch : dev

src/Orchard.Specs/Modules.feature

@@ -6,7 +6,12 @@
 Scenario: Installed modules are listed
     Given I have installed Orchard
     When I go to "admin/modules"
-    Then I should see "<h1>Installed Modules</h1>"
+    Then I should see "<h1 id="page-title">Modules</h1>"
+    When I fill in
+        | name | value |
+        | Options.SearchText | Themes |
+    And I hit "Search"
+    Then I should see "<h1 id="page-title">Modules</h1>"
         And I should see "<h2>Themes"
         And the status should be 200 "OK"
 

src/Orchard.Specs/Modules.feature.cs

@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
 //      This code was generated by SpecFlow (http://www.specflow.org/).
-//      SpecFlow Version:1.4.0.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.4.0.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.5.0.0")]
     [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [NUnit.Framework.TestFixtureAttribute()]
     [NUnit.Framework.DescriptionAttribute("Module management")]
@@ -65,10 +65,23 @@ this.ScenarioSetup(scenarioInfo);
 #line 8
     testRunner.When("I go to \"admin/modules\"");
 #line 9
-    testRunner.Then("I should see \"<h1>Installed Modules</h1>\"");
+    testRunner.Then("I should see \"<h1 id=\"page-title\">Modules</h1>\"");
+#line hidden
+            TechTalk.SpecFlow.Table table1 = new TechTalk.SpecFlow.Table(new string[] {
+                        "name",
+                        "value"});
+            table1.AddRow(new string[] {
+                        "Options.SearchText",
+                        "Themes"});
 #line 10
+    testRunner.When("I fill in", ((string)(null)), table1);
+#line 13
+    testRunner.And("I hit \"Search\"");
+#line 14
+    testRunner.Then("I should see \"<h1 id=\"page-title\">Modules</h1>\"");
+#line 15
         testRunner.And("I should see \"<h2>Themes\"");
-#line 11
+#line 16
         testRunner.And("the status should be 200 \"OK\"");
 #line hidden
             testRunner.CollectScenarioErrors();
@@ -79,17 +92,17 @@ this.ScenarioSetup(scenarioInfo);
         public virtual void FeaturesOfInstalledModulesAreListed()
         {
             TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Features of installed modules are listed", ((string[])(null)));
-#line 13
-this.ScenarioSetup(scenarioInfo);
-#line 14
-    testRunner.Given("I have installed Orchard");
-#line 15
-    testRunner.When("I go to \"admin/modules/features\"");
-#line 16
-    testRunner.Then("I should see \"<h3>Common</h3>\"");
-#line 17
-        testRunner.And("I should see \"<li class=\"feature enabled\" id=\"contents-feature\"[^>]*>\"");
 #line 18
+this.ScenarioSetup(scenarioInfo);
+#line 19
+    testRunner.Given("I have installed Orchard");
+#line 20
+    testRunner.When("I go to \"admin/modules/features\"");
+#line 21
+    testRunner.Then("I should see \"<h3>Common</h3>\"");
+#line 22
+        testRunner.And("I should see \"<li class=\"feature enabled\" id=\"contents-feature\"[^>]*>\"");
+#line 23
         testRunner.And("the status should be 200 \"OK\"");
 #line hidden
             testRunner.CollectScenarioErrors();

src/Orchard.Specs/MultiTenancy.feature

@@ -110,7 +110,7 @@ Scenario: An existing initialized tenant cannot have its database option cleared
             | ConfirmPassword | 6655321 |
         And I hit "Finish Setup"
         And I go to "/Admin/MultiTenancy/Edit/Scott" on host localhost
-    Then I should see "<h1>Edit Tenant</h1>"
+    Then I should see "<h1 id="page-title">Edit Tenant</h1>"
         And I should see "<h2>Scott</h2>"
         And I should not see "Allow the tenant to set up the database"
 

src/Orchard.Specs/MultiTenancy.feature.cs

@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
 //      This code was generated by SpecFlow (http://www.specflow.org/).
-//      SpecFlow Version:1.4.0.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.4.0.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.5.0.0")]
     [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [NUnit.Framework.TestFixtureAttribute()]
     [NUnit.Framework.DescriptionAttribute("Multiple tenant management")]
@@ -355,7 +355,7 @@ this.ScenarioSetup(scenarioInfo);
 #line 112
         testRunner.And("I go to \"/Admin/MultiTenancy/Edit/Scott\" on host localhost");
 #line 113
-    testRunner.Then("I should see \"<h1>Edit Tenant</h1>\"");
+    testRunner.Then("I should see \"<h1 id=\"page-title\">Edit Tenant</h1>\"");
 #line 114
         testRunner.And("I should see \"<h2>Scott</h2>\"");
 #line 115

src/Orchard.Web/Modules/Orchard.Modules/Views/ModuleEntry.cshtml

@@ -14,7 +14,7 @@
             </div>
         }
     <div class="properties">
-        <h2 class="@moduleClasses">@Model.ContentPart.Descriptor.Name<span> - @T("Version: {0}", !string.IsNullOrEmpty(Model.ContentPart.Descriptor.Version) ? Model.ContentPart.Descriptor.Version : T("1.0").ToString())</span></h2>       
+        <h2@{ if(!string.IsNullOrEmpty(moduleClasses)) {<text> class="@moduleClasses"</text>}}>@Model.ContentPart.Descriptor.Name<span> - @T("Version: {0}", !string.IsNullOrEmpty(Model.ContentPart.Descriptor.Version) ? Model.ContentPart.Descriptor.Version : T("1.0").ToString())</span></h2>
 
          @if (!string.IsNullOrEmpty(Model.ContentPart.Descriptor.Description)) {
         <p>@Model.ContentPart.Descriptor.Description</p>

src/Orchard.Web/Modules/Orchard.Themes/Views/ThemeEntry.cshtml

@@ -5,8 +5,7 @@
 @{ string themeClasses = Model.ContentPart.IsRecentlyInstalled ? "recentlyInstalledTheme" : string.Empty; }
 
 <div>
-
+    <h3@{ if(!string.IsNullOrEmpty(themeClasses)) {<text>  class="@themeClasses"</text>}}>@Model.ContentPart.Name</h3>
-    <h3 class="@themeClasses">@Model.ContentPart.Name</h3>
 
     @Html.Image(Href(Html.ThemePath((ExtensionDescriptor) Model.ContentPart.Descriptor, "/Theme.png")), Html.Encode((string)Model.ContentPart.Name), null)
     @using (Html.BeginFormAntiForgeryPost(Url.Action("Activate"), FormMethod.Post, new { @class = "inline" })) {