Merge pull request #119 from SkillsFundingAgency/CV-490-499-500-682-6…

…83-TestBranch Cv 490 499 500 682 683 test branch
SkillsFundingAgency · Apr 22, 2020 · 9508d70 · 9508d70
2 parents 42e5b01 + 3103e49
commit 9508d70
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/...A.DAS.EmployerCommitmentsV2.Web.UnitTests/Mappers/Apprentice/IndexViewModelMapperTests.cs b/...A.DAS.EmployerCommitmentsV2.Web.UnitTests/Mappers/Apprentice/IndexViewModelMapperTests.cs
@@ -205,7 +205,7 @@ public async Task ShouldMapStatusValues(
             Assert.IsTrue(viewModel.FilterModel.StatusFilters.Contains(ApprenticeshipStatus.Stopped));
             Assert.IsTrue(viewModel.FilterModel.StatusFilters.Contains(ApprenticeshipStatus.WaitingToStart));
             Assert.IsFalse(viewModel.FilterModel.StatusFilters.Contains(ApprenticeshipStatus.Unknown));
-            Assert.IsFalse(viewModel.FilterModel.StatusFilters.Contains(ApprenticeshipStatus.Completed));
+            Assert.True(viewModel.FilterModel.StatusFilters.Contains(ApprenticeshipStatus.Completed));
         }
 
         [Test, MoqAutoData]

diff --git a/...AS.EmployerCommitmentsV2.Web.UnitTests/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests.csproj b/...AS.EmployerCommitmentsV2.Web.UnitTests/SFA.DAS.EmployerCommitmentsV2.Web.UnitTests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Moq" Version="4.10.1" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
-    <PackageReference Include="SFA.DAS.CommitmentsV2.Types" Version="4.1.1364" />
+    <PackageReference Include="SFA.DAS.CommitmentsV2.Types" Version="4.1.1395" />
     <PackageReference Include="SFA.DAS.Testing" Version="3.0.22" />
     <PackageReference Include="SFA.DAS.Testing.AutoFixture" Version="3.0.121" />
   </ItemGroup>

diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/Mappers/Apprentice/IndexViewModelMapper.cs b/src/SFA.DAS.EmployerCommitmentsV2.Web/Mappers/Apprentice/IndexViewModelMapper.cs
@@ -48,7 +48,8 @@ public async Task<IndexViewModel> Map(IndexRequest source)
                 ApprenticeshipStatus.WaitingToStart, 
                 ApprenticeshipStatus.Live,
                 ApprenticeshipStatus.Paused, 
-                ApprenticeshipStatus.Stopped
+                ApprenticeshipStatus.Stopped,
+                ApprenticeshipStatus.Completed
             };
 
             var filterModel = new ApprenticesFilterModel

diff --git a/src/SFA.DAS.EmployerCommitmentsV2.Web/SFA.DAS.EmployerCommitmentsV2.Web.csproj b/src/SFA.DAS.EmployerCommitmentsV2.Web/SFA.DAS.EmployerCommitmentsV2.Web.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="NLog.Schema" Version="4.5.11" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.8.0" />
     <PackageReference Include="SFA.DAS.Authorization.Mvc" Version="6.0.59" />
-    <PackageReference Include="SFA.DAS.CommitmentsV2.Api.Client" Version="4.1.1364" />
-    <PackageReference Include="SFA.DAS.CommitmentsV2.Shared" Version="4.1.1364" />
+    <PackageReference Include="SFA.DAS.CommitmentsV2.Api.Client" Version="4.1.1395" />
+    <PackageReference Include="SFA.DAS.CommitmentsV2.Shared" Version="4.1.1395" />
     <PackageReference Include="SFA.DAS.Employer.Shared.UI" Version="2.0.10" />
     <PackageReference Include="SFA.DAS.Configuration.AzureTableStorage" Version="3.0.77" />
     <PackageReference Include="SFA.DAS.EmployerUrlHelper" Version="3.0.22" />

diff --git a/src/SFA.DAS.EmployerCommitmentsV2/SFA.DAS.EmployerCommitmentsV2.csproj b/src/SFA.DAS.EmployerCommitmentsV2/SFA.DAS.EmployerCommitmentsV2.csproj
@@ -12,9 +12,9 @@
     <PackageReference Include="SFA.DAS.Authorization.CommitmentPermissions" Version="6.0.59" />
     <PackageReference Include="SFA.DAS.Authorization.EmployerFeatures" Version="6.0.59" />
     <PackageReference Include="SFA.DAS.Authorization.EmployerUserRoles" Version="6.0.59" />
-    <PackageReference Include="SFA.DAS.CommitmentsV2.Api.Client" Version="4.1.1364" />
-    <PackageReference Include="SFA.DAS.CommitmentsV2.Shared" Version="4.1.1364" />
-    <PackageReference Include="SFA.DAS.CommitmentsV2.Types" Version="4.1.1364" />
+    <PackageReference Include="SFA.DAS.CommitmentsV2.Api.Client" Version="4.1.1395" />
+    <PackageReference Include="SFA.DAS.CommitmentsV2.Shared" Version="4.1.1395" />
+    <PackageReference Include="SFA.DAS.CommitmentsV2.Types" Version="4.1.1395" />
     <PackageReference Include="SFA.DAS.EmployerAccounts.Api.Client" Version="1.6.2086" />
     <PackageReference Include="SFA.DAS.EmployerUrlHelper" Version="3.0.22" />
     <PackageReference Include="SFA.DAS.Encoding" Version="1.1.61" />