update .env.example to include redis config

fix broken test
This commit is contained in:
2018-03-21 21:25:38 -04:00
parent 02be811168
commit 6446012411
3 changed files with 46 additions and 43 deletions

View File

@@ -13,5 +13,7 @@ DB_PASSWORD=jqbdui1bdb
CACHE_DRIVER=redis CACHE_DRIVER=redis
QUEUE_DRIVER=sync QUEUE_DRIVER=sync
REDIS_HOST=redis
REDIS_PORT=6379
IATACODE_API_KEY=8105c628-a86c-41af-85da-828bcf8190e0 IATACODE_API_KEY=8105c628-a86c-41af-85da-828bcf8190e0

View File

@@ -35,7 +35,7 @@ class FlightController extends Controller
public function listFlights(Request $request) public function listFlights(Request $request)
{ {
$flightCollection = Flights::all(); $flightCollection = Flights::all();
//add pagination //add pagination
$per_page = $request->input('per_page', 10); $per_page = $request->input('per_page', 10);
$per_page = (empty($per_page)) ? 10 : $per_page; $per_page = (empty($per_page)) ? 10 : $per_page;
@@ -46,13 +46,13 @@ class FlightController extends Controller
$per_page, $per_page,
$page $page
); );
$result = (new Collection($paginator, new FlightTransform(), 'trips')) $result = (new Collection($paginator, new FlightTransform(), 'trips'))
->setPaginator(new IlluminatePaginatorAdapter($paginator)); ->setPaginator(new IlluminatePaginatorAdapter($paginator));
return $this->JsonApiResponse($result, 200); return $this->JsonApiResponse($result, 200);
} }
/** /**
* @api {get} /flights/:id get flight * @api {get} /flights/:id get flight
* @apiName Get Flight * @apiName Get Flight
@@ -71,16 +71,16 @@ class FlightController extends Controller
public function getFlight(Request $request, $id) public function getFlight(Request $request, $id)
{ {
$flight = Flights::find($id); $flight = Flights::find($id);
if (! $flight) { if (! $flight) {
return $this->returnErrorMessage("flight id $id not found", 400); return $this->returnErrorMessage("flight id $id not found", 400);
} }
$result = new Item($flight, new FlightTransform(), 'flights'); $result = new Item($flight, new FlightTransform(), 'flights');
return $this->JsonApiResponse($result, 200); return $this->JsonApiResponse($result, 200);
} }
/** /**
* @api {delete} /flights/:id delete a flight * @api {delete} /flights/:id delete a flight
* @apiName Delete a Flight * @apiName Delete a Flight
@@ -101,6 +101,6 @@ class FlightController extends Controller
$deleted = $flight->delete(); $deleted = $flight->delete();
} }
return response()->json(['message' => "flight $id has been removed"], 200); return response()->json('', 204);
} }
} }

View File

@@ -4,7 +4,7 @@
class FlightsCest class FlightsCest
{ {
protected $uri = '/flights'; protected $uri = '/flights';
public function _before(AcceptanceTester $I) public function _before(AcceptanceTester $I)
{ {
} }
@@ -17,127 +17,128 @@ class FlightsCest
public function listFlightsReturnsJson(AcceptanceTester $I) public function listFlightsReturnsJson(AcceptanceTester $I)
{ {
$params = []; $params = [];
$I->sendGET($this->uri, $params); $I->sendGET($this->uri, $params);
$r = $I->grabResponse(); $r = $I->grabResponse();
$I->seeResponseCodeIs(200, $r); $I->seeResponseCodeIs(200, $r);
$I->seeResponseIsJson(); $I->seeResponseIsJson();
} }
public function listFlightsReturns1ItemWhenPerPageIs1(AcceptanceTester $I) public function listFlightsReturns1ItemWhenPerPageIs1(AcceptanceTester $I)
{ {
$params = [ $params = [
'page' => 1, 'page' => 1,
'per_page' => 1 'per_page' => 1
]; ];
$I->sendGET($this->uri, $params); $I->sendGET($this->uri, $params);
$r = $I->grabResponse(); $r = $I->grabResponse();
$I->seeResponseCodeIs(200, $r); $I->seeResponseCodeIs(200, $r);
$I->seeResponseIsJson(); $I->seeResponseIsJson();
$data = json_decode($r); $data = json_decode($r);
$I->assertCount(1, $data->data, json_encode($data)); $I->assertCount(1, $data->data, json_encode($data));
} }
public function listFlightsReturns2ItemWhenPerPageIs2(AcceptanceTester $I) public function listFlightsReturns2ItemWhenPerPageIs2(AcceptanceTester $I)
{ {
$params = [ $params = [
'page' => 1, 'page' => 1,
'per_page' => 2 'per_page' => 2
]; ];
$I->sendGET($this->uri, $params); $I->sendGET($this->uri, $params);
$r = $I->grabResponse(); $r = $I->grabResponse();
$I->seeResponseCodeIs(200, $r); $I->seeResponseCodeIs(200, $r);
$I->seeResponseIsJson(); $I->seeResponseIsJson();
$data = json_decode($r); $data = json_decode($r);
$I->assertCount(2, $data->data, json_encode($data)); $I->assertCount(2, $data->data, json_encode($data));
} }
public function listFlightsDoesNotReturn500WhenPerPageIsInvalid(AcceptanceTester $I) public function listFlightsDoesNotReturn500WhenPerPageIsInvalid(AcceptanceTester $I)
{ {
$params = [ $params = [
'page' => 1, 'page' => 1,
'per_page' => '' 'per_page' => ''
]; ];
$I->sendGET($this->uri, $params); $I->sendGET($this->uri, $params);
$r = $I->grabResponse(); $r = $I->grabResponse();
$I->seeResponseCodeIs(200, $r); $I->seeResponseCodeIs(200, $r);
$I->seeResponseIsJson(); $I->seeResponseIsJson();
} }
public function listFlightsReturns0ItemWhenPageIsBeyondEndOfCollection(AcceptanceTester $I) public function listFlightsReturns0ItemWhenPageIsBeyondEndOfCollection(AcceptanceTester $I)
{ {
$params = [ $params = [
'page' => 99999, 'page' => 99999,
'per_page' => 2 'per_page' => 2
]; ];
$I->sendGET($this->uri, $params); $I->sendGET($this->uri, $params);
$r = $I->grabResponse(); $r = $I->grabResponse();
$I->seeResponseCodeIs(200, $r); $I->seeResponseCodeIs(200, $r);
$I->seeResponseIsJson(); $I->seeResponseIsJson();
$data = json_decode($r); $data = json_decode($r);
$I->assertCount(0, $data->data, json_encode($data)); $I->assertCount(0, $data->data, json_encode($data));
} }
public function getFlightReturnsTripJson(AcceptanceTester $I) public function getFlightReturnsTripJson(AcceptanceTester $I)
{ {
$I->sendGET($this->uri, []); $I->sendGET($this->uri, []);
$r = $I->grabResponse(); $r = $I->grabResponse();
$data = json_decode($r, true); $data = json_decode($r, true);
$tripId = $data['data'][0]['id']; $tripId = $data['data'][0]['id'];
$params = []; $params = [];
$uri = $this->uri . '/' . $tripId; $uri = $this->uri . '/' . $tripId;
$I->sendGET($uri, $params); $I->sendGET($uri, $params);
$r = $I->grabResponse(); $r = $I->grabResponse();
$I->seeResponseCodeIs(200, $r); $I->seeResponseCodeIs(200, $r);
$I->seeResponseIsJson(); $I->seeResponseIsJson();
$data = json_decode($r, true); $data = json_decode($r, true);
$I->assertEquals('flights', $data['data']['type']); $I->assertEquals('flights', $data['data']['type']);
$I->assertEquals($tripId, $data['data']['id']); $I->assertEquals($tripId, $data['data']['id']);
} }
public function getFlightReturns400IfTripIdNotFound(AcceptanceTester $I) public function getFlightReturns400IfTripIdNotFound(AcceptanceTester $I)
{ {
$params = []; $params = [];
$uri = $this->uri . '/999999'; $uri = $this->uri . '/999999';
$I->sendGET($uri, $params); $I->sendGET($uri, $params);
$r = $I->grabResponse(); $r = $I->grabResponse();
$I->seeResponseCodeIs(400, $r); $I->seeResponseCodeIs(400, $r);
$I->seeResponseIsJson(); $I->seeResponseIsJson();
} }
public function removeFlightRemovesFlightFromTrips(AcceptanceTester $I) public function removeFlightRemovesFlightFromTrips(AcceptanceTester $I)
{ {
$tripId = $this->getFirstTripId($I); $tripId = $this->getFirstTripId($I);
$r = $this->addFlightToTrip($I, 'YUL', $tripId); $r = $this->addFlightToTrip($I, 'YUL', $tripId);
$data = json_decode($r, true); $data = json_decode($r, true);
$flightId = $data['data']['attributes']['flights'][0]['id']; $flightId = $data['data']['attributes']['flights'][0]['id'];
$uri = $this->uri .'/'.$flightId; $uri = $this->uri .'/'.$flightId;
$I->sendDELETE($uri); $I->sendDELETE($uri);
$I->seeResponseCodeIs(204); $I->seeResponseCodeIs(204);
$I->seeResponseEquals('');
} }
private function getFirstTripId(AcceptanceTester $I) private function getFirstTripId(AcceptanceTester $I)
{ {
$uri = '/trips/'; $uri = '/trips/';
@@ -147,11 +148,11 @@ class FlightsCest
$tripId = $data['data'][0]['id']; $tripId = $data['data'][0]['id'];
return $tripId; return $tripId;
} }
private function addFlightToTrip(AcceptanceTester $I, $destination, $tripId) private function addFlightToTrip(AcceptanceTester $I, $destination, $tripId)
{ {
$uri = '/trips/' . $tripId .'/flights'; $uri = '/trips/' . $tripId .'/flights';
$I->sendPost($uri, [ $I->sendPost($uri, [
'destination' => $destination 'destination' => $destination
]); ]);