|
@@ -218,13 +218,8 @@ class ONURESTControllerTest extends WebTestCaseBase
|
|
|
$fakeWebService = $this->getClient()->getContainer()->get('webservice');
|
|
|
$original->setWebservice($fakeWebService);
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
$this->getClient()->request('PATCH',
|
|
|
$this->getUriPutDelete() . "apply/" . $json["id"] . "/administrative_state/active_to_suspend.json", array());
|
|
|
-=======
|
|
|
- $this->getClient()->request('PATCH',
|
|
|
- $this->getUriPutDelete(). $json["id"] . "/apply/administrative_state/active_to_suspend.json" , array());
|
|
|
->>>>>>> 93e431315232d332c1adec1d3e931197c4fbd2b5
|
|
|
$response = $this->getClient()->getResponse();
|
|
|
|
|
|
$json = json_decode($response->getContent(), true);
|
|
@@ -269,23 +264,6 @@ class ONURESTControllerTest extends WebTestCaseBase
|
|
|
$this->assertEquals(200, $response->getStatusCode(), "Error en la respuesta http.");
|
|
|
$this->assertJson($response->getContent(), "No se obtuvo un objeto json.");
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
-
|
|
|
- /**
|
|
|
- * Sobreescribe el device.device_listener
|
|
|
- */
|
|
|
- private function setListener()
|
|
|
- {
|
|
|
- $webservicemock = $this->getContainerObject('webService');
|
|
|
- $listener = $this->getContainerObject('device.device_listener');
|
|
|
- $listener->setWebservice($webservicemock);
|
|
|
- $this->setContainerObject('device.device_listener', $listener);
|
|
|
- $validator = $this->getContainerObject('device.device_validator');
|
|
|
- $validator->setWebservice($webservicemock);
|
|
|
- $this->setContainerObject('device.device_validator', $validator);
|
|
|
- }
|
|
|
-
|
|
|
|
|
|
/**
|
|
|
* Realiza el alta.
|
|
@@ -357,5 +335,4 @@ class ONURESTControllerTest extends WebTestCaseBase
|
|
|
$this->assertJson($response->getContent(), "No se obtuvo un objeto json.");
|
|
|
}
|
|
|
|
|
|
->>>>>>> 93e431315232d332c1adec1d3e931197c4fbd2b5
|
|
|
}
|