diff --git a/src/Orchard.Specs/Blogs.feature b/src/Orchard.Specs/Blogs.feature index cc773d77f..28812fc7b 100644 --- a/src/Orchard.Specs/Blogs.feature +++ b/src/Orchard.Specs/Blogs.feature @@ -184,7 +184,7 @@ Scenario: I set my blog to be the content for the home page and the posts for th | Body.Text | Hi there. | And I hit "Publish Now" And I am redirected - And I go to "/Default.aspx" + And I go to "/" Then I should see "

My Blog

" When I go to "/my-blog" Then the status should be 404 "Not Found" diff --git a/src/Orchard.Specs/Blogs.feature.cs b/src/Orchard.Specs/Blogs.feature.cs index 47fef6b10..227bb49a9 100644 --- a/src/Orchard.Specs/Blogs.feature.cs +++ b/src/Orchard.Specs/Blogs.feature.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // This code was generated by SpecFlow (http://www.specflow.org/). -// SpecFlow Version:1.4.0.0 +// SpecFlow Version:1.3.2.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.3.2.0")] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [NUnit.Framework.TestFixtureAttribute()] [NUnit.Framework.DescriptionAttribute("Blog")] @@ -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"), "Blog", "In order to add blogs to my site\r\nAs an author\r\nI want to create blogs and create" + - ", publish and edit blog posts", GenerationTargetLanguage.CSharp, ((string[])(null))); + ", publish and edit blog posts", ((string[])(null))); testRunner.OnFeatureStart(featureInfo); } @@ -61,11 +61,11 @@ 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.When("I go to \"admin\""); +testRunner.When("I go to \"admin\""); #line 9 - testRunner.Then("I should see \"Blogs\""); +testRunner.Then("I should see \"Blogs\""); #line hidden testRunner.CollectScenarioErrors(); } @@ -78,9 +78,9 @@ this.ScenarioSetup(scenarioInfo); #line 11 this.ScenarioSetup(scenarioInfo); #line 12 - testRunner.Given("I have installed Orchard"); +testRunner.Given("I have installed Orchard"); #line 13 - testRunner.When("I go to \"admin/blogs/create\""); +testRunner.When("I go to \"admin/blogs/create\""); #line hidden TechTalk.SpecFlow.Table table1 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -89,15 +89,15 @@ this.ScenarioSetup(scenarioInfo); "Routable.Title", "My Blog"}); #line 14 - testRunner.And("I fill in", ((string)(null)), table1); +testRunner.And("I fill in", ((string)(null)), table1); #line 17 - testRunner.And("I hit \"Save\""); +testRunner.And("I hit \"Save\""); #line 18 - testRunner.And("I go to \"admin/blogs\""); +testRunner.And("I go to \"admin/blogs\""); #line 19 - testRunner.And("I follow \"My Blog\""); +testRunner.And("I follow \"My Blog\""); #line 20 - testRunner.And("I follow \"New Post\""); +testRunner.And("I follow \"New Post\""); #line hidden TechTalk.SpecFlow.Table table2 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -109,21 +109,21 @@ this.ScenarioSetup(scenarioInfo); "Body.Text", "Hi there."}); #line 21 - testRunner.And("I fill in", ((string)(null)), table2); +testRunner.And("I fill in", ((string)(null)), table2); #line 25 - testRunner.And("I hit \"Publish Now\""); +testRunner.And("I hit \"Publish Now\""); #line 26 - testRunner.And("I go to \"my-blog\""); +testRunner.And("I go to \"my-blog\""); #line 27 - testRunner.Then("I should see \"]*>.*?My Blog.*?\""); +testRunner.Then("I should see \"]*>.*?My Blog.*?\""); #line 28 - testRunner.And("I should see \"]*>.*?My Post.*?\""); +testRunner.And("I should see \"]*>.*?My Post.*?\""); #line 29 - testRunner.When("I go to \"my-blog/my-post\""); +testRunner.When("I go to \"my-blog/my-post\""); #line 30 - testRunner.Then("I should see \"]*>.*?My Post.*?\""); +testRunner.Then("I should see \"]*>.*?My Post.*?\""); #line 31 - testRunner.And("I should see \"Hi there.\""); +testRunner.And("I should see \"Hi there.\""); #line hidden testRunner.CollectScenarioErrors(); } @@ -138,9 +138,9 @@ this.ScenarioSetup(scenarioInfo); #line 33 this.ScenarioSetup(scenarioInfo); #line 34 - testRunner.Given("I have installed Orchard"); +testRunner.Given("I have installed Orchard"); #line 35 - testRunner.When("I go to \"admin/blogs/create\""); +testRunner.When("I go to \"admin/blogs/create\""); #line hidden TechTalk.SpecFlow.Table table3 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -149,15 +149,15 @@ this.ScenarioSetup(scenarioInfo); "Routable.Title", "My Blog"}); #line 36 - testRunner.And("I fill in", ((string)(null)), table3); +testRunner.And("I fill in", ((string)(null)), table3); #line 39 - testRunner.And("I hit \"Save\""); +testRunner.And("I hit \"Save\""); #line 40 - testRunner.And("I go to \"admin/blogs\""); +testRunner.And("I go to \"admin/blogs\""); #line 41 - testRunner.And("I follow \"My Blog\""); +testRunner.And("I follow \"My Blog\""); #line 42 - testRunner.And("I follow \"New Post\""); +testRunner.And("I follow \"New Post\""); #line hidden TechTalk.SpecFlow.Table table4 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -169,21 +169,21 @@ this.ScenarioSetup(scenarioInfo); "Body.Text", "Hi there."}); #line 43 - testRunner.And("I fill in", ((string)(null)), table4); +testRunner.And("I fill in", ((string)(null)), table4); #line 47 - testRunner.And("I hit \"Publish Now\""); +testRunner.And("I hit \"Publish Now\""); #line 48 - testRunner.And("I go to \"my-blog/my-post\""); +testRunner.And("I go to \"my-blog/my-post\""); #line 49 - testRunner.Then("I should see \"]*>.*?My Post.*?\""); +testRunner.Then("I should see \"]*>.*?My Post.*?\""); #line 50 - testRunner.And("I should see \"Hi there.\""); +testRunner.And("I should see \"Hi there.\""); #line 51 - testRunner.When("I go to \"admin/blogs\""); +testRunner.When("I go to \"admin/blogs\""); #line 52 - testRunner.And("I follow \"My Blog\""); +testRunner.And("I follow \"My Blog\""); #line 53 - testRunner.And("I follow \"New Post\""); +testRunner.And("I follow \"New Post\""); #line hidden TechTalk.SpecFlow.Table table5 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -195,21 +195,21 @@ this.ScenarioSetup(scenarioInfo); "Body.Text", "Hi there, again."}); #line 54 - testRunner.And("I fill in", ((string)(null)), table5); +testRunner.And("I fill in", ((string)(null)), table5); #line 58 - testRunner.And("I hit \"Publish Now\""); +testRunner.And("I hit \"Publish Now\""); #line 59 - testRunner.And("I go to \"my-blog/my-post-2\""); +testRunner.And("I go to \"my-blog/my-post-2\""); #line 60 - testRunner.Then("I should see \"]*>.*?My Post.*?\""); +testRunner.Then("I should see \"]*>.*?My Post.*?\""); #line 61 - testRunner.And("I should see \"Hi there, again.\""); +testRunner.And("I should see \"Hi there, again.\""); #line 62 - testRunner.When("I go to \"admin/blogs\""); +testRunner.When("I go to \"admin/blogs\""); #line 63 - testRunner.And("I follow \"My Blog\""); +testRunner.And("I follow \"My Blog\""); #line 64 - testRunner.And("I follow \"New Post\""); +testRunner.And("I follow \"New Post\""); #line hidden TechTalk.SpecFlow.Table table6 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -224,15 +224,15 @@ this.ScenarioSetup(scenarioInfo); "Body.Text", "Are you still there?"}); #line 65 - testRunner.And("I fill in", ((string)(null)), table6); +testRunner.And("I fill in", ((string)(null)), table6); #line 70 - testRunner.And("I hit \"Publish Now\""); +testRunner.And("I hit \"Publish Now\""); #line 71 - testRunner.And("I go to \"my-blog/my-post-3\""); +testRunner.And("I go to \"my-blog/my-post-3\""); #line 72 - testRunner.Then("I should see \"]*>.*?My Post.*?\""); +testRunner.Then("I should see \"]*>.*?My Post.*?\""); #line 73 - testRunner.And("I should see \"Are you still there?\""); +testRunner.And("I should see \"Are you still there?\""); #line hidden testRunner.CollectScenarioErrors(); } @@ -247,9 +247,9 @@ this.ScenarioSetup(scenarioInfo); #line 75 this.ScenarioSetup(scenarioInfo); #line 76 - testRunner.Given("I have installed Orchard"); +testRunner.Given("I have installed Orchard"); #line 77 - testRunner.When("I go to \"admin/blogs/create\""); +testRunner.When("I go to \"admin/blogs/create\""); #line hidden TechTalk.SpecFlow.Table table7 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -258,19 +258,19 @@ this.ScenarioSetup(scenarioInfo); "Routable.Title", "My Blog"}); #line 78 - testRunner.And("I fill in", ((string)(null)), table7); +testRunner.And("I fill in", ((string)(null)), table7); #line 81 - testRunner.And("I hit \"Save\""); +testRunner.And("I hit \"Save\""); #line 82 - testRunner.And("I go to \"my-blog\""); +testRunner.And("I go to \"my-blog\""); #line 83 - testRunner.Then("I should see \"]*>.*?My Blog.*?\""); +testRunner.Then("I should see \"]*>.*?My Blog.*?\""); #line 84 - testRunner.When("I go to \"admin/blogs\""); +testRunner.When("I go to \"admin/blogs\""); #line 85 - testRunner.And("I follow \"My Blog\""); +testRunner.And("I follow \"My Blog\""); #line 86 - testRunner.And("I follow \"New Post\""); +testRunner.And("I follow \"New Post\""); #line hidden TechTalk.SpecFlow.Table table8 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -282,21 +282,21 @@ this.ScenarioSetup(scenarioInfo); "Body.Text", "Hi there."}); #line 87 - testRunner.And("I fill in", ((string)(null)), table8); +testRunner.And("I fill in", ((string)(null)), table8); #line 91 - testRunner.And("I hit \"Publish Now\""); +testRunner.And("I hit \"Publish Now\""); #line 92 - testRunner.And("I go to \"my-blog/my-post\""); +testRunner.And("I go to \"my-blog/my-post\""); #line 93 - testRunner.Then("I should see \"]*>.*?My Post.*?\""); +testRunner.Then("I should see \"]*>.*?My Post.*?\""); #line 94 - testRunner.And("I should see \"Hi there.\""); +testRunner.And("I should see \"Hi there.\""); #line 95 - testRunner.When("I go to \"admin/blogs\""); +testRunner.When("I go to \"admin/blogs\""); #line 96 - testRunner.And("I follow \"My Blog\""); +testRunner.And("I follow \"My Blog\""); #line 97 - testRunner.And("I follow \"Blog Properties\""); +testRunner.And("I follow \"Blog Properties\""); #line hidden TechTalk.SpecFlow.Table table9 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -305,19 +305,19 @@ this.ScenarioSetup(scenarioInfo); "Routable.Slug", "my-other-blog"}); #line 98 - testRunner.And("I fill in", ((string)(null)), table9); +testRunner.And("I fill in", ((string)(null)), table9); #line 101 - testRunner.And("I hit \"Save\""); +testRunner.And("I hit \"Save\""); #line 102 - testRunner.And("I go to \"my-other-blog\""); +testRunner.And("I go to \"my-other-blog\""); #line 103 - testRunner.Then("I should see \"]*>.*?My Blog.*?\""); +testRunner.Then("I should see \"]*>.*?My Blog.*?\""); #line 104 - testRunner.When("I go to \"my-other-blog/my-post\""); +testRunner.When("I go to \"my-other-blog/my-post\""); #line 105 - testRunner.Then("I should see \"]*>.*?My Post.*?\""); +testRunner.Then("I should see \"]*>.*?My Post.*?\""); #line 106 - testRunner.And("I should see \"Hi there.\""); +testRunner.And("I should see \"Hi there.\""); #line hidden testRunner.CollectScenarioErrors(); } @@ -330,9 +330,9 @@ this.ScenarioSetup(scenarioInfo); #line 108 this.ScenarioSetup(scenarioInfo); #line 109 - testRunner.Given("I have installed Orchard"); +testRunner.Given("I have installed Orchard"); #line 110 - testRunner.When("I go to \"admin/blogs/create\""); +testRunner.When("I go to \"admin/blogs/create\""); #line hidden TechTalk.SpecFlow.Table table10 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -341,15 +341,15 @@ this.ScenarioSetup(scenarioInfo); "Routable.Title", "My Blog"}); #line 111 - testRunner.And("I fill in", ((string)(null)), table10); +testRunner.And("I fill in", ((string)(null)), table10); #line 114 - testRunner.And("I hit \"Save\""); +testRunner.And("I hit \"Save\""); #line 115 - testRunner.And("I go to \"admin/blogs\""); +testRunner.And("I go to \"admin/blogs\""); #line 116 - testRunner.And("I follow \"My Blog\""); +testRunner.And("I follow \"My Blog\""); #line 117 - testRunner.And("I follow \"New Post\""); +testRunner.And("I follow \"New Post\""); #line hidden TechTalk.SpecFlow.Table table11 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -361,15 +361,15 @@ this.ScenarioSetup(scenarioInfo); "Body.Text", "Hi there."}); #line 118 - testRunner.And("I fill in", ((string)(null)), table11); +testRunner.And("I fill in", ((string)(null)), table11); #line 122 - testRunner.And("I hit \"Publish Now\""); +testRunner.And("I hit \"Publish Now\""); #line 123 - testRunner.And("I am redirected"); +testRunner.And("I am redirected"); #line 124 - testRunner.And("I go to \"my-blog/my-post\""); +testRunner.And("I go to \"my-blog/my-post\""); #line 125 - testRunner.Then("I should see \"\""); #line hidden testRunner.CollectScenarioErrors(); @@ -385,13 +385,13 @@ this.ScenarioSetup(scenarioInfo); #line 128 this.ScenarioSetup(scenarioInfo); #line 129 - testRunner.Given("I have installed Orchard"); +testRunner.Given("I have installed Orchard"); #line 130 - testRunner.And("I have enabled \"XmlRpc\""); +testRunner.And("I have enabled \"XmlRpc\""); #line 131 - testRunner.And("I have enabled \"Orchard.Blogs.RemotePublishing\""); +testRunner.And("I have enabled \"Orchard.Blogs.RemotePublishing\""); #line 132 - testRunner.When("I go to \"admin/blogs/create\""); +testRunner.When("I go to \"admin/blogs/create\""); #line hidden TechTalk.SpecFlow.Table table12 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -400,23 +400,23 @@ this.ScenarioSetup(scenarioInfo); "Routable.Title", "My Blog"}); #line 133 - testRunner.And("I fill in", ((string)(null)), table12); +testRunner.And("I fill in", ((string)(null)), table12); #line 136 - testRunner.And("I hit \"Save\""); +testRunner.And("I hit \"Save\""); #line 137 - testRunner.And("I go to \"my-blog\""); +testRunner.And("I go to \"my-blog\""); #line 138 - testRunner.Then("I should see \"\""); #line 139 - testRunner.When("I go to \"/XmlRpc/LiveWriter/Manifest\""); +testRunner.When("I go to \"/XmlRpc/LiveWriter/Manifest\""); #line 140 - testRunner.Then("the content type should be \"\\btext/xml\\b\""); +testRunner.Then("the content type should be \"\\btext/xml\\b\""); #line 141 - testRunner.And("I should see \"\""); #line 142 - testRunner.And("I should see \"Metaweblog\""); +testRunner.And("I should see \"Metaweblog\""); #line hidden testRunner.CollectScenarioErrors(); } @@ -431,11 +431,11 @@ this.ScenarioSetup(scenarioInfo); #line 144 this.ScenarioSetup(scenarioInfo); #line 145 - testRunner.Given("I have installed Orchard at \"/OrchardLocal\""); +testRunner.Given("I have installed Orchard at \"/OrchardLocal\""); #line 146 - testRunner.When("I go to \"admin/blogs/create\""); +testRunner.When("I go to \"admin/blogs/create\""); #line 147 - testRunner.Then("I should see \"http\\://localhost/OrchardLocal/\""); +testRunner.Then("I should see \"http\\://localhost/OrchardLocal/\""); #line hidden TechTalk.SpecFlow.Table table13 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -444,17 +444,17 @@ this.ScenarioSetup(scenarioInfo); "Routable.Title", "My Blog"}); #line 148 - testRunner.When("I fill in", ((string)(null)), table13); +testRunner.When("I fill in", ((string)(null)), table13); #line 151 - testRunner.And("I hit \"Save\""); +testRunner.And("I hit \"Save\""); #line 152 - testRunner.And("I go to \"admin/blogs\""); +testRunner.And("I go to \"admin/blogs\""); #line 153 - testRunner.And("I follow \"My Blog\""); +testRunner.And("I follow \"My Blog\""); #line 154 - testRunner.And("I follow \"New Post\""); +testRunner.And("I follow \"New Post\""); #line 155 - testRunner.Then("I should see \"http\\://localhost/OrchardLocal/my-blog/\""); +testRunner.Then("I should see \"http\\://localhost/OrchardLocal/my-blog/\""); #line hidden testRunner.CollectScenarioErrors(); } @@ -469,11 +469,11 @@ this.ScenarioSetup(scenarioInfo); #line 157 this.ScenarioSetup(scenarioInfo); #line 158 - testRunner.Given("I have installed Orchard at \"/\""); +testRunner.Given("I have installed Orchard at \"/\""); #line 159 - testRunner.When("I go to \"admin/blogs/create\""); +testRunner.When("I go to \"admin/blogs/create\""); #line 160 - testRunner.Then("I should see \"http\\://localhost/\""); +testRunner.Then("I should see \"http\\://localhost/\""); #line hidden TechTalk.SpecFlow.Table table14 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -482,17 +482,17 @@ this.ScenarioSetup(scenarioInfo); "Routable.Title", "My Blog"}); #line 161 - testRunner.When("I fill in", ((string)(null)), table14); +testRunner.When("I fill in", ((string)(null)), table14); #line 164 - testRunner.And("I hit \"Save\""); +testRunner.And("I hit \"Save\""); #line 165 - testRunner.And("I go to \"admin/blogs\""); +testRunner.And("I go to \"admin/blogs\""); #line 166 - testRunner.And("I follow \"My Blog\""); +testRunner.And("I follow \"My Blog\""); #line 167 - testRunner.And("I follow \"New Post\""); +testRunner.And("I follow \"New Post\""); #line 168 - testRunner.Then("I should see \"http\\://localhost/my-blog/\""); +testRunner.Then("I should see \"http\\://localhost/my-blog/\""); #line hidden testRunner.CollectScenarioErrors(); } @@ -507,9 +507,9 @@ this.ScenarioSetup(scenarioInfo); #line 170 this.ScenarioSetup(scenarioInfo); #line 171 - testRunner.Given("I have installed Orchard"); +testRunner.Given("I have installed Orchard"); #line 172 - testRunner.When("I go to \"admin/blogs/create\""); +testRunner.When("I go to \"admin/blogs/create\""); #line hidden TechTalk.SpecFlow.Table table15 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -521,15 +521,15 @@ this.ScenarioSetup(scenarioInfo); "Routable.PromoteToHomePage", "true"}); #line 173 - testRunner.And("I fill in", ((string)(null)), table15); +testRunner.And("I fill in", ((string)(null)), table15); #line 177 - testRunner.And("I hit \"Save\""); +testRunner.And("I hit \"Save\""); #line 178 - testRunner.And("I go to \"admin/blogs\""); +testRunner.And("I go to \"admin/blogs\""); #line 179 - testRunner.And("I follow \"My Blog\""); +testRunner.And("I follow \"My Blog\""); #line 180 - testRunner.And("I follow \"New Post\""); +testRunner.And("I follow \"New Post\""); #line hidden TechTalk.SpecFlow.Table table16 = new TechTalk.SpecFlow.Table(new string[] { "name", @@ -541,23 +541,23 @@ this.ScenarioSetup(scenarioInfo); "Body.Text", "Hi there."}); #line 181 - testRunner.And("I fill in", ((string)(null)), table16); +testRunner.And("I fill in", ((string)(null)), table16); #line 185 - testRunner.And("I hit \"Publish Now\""); +testRunner.And("I hit \"Publish Now\""); #line 186 - testRunner.And("I am redirected"); +testRunner.And("I am redirected"); #line 187 - testRunner.And("I go to \"/Default.aspx\""); +testRunner.And("I go to \"/\""); #line 188 - testRunner.Then("I should see \"

My Blog

\""); +testRunner.Then("I should see \"

My Blog

\""); #line 189 - testRunner.When("I go to \"/my-blog\""); +testRunner.When("I go to \"/my-blog\""); #line 190 - testRunner.Then("the status should be 404 \"Not Found\""); +testRunner.Then("the status should be 404 \"Not Found\""); #line 191 - testRunner.When("I go to \"/my-post\""); +testRunner.When("I go to \"/my-post\""); #line 192 - testRunner.Then("I should see \"

My Post

\""); +testRunner.Then("I should see \"

My Post

\""); #line hidden testRunner.CollectScenarioErrors(); } diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Default.aspx b/src/Orchard.Specs/Hosting/Orchard.Web/Default.aspx deleted file mode 100644 index 87acc9c18..000000000 --- a/src/Orchard.Specs/Hosting/Orchard.Web/Default.aspx +++ /dev/null @@ -1 +0,0 @@ -<%@ Page AutoEventWireup="true" Inherits="Orchard.Specs.Hosting.Orchard.Web._Default, Orchard.Specs" %> \ No newline at end of file diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/_Default.aspx.cs b/src/Orchard.Specs/Hosting/Orchard.Web/_Default.aspx.cs deleted file mode 100644 index d3535b075..000000000 --- a/src/Orchard.Specs/Hosting/Orchard.Web/_Default.aspx.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Web; -using System.Web.Mvc; -using System.Web.UI; - -namespace Orchard.Specs.Hosting.Orchard.Web { - public class _Default : Page { - public void Page_Load(object sender, EventArgs e) { - // Change the current path so that the Routing handler can correctly interpret - // the request, then restore the original path so that the OutputCache module - // can correctly process the response (if caching is enabled). - - var originalPath = Request.Path; - HttpContext.Current.RewritePath(Request.ApplicationPath, false); - IHttpHandler httpHandler = new MvcHttpHandler(); - httpHandler.ProcessRequest(HttpContext.Current); - HttpContext.Current.RewritePath(originalPath, false); - } - } -} \ No newline at end of file diff --git a/src/Orchard.Specs/Hosting/RequestExtensions.cs b/src/Orchard.Specs/Hosting/RequestExtensions.cs index 1cd5d7fd9..7cd5b1143 100644 --- a/src/Orchard.Specs/Hosting/RequestExtensions.cs +++ b/src/Orchard.Specs/Hosting/RequestExtensions.cs @@ -74,6 +74,9 @@ namespace Orchard.Specs.Hosting { } private static string StripVDir(string urlPath, string virtualDirectory) { + if (urlPath == "/") + return urlPath; + return urlPath.StartsWith(virtualDirectory, StringComparison.OrdinalIgnoreCase) ? urlPath.Substring(virtualDirectory.Length) : urlPath; diff --git a/src/Orchard.Specs/Orchard.Specs.csproj b/src/Orchard.Specs/Orchard.Specs.csproj index 7b771b57f..e5c83ec95 100644 --- a/src/Orchard.Specs/Orchard.Specs.csproj +++ b/src/Orchard.Specs/Orchard.Specs.csproj @@ -203,9 +203,6 @@ - - ASPXCodeBehind - True True @@ -332,9 +329,6 @@ Always - - Always - Always diff --git a/src/Orchard.Web/Default.aspx b/src/Orchard.Web/Default.aspx deleted file mode 100644 index 91e8223ee..000000000 --- a/src/Orchard.Web/Default.aspx +++ /dev/null @@ -1,3 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="Orchard.Web._Default" %> - -<%-- Please do not delete this file. It is used to ensure that ASP.NET MVC is activated by IIS when a user makes a "/" request to the server. --%> diff --git a/src/Orchard.Web/Default.aspx.cs b/src/Orchard.Web/Default.aspx.cs deleted file mode 100644 index 66713cf3f..000000000 --- a/src/Orchard.Web/Default.aspx.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Web; -using System.Web.Mvc; -using System.Web.UI; - -namespace Orchard.Web { - public class _Default : Page { - public void Page_Load(object sender, EventArgs e) { - // Change the current path so that the Routing handler can correctly interpret - // the request, then restore the original path so that the OutputCache module - // can correctly process the response (if caching is enabled). - - var originalPath = Request.Path; - HttpContext.Current.RewritePath(Request.ApplicationPath, false); - IHttpHandler httpHandler = new MvcHttpHandler(); - httpHandler.ProcessRequest(HttpContext.Current); - HttpContext.Current.RewritePath(originalPath, false); - } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 5a2766d38..006f9822c 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -118,10 +118,6 @@ - - Default.aspx - ASPXCodeBehind - Global.asax @@ -130,7 +126,6 @@ -