CON-1619-clean -up-tests

SkillsFundingAgency · Apr 7, 2020 · 280eb41 · 280eb41
1 parent 6e5e077
commit 280eb41
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 156 deletions.
diff --git a/...oyerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenAgreementToSign.cs b/...oyerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenAgreementToSign.cs
@@ -7,7 +7,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenHomePageToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenAgreementToSign
     {

diff --git a/...ollers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenAgreementToSign.cs b/...ollers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenAgreementToSign.cs
diff --git a/...rollers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenFundsToReserve.cs b/...rollers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenFundsToReserve.cs
diff --git a/...loyerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenFundsToReserve.cs b/...loyerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenFundsToReserve.cs
@@ -1,13 +1,15 @@
-using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Web.Mvc;
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.Authentication;
 using SFA.DAS.EmployerAccounts.Interfaces;
+using SFA.DAS.EmployerAccounts.Models.Reservations;
 using SFA.DAS.EmployerAccounts.Web.Controllers;
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenHomePageToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenFundsToReserve
     {
@@ -54,6 +56,7 @@ public void ThenForNonLevyTheCheckFundingViewIsReturnedAtRow1Panel1()
             //Assert
             Assert.IsNotNull(result);
             Assert.AreEqual("CheckFunding", (result.Model as dynamic).ViewName);
+            Assert.AreEqual(PanelType.Action, (result.Model as dynamic).PanelType);
         }
 
         [Test]
@@ -78,5 +81,31 @@ public void ThenForLevyTheEmptyViewIsReturnedAtRow1Panel1()
             Assert.IsNotNull(result);
             Assert.AreEqual("Empty", (result.Model as dynamic).ViewName);
         }
+
+        [Test]
+        public void ThenForNonLevyTheContinueSetupForSingleReservationViewIsReturnedAtRow1Panel1()
+        {
+            // Arrange
+            var model = new AccountDashboardViewModel
+            {
+                PayeSchemeCount = 1,
+                CallToActionViewModel = new CallToActionViewModel
+                {
+                    AgreementsToSign = false,
+                    Reservations = new List<Reservation> { new Reservation { Status = ReservationStatus.Pending } },
+                    VacanciesViewModel = new VacanciesViewModel()
+                },
+
+                ApprenticeshipEmployerType = Common.Domain.Types.ApprenticeshipEmployerType.NonLevy
+            };
+
+            //Act
+            var result = _controller.Row1Panel1(model) as PartialViewResult;
+
+            //Assert
+            Assert.IsNotNull(result);
+            Assert.AreEqual("ContinueSetupForSingleReservation", (result.Model as dynamic).ViewName);
+            Assert.AreEqual(PanelType.Summary, (result.Model as dynamic).PanelType);
+        }
     }
 }
diff --git a/...mployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenNoPayeScheme.cs b/...mployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenNoPayeScheme.cs
@@ -7,7 +7,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenHomePageToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenNoPayeScheme
     {

diff --git a/...gleIsEnabled/WhenSetupSingleApprentice.cs → ...trollerTests/WhenSetupSingleApprentice.cs b/...gleIsEnabled/WhenSetupSingleApprentice.cs → ...trollerTests/WhenSetupSingleApprentice.cs
@@ -11,7 +11,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenCallToActionToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenSetupSingleApprentice
     {

diff --git a/...ed/WhenSetupSingleApprenticeByProvider.cs → ...ts/WhenSetupSingleApprenticeByProvider.cs b/...ed/WhenSetupSingleApprenticeByProvider.cs → ...ts/WhenSetupSingleApprenticeByProvider.cs
@@ -10,7 +10,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenCallToActionToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenSetupSingleApprenticeByProvider
     {

diff --git a/...nabled/WhenSetupSingleApprenticeStatus.cs → ...rTests/WhenSetupSingleApprenticeStatus.cs b/...nabled/WhenSetupSingleApprenticeStatus.cs → ...rTests/WhenSetupSingleApprenticeStatus.cs
@@ -10,7 +10,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenCallToActionToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenSetupSingleApprenticeStatus
     {

diff --git a/...leIsEnabled/WhenSetupSingleReservation.cs → ...rollerTests/WhenSetupSingleReservation.cs b/...leIsEnabled/WhenSetupSingleReservation.cs → ...rollerTests/WhenSetupSingleReservation.cs
@@ -9,7 +9,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenCallToActionToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenSetupSingleReservation
     {

diff --git a/....Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSupportUserBannerIsRendered.cs b/....Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSupportUserBannerIsRendered.cs
@@ -14,7 +14,7 @@
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 using SFA.DAS.EmployerAccounts.Models.Account;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenHomePageToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenSupportUserBannerIsRendered
     {

diff --git a/...erAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenVacancyInProgress.cs b/...erAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenVacancyInProgress.cs
@@ -8,7 +8,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenHomePageToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenVacancyInProgress
     {