[APB-1887][JR,RV] Resolving build failure after automatic merge (#68)

hmrc · Feb 8, 2018 · da9da0b · da9da0b
1 parent 6504f62
commit da9da0b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/it/uk/gov/hmrc/agentrelationships/controllers/RelationshipISpec.scala b/it/uk/gov/hmrc/agentrelationships/controllers/RelationshipISpec.scala
@@ -751,13 +751,13 @@ class RelationshipISpec extends UnitSpec
 
     //HAPPY PATHS WHEN RELATIONSHIP COPY ATTEMPT FAILS
 
-    "return 200 when relationship exists only in HMCE-VATDEC-ORG and relationship copy attempt fails because of etmp" ignore {
+    "return 200 when relationship exists only in HMCE-VATDEC-ORG and relationship copy attempt fails because of etmp" in {
       givenAgentCredentialsAreFoundFor(Arn(arn), "foo")
       givenAgentCodeIsFoundFor("foo", "bar")
       givenAgentIsNotAllocatedToClient(vrn)
       givenArnIsKnownFor(Arn(arn), Vrn(agentVrn))
       givenAgentIsAllocatedAndAssignedToClient(vrn, agentVrn)
-      givenAgentCanNotBeAllocatedInDes //TODO Implement new stub after APB-1987
+      givenAgentCanNotBeAllocatedInDes
       givenAgentCanBeAllocatedInGovernmentGateway(vrn, "bar")
       givenAuditConnector()
 

diff --git a/test/uk/gov/hmrc/agentclientrelationships/services/RelationshipsServiceSpec.scala b/test/uk/gov/hmrc/agentclientrelationships/services/RelationshipsServiceSpec.scala
@@ -669,13 +669,7 @@ class RelationshipsServiceSpec extends UnitSpec
   }
 
   private def relationshipWillBeCreated(identifier: TaxIdentifier): Unit = {
-    identifier match {
-      case mtdItId @ MtdItId(_) =>
-        when(des.createAgentRelationship(eqs(mtdItId), eqs(arn))(eqs(hc), eqs(ec))).thenReturn(Future successful RegistrationRelationshipResponse("processing date"))
-      case vrn @ Vrn(_) =>
-        when(des.createUpdateAgentRelationshipRosm(eqs(vrn), eqs(arn))(eqs(hc), eqs(ec))).thenReturn(Future successful RegistrationRelationshipResponse("processing date"))
-    }
-
+    when(des.createAgentRelationship(eqs(identifier), eqs(arn))(eqs(hc), eqs(ec))).thenReturn(Future successful RegistrationRelationshipResponse("processing date"))
     when(gg.allocateAgent(eqs(agentCode), eqs(identifier))(eqs(hc))).thenReturn(Future successful true)
   }
 
@@ -688,14 +682,13 @@ class RelationshipsServiceSpec extends UnitSpec
   }
 
   def verifyEtmpRecordCreatedForMtdVat(): Unit = {
-    verify(des).createUpdateAgentRelationshipRosm(eqs(vrn), eqs(arn))(eqs(hc), eqs(ec))
+    verify(des).createAgentRelationship(eqs(vrn), eqs(arn))(eqs(hc), eqs(ec))
   }
 
   def verifyEtmpRecordNotCreatedForMtdVat(): Unit = {
-    verify(des, never()).createUpdateAgentRelationshipRosm(eqs(vrn), eqs(arn))(eqs(hc), eqs(ec))
+    verify(des, never()).createAgentRelationship(eqs(vrn), eqs(arn))(eqs(hc), eqs(ec))
   }
 
-
   def verifyGgRecordCreated(): Unit = {
     verify(gg).allocateAgent(eqs(agentCode), eqs(mtdItId))(eqs(hc))
   }