Added some more SpecFlow tests for MultiTenancy and fixed a few bugs

--HG--
branch : dev

src/Orchard.Specs/Bindings/WebAppHosting.cs

@@ -184,8 +184,7 @@ namespace Orchard.Specs.Bindings {
         [When(@"I hit ""(.*)""")]
         public void WhenIHit(string submitText) {
             var submit = _doc.DocumentNode
-                .SelectNodes("//input[@type='submit']")
+                .SelectSingleNode(string.Format("(//input[@type='submit'][@value='{0}']|//button[@type='submit'][text()='{0}'])", submitText));
-                .Single(elt => elt.GetAttributeValue("value", null) == submitText);
 
             var form = Form.LocateAround(submit);
             var urlPath = form.Start.GetAttributeValue("action", Details.UrlPath);

src/Orchard.Specs/MultiTenancy.feature

@@ -91,7 +91,75 @@ Scenario: A new tenant runs the setup
 			And I go to "/Default.aspx"
 	Then I should see "<h1>Scott Site</h1>"
 		And I should see "Welcome, <strong>admin</strong>!"
+		
+Scenario: An existing initialized tenant cannot have its database option cleared
+	Given I have installed Orchard
+		And I have installed "Orchard.MultiTenancy"
+	When I go to "Admin/MultiTenancy/Add"
+		And I fill in 
+			| name | value |
+			| Name | Scott |
+			| RequestUrlHost | scott.example.org |
+		And I hit "Save"
+		And I go to "/Setup" on host scott.example.org
+		And I fill in 
+			| name | value |
+			| SiteName | Scott Site |
+			| AdminPassword | 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>"
+        And I should see "<h2>Scott</h2>"
+        And I should not see "Allow the tenant to set up the database"
 
+Scenario: Default tenant cannot be disabled
+	Given I have installed Orchard
+		And I have installed "Orchard.MultiTenancy"
+	When I go to "Admin/MultiTenancy"
+    Then I should not see "<form action="/Admin/MultiTenancy/disable""
+
+Scenario: A running tenant can be disabled
+	Given I have installed Orchard
+		And I have installed "Orchard.MultiTenancy"
+	When I go to "Admin/MultiTenancy/Add"
+		And I fill in 
+			| name | value |
+			| Name | Scott |
+			| RequestUrlHost | scott.example.org |
+		And I hit "Save"
+		And I go to "/Setup" on host scott.example.org
+		And I fill in 
+			| name | value |
+			| SiteName | Scott Site |
+			| AdminPassword | 6655321 |
+		And I hit "Finish Setup"
+        And I go to "/Admin/MultiTenancy" on host localhost
+        And I hit "Suspend"
+        And I am redirected
+    Then I should see "<form action="/Admin/MultiTenancy/enable""
+
+Scenario: A running tenant which is disabled can be enabled
+	Given I have installed Orchard
+		And I have installed "Orchard.MultiTenancy"
+	When I go to "Admin/MultiTenancy/Add"
+		And I fill in 
+			| name | value |
+			| Name | Scott |
+			| RequestUrlHost | scott.example.org |
+		And I hit "Save"
+		And I go to "/Setup" on host scott.example.org
+		And I fill in 
+			| name | value |
+			| SiteName | Scott Site |
+			| AdminPassword | 6655321 |
+		And I hit "Finish Setup"
+        And I go to "/Admin/MultiTenancy" on host localhost
+        And I hit "Suspend"
+        And I am redirected
+        And I hit "Resume"
+        And I am redirected
+    Then I should see "<form action="/Admin/MultiTenancy/disable""
+    
 Scenario: Listing tenants from command line
 	Given I have installed Orchard
 		And I have installed "Orchard.MultiTenancy"

src/Orchard.Specs/MultiTenancy.feature.cs

@@ -304,10 +304,10 @@ testRunner.And("I should see \"Welcome, <strong>admin</strong>!\"");
         }
         
         [NUnit.Framework.TestAttribute()]
-        [NUnit.Framework.DescriptionAttribute("Listing tenants from command line")]
+        [NUnit.Framework.DescriptionAttribute("An existing initialized tenant cannot have its database option cleared")]
-        public virtual void ListingTenantsFromCommandLine()
+        public virtual void AnExistingInitializedTenantCannotHaveItsDatabaseOptionCleared()
         {
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Listing tenants from command line", ((string[])(null)));
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("An existing initialized tenant cannot have its database option cleared", ((string[])(null)));
 #line 95
 this.ScenarioSetup(scenarioInfo);
 #line 96
@@ -315,12 +315,200 @@ testRunner.Given("I have installed Orchard");
 #line 97
 testRunner.And("I have installed \"Orchard.MultiTenancy\"");
 #line 98
-testRunner.And("I have tenant \"Alpha\" on \"example.org\" as \"New-site-name\"");
+testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
+#line hidden
+            TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] {
+                        "name",
+                        "value"});
+            table7.AddRow(new string[] {
+                        "Name",
+                        "Scott"});
+            table7.AddRow(new string[] {
+                        "RequestUrlHost",
+                        "scott.example.org"});
 #line 99
+testRunner.And("I fill in", ((string)(null)), table7);
+#line 103
+testRunner.And("I hit \"Save\"");
+#line 104
+testRunner.And("I go to \"/Setup\" on host scott.example.org");
+#line hidden
+            TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] {
+                        "name",
+                        "value"});
+            table8.AddRow(new string[] {
+                        "SiteName",
+                        "Scott Site"});
+            table8.AddRow(new string[] {
+                        "AdminPassword",
+                        "6655321"});
+#line 105
+testRunner.And("I fill in", ((string)(null)), table8);
+#line 109
+testRunner.And("I hit \"Finish Setup\"");
+#line 110
+testRunner.And("I go to \"/Admin/MultiTenancy/Edit/Scott\" on host localhost");
+#line 111
+testRunner.Then("I should see \"<h1>Edit Tenant</h1>\"");
+#line 112
+testRunner.And("I should see \"<h2>Scott</h2>\"");
+#line 113
+testRunner.And("I should not see \"Allow the tenant to set up the database\"");
+#line hidden
+            testRunner.CollectScenarioErrors();
+        }
+        
+        [NUnit.Framework.TestAttribute()]
+        [NUnit.Framework.DescriptionAttribute("Default tenant cannot be disabled")]
+        public virtual void DefaultTenantCannotBeDisabled()
+        {
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Default tenant cannot be disabled", ((string[])(null)));
+#line 115
+this.ScenarioSetup(scenarioInfo);
+#line 116
+testRunner.Given("I have installed Orchard");
+#line 117
+testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+#line 118
+testRunner.When("I go to \"Admin/MultiTenancy\"");
+#line 119
+testRunner.Then("I should not see \"<form action=\"/Admin/MultiTenancy/disable\"\"");
+#line hidden
+            testRunner.CollectScenarioErrors();
+        }
+        
+        [NUnit.Framework.TestAttribute()]
+        [NUnit.Framework.DescriptionAttribute("A running tenant can be disabled")]
+        public virtual void ARunningTenantCanBeDisabled()
+        {
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("A running tenant can be disabled", ((string[])(null)));
+#line 121
+this.ScenarioSetup(scenarioInfo);
+#line 122
+testRunner.Given("I have installed Orchard");
+#line 123
+testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+#line 124
+testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
+#line hidden
+            TechTalk.SpecFlow.Table table9 = new TechTalk.SpecFlow.Table(new string[] {
+                        "name",
+                        "value"});
+            table9.AddRow(new string[] {
+                        "Name",
+                        "Scott"});
+            table9.AddRow(new string[] {
+                        "RequestUrlHost",
+                        "scott.example.org"});
+#line 125
+testRunner.And("I fill in", ((string)(null)), table9);
+#line 129
+testRunner.And("I hit \"Save\"");
+#line 130
+testRunner.And("I go to \"/Setup\" on host scott.example.org");
+#line hidden
+            TechTalk.SpecFlow.Table table10 = new TechTalk.SpecFlow.Table(new string[] {
+                        "name",
+                        "value"});
+            table10.AddRow(new string[] {
+                        "SiteName",
+                        "Scott Site"});
+            table10.AddRow(new string[] {
+                        "AdminPassword",
+                        "6655321"});
+#line 131
+testRunner.And("I fill in", ((string)(null)), table10);
+#line 135
+testRunner.And("I hit \"Finish Setup\"");
+#line 136
+testRunner.And("I go to \"/Admin/MultiTenancy\" on host localhost");
+#line 137
+testRunner.And("I hit \"Suspend\"");
+#line 138
+testRunner.And("I am redirected");
+#line 139
+testRunner.Then("I should see \"<form action=\"/Admin/MultiTenancy/enable\"\"");
+#line hidden
+            testRunner.CollectScenarioErrors();
+        }
+        
+        [NUnit.Framework.TestAttribute()]
+        [NUnit.Framework.DescriptionAttribute("A running tenant which is disabled can be enabled")]
+        public virtual void ARunningTenantWhichIsDisabledCanBeEnabled()
+        {
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("A running tenant which is disabled can be enabled", ((string[])(null)));
+#line 141
+this.ScenarioSetup(scenarioInfo);
+#line 142
+testRunner.Given("I have installed Orchard");
+#line 143
+testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+#line 144
+testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
+#line hidden
+            TechTalk.SpecFlow.Table table11 = new TechTalk.SpecFlow.Table(new string[] {
+                        "name",
+                        "value"});
+            table11.AddRow(new string[] {
+                        "Name",
+                        "Scott"});
+            table11.AddRow(new string[] {
+                        "RequestUrlHost",
+                        "scott.example.org"});
+#line 145
+testRunner.And("I fill in", ((string)(null)), table11);
+#line 149
+testRunner.And("I hit \"Save\"");
+#line 150
+testRunner.And("I go to \"/Setup\" on host scott.example.org");
+#line hidden
+            TechTalk.SpecFlow.Table table12 = new TechTalk.SpecFlow.Table(new string[] {
+                        "name",
+                        "value"});
+            table12.AddRow(new string[] {
+                        "SiteName",
+                        "Scott Site"});
+            table12.AddRow(new string[] {
+                        "AdminPassword",
+                        "6655321"});
+#line 151
+testRunner.And("I fill in", ((string)(null)), table12);
+#line 155
+testRunner.And("I hit \"Finish Setup\"");
+#line 156
+testRunner.And("I go to \"/Admin/MultiTenancy\" on host localhost");
+#line 157
+testRunner.And("I hit \"Suspend\"");
+#line 158
+testRunner.And("I am redirected");
+#line 159
+testRunner.And("I hit \"Resume\"");
+#line 160
+testRunner.And("I am redirected");
+#line 161
+testRunner.Then("I should see \"<form action=\"/Admin/MultiTenancy/disable\"\"");
+#line hidden
+            testRunner.CollectScenarioErrors();
+        }
+        
+        [NUnit.Framework.TestAttribute()]
+        [NUnit.Framework.DescriptionAttribute("Listing tenants from command line")]
+        public virtual void ListingTenantsFromCommandLine()
+        {
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Listing tenants from command line", ((string[])(null)));
+#line 163
+this.ScenarioSetup(scenarioInfo);
+#line 164
+testRunner.Given("I have installed Orchard");
+#line 165
+testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+#line 166
+testRunner.And("I have tenant \"Alpha\" on \"example.org\" as \"New-site-name\"");
+#line 167
 testRunner.When("I execute >tenant list");
-#line 100
+#line 168
 testRunner.Then("I should see \"Name: Alpha\"");
-#line 101
+#line 169
 testRunner.And("I should see \"Request Url Host: example.org\"");
 #line hidden
             testRunner.CollectScenarioErrors();

src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.ascx

@@ -19,7 +19,7 @@
         <legend><%=_Encoded("Database Setup") %></legend>
  	    <div>
             <%=Html.RadioButtonFor(svm => svm.DataProvider, "", new { id = "tenantDatabaseOption" })%>
-	        <label for="tenantDatabaseOption" class="forcheckbox"><%=_Encoded("Allow the client to set up the database") %></label>
+	        <label for="tenantDatabaseOption" class="forcheckbox"><%=_Encoded("Allow the tenant to set up the database") %></label>
 	    </div>
         <div>
             <%=Html.RadioButtonFor(svm => svm.DataProvider, "SQLite", new { id = "builtinDatabaseOption" })%>

src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.ascx

@@ -1,7 +1,7 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ShellSettings>" %>
 <%@ Import Namespace="Orchard.Environment.Configuration" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<% using(Html.BeginFormAntiForgeryPost(Url.Action("enable", new {tenantName = Model.Name, area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) { %>
+<% using(Html.BeginFormAntiForgeryPost(Url.Action("enable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) { %>
 <%=Html.HiddenFor(ss => ss.Name) %>
 <button type="submit"><%=_Encoded("Resume")%></button><%
    } %>

src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.ascx

@@ -22,7 +22,7 @@
         } else { %>
  	    <div>
             <%=Html.RadioButtonFor(svm => svm.DataProvider, "", new { id = "tenantDatabaseOption" })%>
-	        <label for="tenantDatabaseOption" class="forcheckbox"><%=_Encoded("Allow the client to set up the database") %></label>
+	        <label for="tenantDatabaseOption" class="forcheckbox"><%=_Encoded("Allow the tenant to set up the database") %></label>
 	    </div><%
         } %>
         <div>