From 9e0387c76a8a6f39f5394795f17ddaaa9cf4ca21 Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Fri, 10 Dec 2010 21:42:57 -0800
Subject: [PATCH] Remove all traces of "default.aspx"

--HG--
branch : dev
---
 .../Hosting/RequestExtensions.cs              |  10 +-
 src/Orchard.Specs/MultiTenancy.feature        |   2 +-
 src/Orchard.Specs/MultiTenancy.feature.cs     | 218 +++++++++---------
 src/Orchard.Specs/Pages.feature               |   4 +-
 src/Orchard.Specs/Pages.feature.cs            |   4 +-
 src/Orchard.Specs/Setup.feature               |   4 +-
 src/Orchard.Specs/Setup.feature.cs            |  50 ++--
 src/Orchard.Web/Web.config                    |   2 -
 .../TestData/ExtraFiles.xml                   |   4 -
 .../TestData/SimpleWebProject.xml             |   5 -
 10 files changed, 147 insertions(+), 156 deletions(-)

diff --git a/src/Orchard.Specs/Hosting/RequestExtensions.cs b/src/Orchard.Specs/Hosting/RequestExtensions.cs
index 7cd5b1143..0da7f701d 100644
--- a/src/Orchard.Specs/Hosting/RequestExtensions.cs
+++ b/src/Orchard.Specs/Hosting/RequestExtensions.cs
@@ -15,13 +15,15 @@ namespace Orchard.Specs.Hosting {
 
             var physicalPath = Bleroy.FluentPath.Path.Get(webHost.PhysicalDirectory);
 
-            urlPath = StripVDir(urlPath, webHost.VirtualDirectory);
+            bool isHomepage = urlPath == "/";
+
+            if (!isHomepage)
+                urlPath = StripVDir(urlPath, webHost.VirtualDirectory);
+
             var details = new RequestDetails {
                 HostName = webHost.HostName,
                 UrlPath = urlPath,
-                Page = physicalPath
-                    .Combine(urlPath.TrimStart('/', '\\'))
-                    .GetRelativePath(physicalPath)
+                Page = (isHomepage ? "" : physicalPath.Combine(urlPath.TrimStart('/', '\\')).GetRelativePath(physicalPath).ToString())
             };
 
             if (!string.IsNullOrEmpty(webHost.Cookies)) {
diff --git a/src/Orchard.Specs/MultiTenancy.feature b/src/Orchard.Specs/MultiTenancy.feature
index 8890a98a0..c8a5bcf34 100644
--- a/src/Orchard.Specs/MultiTenancy.feature
+++ b/src/Orchard.Specs/MultiTenancy.feature
@@ -89,7 +89,7 @@ Scenario: A new tenant runs the setup
             | AdminPassword | 6655321 |
             | ConfirmPassword | 6655321 |
         And I hit "Finish Setup"
-            And I go to "/Default.aspx"
+            And I go to "/"
     Then I should see "Scott Site"
         And I should see "Welcome"
         
diff --git a/src/Orchard.Specs/MultiTenancy.feature.cs b/src/Orchard.Specs/MultiTenancy.feature.cs
index 8c653f8d8..a3371537d 100644
--- a/src/Orchard.Specs/MultiTenancy.feature.cs
+++ b/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.3.2.0
+//      SpecFlow Version:1.4.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.4.0.0")]
     [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [NUnit.Framework.TestFixtureAttribute()]
     [NUnit.Framework.DescriptionAttribute("Multiple tenant management")]
@@ -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"), "Multiple tenant management", "In order to host several isolated web applications\r\nAs a root Orchard system oper" +
-                    "ator\r\nI want to create and manage tenant configurations", ((string[])(null)));
+                    "ator\r\nI want to create and manage tenant configurations", GenerationTargetLanguage.CSharp, ((string[])(null)));
             testRunner.OnFeatureStart(featureInfo);
         }
         
@@ -61,17 +61,17 @@ 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.MultiTenancy\"");
+        testRunner.And("I have installed \"Orchard.MultiTenancy\"");
 #line 9
-testRunner.When("I go to \"Admin/MultiTenancy\"");
+    testRunner.When("I go to \"Admin/MultiTenancy\"");
 #line 10
-testRunner.Then("I should see \"List of Site&#39;s Tenants\"");
+    testRunner.Then("I should see \"List of Site&#39;s Tenants\"");
 #line 11
-testRunner.And("I should see \"<h3>Default</h3>\"");
+        testRunner.And("I should see \"<h3>Default</h3>\"");
 #line 12
-testRunner.And("the status should be 200 \"OK\"");
+        testRunner.And("the status should be 200 \"OK\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -84,15 +84,15 @@ testRunner.And("the status should be 200 \"OK\"");
 #line 14
 this.ScenarioSetup(scenarioInfo);
 #line 15
-testRunner.Given("I have installed Orchard");
+    testRunner.Given("I have installed Orchard");
 #line 16
-testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+        testRunner.And("I have installed \"Orchard.MultiTenancy\"");
 #line 17
-testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
+    testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
 #line 18
-testRunner.And("I hit \"Save\"");
+        testRunner.And("I hit \"Save\"");
 #line 19
-testRunner.Then("I should see \"is required\"");
+    testRunner.Then("I should see \"is required\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -105,11 +105,11 @@ testRunner.Then("I should see \"is required\"");
 #line 21
 this.ScenarioSetup(scenarioInfo);
 #line 22
-testRunner.Given("I have installed Orchard");
+    testRunner.Given("I have installed Orchard");
 #line 23
-testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+        testRunner.And("I have installed \"Orchard.MultiTenancy\"");
 #line 24
-testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
+    testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
 #line hidden
             TechTalk.SpecFlow.Table table1 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -118,15 +118,15 @@ testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
                         "Name",
                         "Scott"});
 #line 25
-testRunner.And("I fill in", ((string)(null)), table1);
+        testRunner.And("I fill in", ((string)(null)), table1);
 #line 28
-testRunner.And("I hit \"Save\"");
+        testRunner.And("I hit \"Save\"");
 #line 29
-testRunner.And("I am redirected");
+        testRunner.And("I am redirected");
 #line 30
-testRunner.Then("I should see \"<h3>Scott</h3>\"");
+    testRunner.Then("I should see \"<h3>Scott</h3>\"");
 #line 31
-testRunner.And("the status should be 200 \"OK\"");
+        testRunner.And("the status should be 200 \"OK\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -139,11 +139,11 @@ testRunner.And("the status should be 200 \"OK\"");
 #line 33
 this.ScenarioSetup(scenarioInfo);
 #line 34
-testRunner.Given("I have installed Orchard");
+    testRunner.Given("I have installed Orchard");
 #line 35
-testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+        testRunner.And("I have installed \"Orchard.MultiTenancy\"");
 #line 36
-testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
+    testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
 #line hidden
             TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -152,15 +152,15 @@ testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
                         "Name",
                         "Scott"});
 #line 37
-testRunner.And("I fill in", ((string)(null)), table2);
+        testRunner.And("I fill in", ((string)(null)), table2);
 #line 40
-testRunner.And("I hit \"Save\"");
+        testRunner.And("I hit \"Save\"");
 #line 41
-testRunner.And("I am redirected");
+        testRunner.And("I am redirected");
 #line 42
-testRunner.Then("I should see \"<li class=\"tenant Uninitialized\">\"");
+    testRunner.Then("I should see \"<li class=\"tenant Uninitialized\">\"");
 #line 43
-testRunner.And("the status should be 200 \"OK\"");
+        testRunner.And("the status should be 200 \"OK\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -173,11 +173,11 @@ testRunner.And("the status should be 200 \"OK\"");
 #line 45
 this.ScenarioSetup(scenarioInfo);
 #line 46
-testRunner.Given("I have installed Orchard");
+    testRunner.Given("I have installed Orchard");
 #line 47
-testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+        testRunner.And("I have installed \"Orchard.MultiTenancy\"");
 #line 48
-testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
+    testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
 #line hidden
             TechTalk.SpecFlow.Table table3 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -189,17 +189,17 @@ testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
                         "RequestUrlHost",
                         "scott.example.org"});
 #line 49
-testRunner.And("I fill in", ((string)(null)), table3);
+        testRunner.And("I fill in", ((string)(null)), table3);
 #line 53
-testRunner.And("I hit \"Save\"");
+        testRunner.And("I hit \"Save\"");
 #line 54
-testRunner.And("I go to \"/Setup\" on host scott.example.org");
+        testRunner.And("I go to \"/Setup\" on host scott.example.org");
 #line 55
-testRunner.Then("I should see \"Welcome to Orchard\"");
+    testRunner.Then("I should see \"Welcome to Orchard\"");
 #line 56
-testRunner.And("I should see \"Finish Setup\"");
+        testRunner.And("I should see \"Finish Setup\"");
 #line 57
-testRunner.And("the status should be 200 \"OK\"");
+        testRunner.And("the status should be 200 \"OK\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -212,11 +212,11 @@ testRunner.And("the status should be 200 \"OK\"");
 #line 59
 this.ScenarioSetup(scenarioInfo);
 #line 60
-testRunner.Given("I have installed Orchard");
+    testRunner.Given("I have installed Orchard");
 #line 61
-testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+        testRunner.And("I have installed \"Orchard.MultiTenancy\"");
 #line 62
-testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
+    testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
 #line hidden
             TechTalk.SpecFlow.Table table4 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -231,21 +231,21 @@ testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
                         "DataProvider",
                         "SqlCe"});
 #line 63
-testRunner.And("I fill in", ((string)(null)), table4);
+        testRunner.And("I fill in", ((string)(null)), table4);
 #line 68
-testRunner.And("I hit \"Save\"");
+        testRunner.And("I hit \"Save\"");
 #line 69
-testRunner.And("I am redirected");
+        testRunner.And("I am redirected");
 #line 70
-testRunner.And("I go to \"/Setup\" on host scott.example.org");
+        testRunner.And("I go to \"/Setup\" on host scott.example.org");
 #line 71
-testRunner.Then("I should see \"Welcome to Orchard\"");
+    testRunner.Then("I should see \"Welcome to Orchard\"");
 #line 72
-testRunner.And("I should see \"Finish Setup\"");
+        testRunner.And("I should see \"Finish Setup\"");
 #line 73
-testRunner.And("I should not see \"SQL Server Compact\"");
+        testRunner.And("I should not see \"SQL Server Compact\"");
 #line 74
-testRunner.And("the status should be 200 \"OK\"");
+        testRunner.And("the status should be 200 \"OK\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -258,11 +258,11 @@ testRunner.And("the status should be 200 \"OK\"");
 #line 76
 this.ScenarioSetup(scenarioInfo);
 #line 77
-testRunner.Given("I have installed Orchard");
+    testRunner.Given("I have installed Orchard");
 #line 78
-testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+        testRunner.And("I have installed \"Orchard.MultiTenancy\"");
 #line 79
-testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
+    testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
 #line hidden
             TechTalk.SpecFlow.Table table5 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -274,11 +274,11 @@ testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
                         "RequestUrlHost",
                         "scott.example.org"});
 #line 80
-testRunner.And("I fill in", ((string)(null)), table5);
+        testRunner.And("I fill in", ((string)(null)), table5);
 #line 84
-testRunner.And("I hit \"Save\"");
+        testRunner.And("I hit \"Save\"");
 #line 85
-testRunner.And("I go to \"/Setup\" on host scott.example.org");
+        testRunner.And("I go to \"/Setup\" on host scott.example.org");
 #line hidden
             TechTalk.SpecFlow.Table table6 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -293,15 +293,15 @@ testRunner.And("I go to \"/Setup\" on host scott.example.org");
                         "ConfirmPassword",
                         "6655321"});
 #line 86
-testRunner.And("I fill in", ((string)(null)), table6);
+        testRunner.And("I fill in", ((string)(null)), table6);
 #line 91
-testRunner.And("I hit \"Finish Setup\"");
+        testRunner.And("I hit \"Finish Setup\"");
 #line 92
-testRunner.And("I go to \"/Default.aspx\"");
+            testRunner.And("I go to \"/\"");
 #line 93
-testRunner.Then("I should see \"Scott Site\"");
+    testRunner.Then("I should see \"Scott Site\"");
 #line 94
-testRunner.And("I should see \"Welcome\"");
+        testRunner.And("I should see \"Welcome\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -314,11 +314,11 @@ testRunner.And("I should see \"Welcome\"");
 #line 96
 this.ScenarioSetup(scenarioInfo);
 #line 97
-testRunner.Given("I have installed Orchard");
+    testRunner.Given("I have installed Orchard");
 #line 98
-testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+        testRunner.And("I have installed \"Orchard.MultiTenancy\"");
 #line 99
-testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
+    testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
 #line hidden
             TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -330,11 +330,11 @@ testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
                         "RequestUrlHost",
                         "scott.example.org"});
 #line 100
-testRunner.And("I fill in", ((string)(null)), table7);
+        testRunner.And("I fill in", ((string)(null)), table7);
 #line 104
-testRunner.And("I hit \"Save\"");
+        testRunner.And("I hit \"Save\"");
 #line 105
-testRunner.And("I go to \"/Setup\" on host scott.example.org");
+        testRunner.And("I go to \"/Setup\" on host scott.example.org");
 #line hidden
             TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -349,17 +349,17 @@ testRunner.And("I go to \"/Setup\" on host scott.example.org");
                         "ConfirmPassword",
                         "6655321"});
 #line 106
-testRunner.And("I fill in", ((string)(null)), table8);
+        testRunner.And("I fill in", ((string)(null)), table8);
 #line 111
-testRunner.And("I hit \"Finish Setup\"");
+        testRunner.And("I hit \"Finish Setup\"");
 #line 112
-testRunner.And("I go to \"/Admin/MultiTenancy/Edit/Scott\" on host localhost");
+        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>Edit Tenant</h1>\"");
 #line 114
-testRunner.And("I should see \"<h2>Scott</h2>\"");
+        testRunner.And("I should see \"<h2>Scott</h2>\"");
 #line 115
-testRunner.And("I should not see \"Allow the tenant to set up the database\"");
+        testRunner.And("I should not see \"Allow the tenant to set up the database\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -372,13 +372,13 @@ testRunner.And("I should not see \"Allow the tenant to set up the database\"");
 #line 117
 this.ScenarioSetup(scenarioInfo);
 #line 118
-testRunner.Given("I have installed Orchard");
+    testRunner.Given("I have installed Orchard");
 #line 119
-testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+        testRunner.And("I have installed \"Orchard.MultiTenancy\"");
 #line 120
-testRunner.When("I go to \"Admin/MultiTenancy\"");
+    testRunner.When("I go to \"Admin/MultiTenancy\"");
 #line 121
-testRunner.Then("I should not see \"<form action=\"/Admin/MultiTenancy/disable\"\"");
+    testRunner.Then("I should not see \"<form action=\"/Admin/MultiTenancy/disable\"\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -391,11 +391,11 @@ testRunner.Then("I should not see \"<form action=\"/Admin/MultiTenancy/disable\"
 #line 123
 this.ScenarioSetup(scenarioInfo);
 #line 124
-testRunner.Given("I have installed Orchard");
+    testRunner.Given("I have installed Orchard");
 #line 125
-testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+        testRunner.And("I have installed \"Orchard.MultiTenancy\"");
 #line 126
-testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
+    testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
 #line hidden
             TechTalk.SpecFlow.Table table9 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -407,11 +407,11 @@ testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
                         "RequestUrlHost",
                         "scott.example.org"});
 #line 127
-testRunner.And("I fill in", ((string)(null)), table9);
+        testRunner.And("I fill in", ((string)(null)), table9);
 #line 131
-testRunner.And("I hit \"Save\"");
+        testRunner.And("I hit \"Save\"");
 #line 132
-testRunner.And("I go to \"/Setup\" on host scott.example.org");
+        testRunner.And("I go to \"/Setup\" on host scott.example.org");
 #line hidden
             TechTalk.SpecFlow.Table table10 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -426,17 +426,17 @@ testRunner.And("I go to \"/Setup\" on host scott.example.org");
                         "ConfirmPassword",
                         "6655321"});
 #line 133
-testRunner.And("I fill in", ((string)(null)), table10);
+        testRunner.And("I fill in", ((string)(null)), table10);
 #line 138
-testRunner.And("I hit \"Finish Setup\"");
+        testRunner.And("I hit \"Finish Setup\"");
 #line 139
-testRunner.And("I go to \"/Admin/MultiTenancy\" on host localhost");
+        testRunner.And("I go to \"/Admin/MultiTenancy\" on host localhost");
 #line 140
-testRunner.And("I hit \"Suspend\"");
+        testRunner.And("I hit \"Suspend\"");
 #line 141
-testRunner.And("I am redirected");
+        testRunner.And("I am redirected");
 #line 142
-testRunner.Then("I should see \"<form action=\"/Admin/MultiTenancy/enable\"\"");
+    testRunner.Then("I should see \"<form action=\"/Admin/MultiTenancy/enable\"\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -449,11 +449,11 @@ testRunner.Then("I should see \"<form action=\"/Admin/MultiTenancy/enable\"\"");
 #line 144
 this.ScenarioSetup(scenarioInfo);
 #line 145
-testRunner.Given("I have installed Orchard");
+    testRunner.Given("I have installed Orchard");
 #line 146
-testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+        testRunner.And("I have installed \"Orchard.MultiTenancy\"");
 #line 147
-testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
+    testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
 #line hidden
             TechTalk.SpecFlow.Table table11 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -465,11 +465,11 @@ testRunner.When("I go to \"Admin/MultiTenancy/Add\"");
                         "RequestUrlHost",
                         "scott.example.org"});
 #line 148
-testRunner.And("I fill in", ((string)(null)), table11);
+        testRunner.And("I fill in", ((string)(null)), table11);
 #line 152
-testRunner.And("I hit \"Save\"");
+        testRunner.And("I hit \"Save\"");
 #line 153
-testRunner.And("I go to \"/Setup\" on host scott.example.org");
+        testRunner.And("I go to \"/Setup\" on host scott.example.org");
 #line hidden
             TechTalk.SpecFlow.Table table12 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -484,21 +484,21 @@ testRunner.And("I go to \"/Setup\" on host scott.example.org");
                         "ConfirmPassword",
                         "6655321"});
 #line 154
-testRunner.And("I fill in", ((string)(null)), table12);
+        testRunner.And("I fill in", ((string)(null)), table12);
 #line 159
-testRunner.And("I hit \"Finish Setup\"");
+        testRunner.And("I hit \"Finish Setup\"");
 #line 160
-testRunner.And("I go to \"/Admin/MultiTenancy\" on host localhost");
+        testRunner.And("I go to \"/Admin/MultiTenancy\" on host localhost");
 #line 161
-testRunner.And("I hit \"Suspend\"");
+        testRunner.And("I hit \"Suspend\"");
 #line 162
-testRunner.And("I am redirected");
+        testRunner.And("I am redirected");
 #line 163
-testRunner.And("I hit \"Resume\"");
+        testRunner.And("I hit \"Resume\"");
 #line 164
-testRunner.And("I am redirected");
+        testRunner.And("I am redirected");
 #line 165
-testRunner.Then("I should see \"<form action=\"/Admin/MultiTenancy/disable\"\"");
+    testRunner.Then("I should see \"<form action=\"/Admin/MultiTenancy/disable\"\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -511,17 +511,17 @@ testRunner.Then("I should see \"<form action=\"/Admin/MultiTenancy/disable\"\"")
 #line 167
 this.ScenarioSetup(scenarioInfo);
 #line 168
-testRunner.Given("I have installed Orchard");
+    testRunner.Given("I have installed Orchard");
 #line 169
-testRunner.And("I have installed \"Orchard.MultiTenancy\"");
+        testRunner.And("I have installed \"Orchard.MultiTenancy\"");
 #line 170
-testRunner.And("I have tenant \"Alpha\" on \"example.org\" as \"New-site-name\"");
+        testRunner.And("I have tenant \"Alpha\" on \"example.org\" as \"New-site-name\"");
 #line 171
-testRunner.When("I execute >tenant list");
+    testRunner.When("I execute >tenant list");
 #line 172
-testRunner.Then("I should see \"Name: Alpha\"");
+    testRunner.Then("I should see \"Name: Alpha\"");
 #line 173
-testRunner.And("I should see \"Request Url Host: example.org\"");
+        testRunner.And("I should see \"Request Url Host: example.org\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
diff --git a/src/Orchard.Specs/Pages.feature b/src/Orchard.Specs/Pages.feature
index 9216689c4..75636ccc3 100644
--- a/src/Orchard.Specs/Pages.feature
+++ b/src/Orchard.Specs/Pages.feature
@@ -50,7 +50,7 @@ Scenario: A new page marked to be the home page and publish does take over the h
             | Body.Text | This is a draft of the new home page. |
             | Routable.PromoteToHomePage | true |
         And I hit "Publish Now"
-        And I go to "/Default.aspx"
+        And I go to "/"
     Then I should see "<h1>Super Duper</h1>"
     When I go to "super-duper"
     Then the status should be 404 "Not Found"
@@ -64,5 +64,5 @@ Scenario: A new page marked to be the home page but only saved as draft does not
             | Body.Text | This is a draft of the new home page. |
             | Routable.PromoteToHomePage | true |
         And I hit "Save"
-        And I go to "/Default.aspx"
+        And I go to "/"
     Then I should see "<h1>Welcome to Orchard!</h1>"
diff --git a/src/Orchard.Specs/Pages.feature.cs b/src/Orchard.Specs/Pages.feature.cs
index e7175f0bd..07edca811 100644
--- a/src/Orchard.Specs/Pages.feature.cs
+++ b/src/Orchard.Specs/Pages.feature.cs
@@ -195,7 +195,7 @@ this.ScenarioSetup(scenarioInfo);
 #line 52
         testRunner.And("I hit \"Publish Now\"");
 #line 53
-        testRunner.And("I go to \"/Default.aspx\"");
+        testRunner.And("I go to \"/\"");
 #line 54
     testRunner.Then("I should see \"<h1>Super Duper</h1>\"");
 #line 55
@@ -237,7 +237,7 @@ this.ScenarioSetup(scenarioInfo);
 #line 66
         testRunner.And("I hit \"Save\"");
 #line 67
-        testRunner.And("I go to \"/Default.aspx\"");
+        testRunner.And("I go to \"/\"");
 #line 68
     testRunner.Then("I should see \"<h1>Welcome to Orchard!</h1>\"");
 #line hidden
diff --git a/src/Orchard.Specs/Setup.feature b/src/Orchard.Specs/Setup.feature
index c5fa0d54d..f3b8dcfbc 100644
--- a/src/Orchard.Specs/Setup.feature
+++ b/src/Orchard.Specs/Setup.feature
@@ -9,7 +9,7 @@ Scenario: Root request shows setup form
             | Module | Orchard.Setup, Orchard.Pages, Orchard.Users, Orchard.Roles, Orchard.Messaging, Orchard.Comments, Orchard.PublishLater, Orchard.Themes, Orchard.jQuery, TinyMce |
             | Core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Scheduling, Settings, Shapes, XmlRpc  |
             | Theme | SafeMode |
-    When I go to "/Default.aspx"
+    When I go to "/"
     Then I should see "Welcome to Orchard"
         And I should see "Finish Setup"
         And the status should be 200 "OK"
@@ -49,6 +49,6 @@ Scenario: Calling setup on a brand new install
             | AdminPassword | 6655321 |
             | ConfirmPassword | 6655321 |
         And I hit "Finish Setup"
-        And I go to "/Default.aspx"
+        And I go to "/"
     Then I should see "My Site"
         And I should see "Welcome, <strong>admin</strong>!"
\ No newline at end of file
diff --git a/src/Orchard.Specs/Setup.feature.cs b/src/Orchard.Specs/Setup.feature.cs
index 8dac8372a..f382e62ba 100644
--- a/src/Orchard.Specs/Setup.feature.cs
+++ b/src/Orchard.Specs/Setup.feature.cs
@@ -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.4.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.4.0.0")]
     [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [NUnit.Framework.TestFixtureAttribute()]
     [NUnit.Framework.DescriptionAttribute("Setup")]
@@ -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"), "Setup", "In order to install orchard\r\nAs a new user\r\nI want to setup a new site from the d" +
-                    "efault screen", ((string[])(null)));
+                    "efault screen", GenerationTargetLanguage.CSharp, ((string[])(null)));
             testRunner.OnFeatureStart(featureInfo);
         }
         
@@ -76,15 +76,15 @@ this.ScenarioSetup(scenarioInfo);
                         "Theme",
                         "SafeMode"});
 #line 7
-testRunner.Given("I have a clean site with", ((string)(null)), table1);
+    testRunner.Given("I have a clean site with", ((string)(null)), table1);
 #line 12
-testRunner.When("I go to \"/Default.aspx\"");
+    testRunner.When("I go to \"/\"");
 #line 13
-testRunner.Then("I should see \"Welcome to Orchard\"");
+    testRunner.Then("I should see \"Welcome to Orchard\"");
 #line 14
-testRunner.And("I should see \"Finish Setup\"");
+        testRunner.And("I should see \"Finish Setup\"");
 #line 15
-testRunner.And("the status should be 200 \"OK\"");
+        testRunner.And("the status should be 200 \"OK\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -112,15 +112,15 @@ this.ScenarioSetup(scenarioInfo);
                         "Theme",
                         "SafeMode"});
 #line 18
-testRunner.Given("I have a clean site with", ((string)(null)), table2);
+    testRunner.Given("I have a clean site with", ((string)(null)), table2);
 #line 23
-testRunner.When("I go to \"/Setup\"");
+    testRunner.When("I go to \"/Setup\"");
 #line 24
-testRunner.Then("I should see \"Welcome to Orchard\"");
+    testRunner.Then("I should see \"Welcome to Orchard\"");
 #line 25
-testRunner.And("I should see \"Finish Setup\"");
+        testRunner.And("I should see \"Finish Setup\"");
 #line 26
-testRunner.And("the status should be 200 \"OK\"");
+        testRunner.And("the status should be 200 \"OK\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
@@ -148,16 +148,16 @@ this.ScenarioSetup(scenarioInfo);
                         "Theme",
                         "SafeMode"});
 #line 29
-testRunner.Given("I have a clean site with", ((string)(null)), table3);
+    testRunner.Given("I have a clean site with", ((string)(null)), table3);
 #line 34
-testRunner.When("I go to \"/Setup\"");
+    testRunner.When("I go to \"/Setup\"");
 #line 35
-testRunner.And("I hit \"Finish Setup\"");
+        testRunner.And("I hit \"Finish Setup\"");
 #line 36
-testRunner.Then("I should see \"<input autofocus=\"autofocus\" class=\"input-validation-error\" id=\"Sit" +
+    testRunner.Then("I should see \"<input autofocus=\"autofocus\" class=\"input-validation-error\" id=\"Sit" +
                     "eName\" name=\"SiteName\" type=\"text\" value=\"\" />\"");
 #line 37
-testRunner.And("I should see \"<input class=\"input-validation-error\" id=\"AdminPassword\" name=\"Admi" +
+        testRunner.And("I should see \"<input class=\"input-validation-error\" id=\"AdminPassword\" name=\"Admi" +
                     "nPassword\" type=\"password\" />\"");
 #line hidden
             testRunner.CollectScenarioErrors();
@@ -187,9 +187,9 @@ this.ScenarioSetup(scenarioInfo);
                         "Theme",
                         "SafeMode, TheThemeMachine"});
 #line 40
-testRunner.Given("I have a clean site with", ((string)(null)), table4);
+    testRunner.Given("I have a clean site with", ((string)(null)), table4);
 #line 45
-testRunner.And("I am on \"/Setup\"");
+        testRunner.And("I am on \"/Setup\"");
 #line hidden
             TechTalk.SpecFlow.Table table5 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -204,15 +204,15 @@ testRunner.And("I am on \"/Setup\"");
                         "ConfirmPassword",
                         "6655321"});
 #line 46
-testRunner.When("I fill in", ((string)(null)), table5);
+    testRunner.When("I fill in", ((string)(null)), table5);
 #line 51
-testRunner.And("I hit \"Finish Setup\"");
+        testRunner.And("I hit \"Finish Setup\"");
 #line 52
-testRunner.And("I go to \"/Default.aspx\"");
+        testRunner.And("I go to \"/\"");
 #line 53
-testRunner.Then("I should see \"My Site\"");
+    testRunner.Then("I should see \"My Site\"");
 #line 54
-testRunner.And("I should see \"Welcome, <strong>admin</strong>!\"");
+        testRunner.And("I should see \"Welcome, <strong>admin</strong>!\"");
 #line hidden
             testRunner.CollectScenarioErrors();
         }
diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config
index 68c8c0377..1dba63ec0 100644
--- a/src/Orchard.Web/Web.config
+++ b/src/Orchard.Web/Web.config
@@ -117,7 +117,6 @@
     <httpHandlers>
       <!-- see below -->
       <clear />
-      <add path="default.aspx" verb="*" type="System.Web.UI.PageHandlerFactory" validate="true" />
       <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
 
     </httpHandlers>
@@ -134,7 +133,6 @@
       <!-- clear all handlers, prevents executing code file extensions, prevents returning any file contents -->
       <clear/>
       <!-- Return 404 for all requests via managed handler. The url routing handler will substitute the mvc request handler when routes match. -->
-      <add name="Default" path="default.aspx" verb="*" type="System.Web.UI.PageHandlerFactory" preCondition="integratedMode" requireAccess="Script"/>
       <add name="NotFound" path="*" verb="*" type="System.Web.HttpNotFoundHandler" preCondition="integratedMode" requireAccess="Script"/>
     </handlers>
   </system.webServer>
diff --git a/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/ExtraFiles.xml b/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/ExtraFiles.xml
index 015aa66af..f9e08e3b4 100644
--- a/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/ExtraFiles.xml
+++ b/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/ExtraFiles.xml
@@ -1,9 +1,5 @@
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Compile Include="Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
diff --git a/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml b/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml
index 66643bded..4c3a29ed4 100644
--- a/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml
+++ b/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml
@@ -74,17 +74,12 @@
     <Reference Include="System.Web.Mobile" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Default.aspx.cs">
-      <DependentUpon>Default.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Default.aspx" />
     <Content Include="Global.asax" />
     <Content Include="Web.config" />
     <Content Include="Views\Home\Index.ascx" />