@@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject CodeCoverageTestRun.testrunconfig = CodeCoverageTestRun.testrunconfig LocalTestRun.testrunconfig = LocalTestRun.testrunconfig - Maverick.vsmdi = Maverick.vsmdi + maverick.vsmdi = maverick.vsmdi EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maverick.Core", "Source\Core\Maverick.Core\Maverick.Core.csproj", "{0DDF699A-DDB4-49C0-A43E-D4ACD7E0C23F}" Maverick.sln @@ -13,7 +13,7 @@ namespace Maverick.Web.ModuleFramework { public HeaderContributingViewResultAdapter(ViewResultBase innerResult) { Arg.NotNull("innerResult", innerResult); InnerResult = innerResult; - HeaderViewNameFormat = "{0}.import"; + HeaderViewNameFormat = "{0}.header"; } public override void ExecuteResult(ControllerContext context) { Source/Web/Maverick.Web/ModuleFramework/HeaderContributingViewResultAdapter.cs @@ -28,7 +28,7 @@ namespace Maverick.Web.Tests.ModuleFramework { [TestMethod] public void Constructor_Initializes_HeaderViewNameFormat_Property() { ViewResult innerResult = new ViewResult(); - Assert.AreEqual("{0}.import", new HeaderContributingViewResultAdapter(innerResult).HeaderViewNameFormat); + Assert.AreEqual("{0}.header", new HeaderContributingViewResultAdapter(innerResult).HeaderViewNameFormat); } [TestMethod] @@ -67,14 +67,14 @@ namespace Maverick.Web.Tests.ModuleFramework { ViewResult innerResult = new ViewResult() {ViewName = "foo"}; ControllerContext context = Mockery.CreateMockControllerContext(); var mockAdapter = new Mock<HeaderContributingViewResultAdapter>(innerResult) { CallBase = true }; - mockAdapter.Setup(a => a.CreateHeaderResult(context, "foo.import")) + mockAdapter.Setup(a => a.CreateHeaderResult(context, "foo.header")) .Returns(new EmptyResult()); // Act mockAdapter.Object.ExecuteHeader(context); // Assert - mockAdapter.Verify(a => a.CreateHeaderResult(context, "foo.import")); + mockAdapter.Verify(a => a.CreateHeaderResult(context, "foo.header")); } @@ -106,7 +106,7 @@ namespace Maverick.Web.Tests.ModuleFramework { string actual = adapter.GetHeaderViewName(context); // Assert - Assert.AreEqual("foo.import", actual); + Assert.AreEqual("foo.header", actual); } [TestMethod] @@ -127,7 +127,7 @@ namespace Maverick.Web.Tests.ModuleFramework { ControllerContext context = Mockery.CreateMockControllerContext(); // Act - PartialViewResult result = adapter.CreateHeaderResult(context, "View.Import") as PartialViewResult; + PartialViewResult result = adapter.CreateHeaderResult(context, "View.Header") as PartialViewResult; // Assert Assert.IsNotNull(result); @@ -146,11 +146,11 @@ namespace Maverick.Web.Tests.ModuleFramework { ControllerContext context = Mockery.CreateMockControllerContext(); // Act - PartialViewResult result = adapter.CreateHeaderResult(context, "View.Import") as PartialViewResult; + PartialViewResult result = adapter.CreateHeaderResult(context, "View.Header") as PartialViewResult; // Assert Assert.IsNull(result.View); - Assert.AreEqual("View.Import", result.ViewName); + Assert.AreEqual("View.Header", result.ViewName); } private static ViewResult CreateFullViewResult() { Tests/Maverick.Web.Tests/ModuleFramework/HeaderContributingViewResultAdapterTests.cs 105dd64227552f65c0ff50f69cbccdc2d334054b Andrew Nurse andrew@andrewnurse.net http://github.com/anurse/MaVeriCk/commit/6feb9c369d8466ede0b355ae3d9bad85b899aebd 6feb9c369d8466ede0b355ae3d9bad85b899aebd 2009-04-28T12:26:09-07:00 2009-04-28T12:26:09-07:00 Changed Header view suffix fbe623bc41cc3336917cb01ef14b981e5c7c2aa3 Andrew Nurse andrew@andrewnurse.net