Combine layouts

Web.Tests/ViewModels/CreateLogViewModelTests.cs

@@ -1,6 +1,5 @@
 using System;
 using MileageTraker.Web.Models;
-using MileageTraker.Web.ViewModels;
 using MileageTraker.Web.ViewModels.CreateLog;
 using NUnit.Framework;
 
@@ -33,40 +32,14 @@ namespace Web.Tests.ViewModels
 				};
 
 			var log = viewModel.GetLog();
-		}
 
-		[Test]
-		public void Ctor_Initializes_From_Log()
-		{
-			var cityName = "My Town";
-			var date = DateTime.Today;
-			var employeeName = "Name";
-			var endOdometer = 1234;
-			var ethraId = "4567";
-			var gasPurchased = 2.546d;
-			var mileageLogType = MileageLogType.Commuting;
-
-			var log =
-				new Log
-				{
-					CityName = cityName,
-					Date = date,
-					EmployeeName = employeeName,
-					EndOdometer = endOdometer,
-					VehicleId = ethraId,
-					GasPurchased = gasPurchased,
-					LogType = mileageLogType
-				};
-
-			var viewModel = new CreateLogViewModel(log);
-
-			Assert.That(viewModel.CityName, Is.EqualTo(cityName));
-			Assert.That(viewModel.Date, Is.EqualTo(date.ToString("d")));
-			Assert.That(viewModel.EmployeeName, Is.EqualTo(employeeName));
-			Assert.That(viewModel.EndOdometer, Is.EqualTo(endOdometer.ToString()));
-			Assert.That(viewModel.VehicleId, Is.EqualTo(ethraId));
-			Assert.That(viewModel.GasPurchased, Is.EqualTo(gasPurchased.ToString()));
-			Assert.That(viewModel.LogType.Enum, Is.EqualTo(mileageLogType));
+			Assert.That(log.CityName, Is.EqualTo(cityName));
+			Assert.That(log.Date, Is.EqualTo(date));
+			Assert.That(log.EmployeeName, Is.EqualTo(employeeName));
+			Assert.That(log.EndOdometer.ToString(), Is.EqualTo(endOdometer));
+			Assert.That(log.VehicleId, Is.EqualTo(ethraId));
+			Assert.That(log.GasPurchased.ToString(), Is.EqualTo(gasPurchased));
+			Assert.That(log.LogType.Enum, Is.EqualTo(mileageLogType.Enum));
 		}
 	}
 }

Web.Tests/ViewModels/CreateUserViewModelTests.cs

@@ -0,0 +1,25 @@
+using MileageTraker.Web.ViewModels.User;
+using NUnit.Framework;
+
+namespace Web.Tests.ViewModels
+{
+	[TestFixture]
+	public class CreateUserViewModelTests
+	{
+		[Test]
+		public void CloneToUser_CopiesProperties()
+		{
+			var vm = new CreateUserViewModel();
+
+			var email = vm.Email = "bob@dobalina.com";
+			var firstName = vm.FirstName = "bob";
+			var lastName = vm.LastName = "dobalina";
+
+			var user = vm.CloneToUser();
+
+			Assert.That(user.Email, Is.EqualTo(email));
+			Assert.That(user.FirstName, Is.EqualTo(firstName));
+			Assert.That(user.LastName, Is.EqualTo(lastName));
+		}
+	}
+}

Web.Tests/Web.Tests.csproj

@@ -89,6 +89,7 @@
     <Compile Include="Utility\AlgorithmsTests.cs" />
     <Compile Include="Utility\CustomExtensionsTests.cs" />
     <Compile Include="ViewModels\CreateLogViewModelTests.cs" />
+    <Compile Include="ViewModels\CreateUserViewModelTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="DAL\Vehicles.xls">
@@ -102,6 +103,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />

Web.Tests/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>