diff --git a/lib/API/JSON/v1/Subscribers.php b/lib/API/JSON/v1/Subscribers.php index a4fee7355f..8299293b52 100644 --- a/lib/API/JSON/v1/Subscribers.php +++ b/lib/API/JSON/v1/Subscribers.php @@ -170,7 +170,7 @@ class Subscribers extends APIEndpoint { } return $this->successResponse( - Subscriber::findOne($subscriber->id)->asArray(), + array(), $meta ); } diff --git a/tests/unit/API/JSON/v1/SubscribersTest.php b/tests/unit/API/JSON/v1/SubscribersTest.php index 8143eb91f1..2eb835fefa 100644 --- a/tests/unit/API/JSON/v1/SubscribersTest.php +++ b/tests/unit/API/JSON/v1/SubscribersTest.php @@ -492,7 +492,7 @@ class SubscribersTest extends \MailPoetTest { )); expect($response->status)->equals(APIResponse::STATUS_OK); - $subscriber = Subscriber::findOne($response->data['id']); + $subscriber = Subscriber::where('email', 'toto@mailpoet.com')->findOne(); $subscriber_segments = $subscriber->segments()->findArray(); expect($subscriber_segments)->count(2); expect($subscriber_segments[0]['id'])->equals($form['settings']['segments'][0]); @@ -517,25 +517,6 @@ class SubscribersTest extends \MailPoetTest { expect($response->errors[0]['message'])->equals('Please select a list.'); } - function testItCanFilterOutNonFormFieldsWhenSubscribing() { - $router = new Subscribers(); - $response = $router->subscribe(array( - $this->obfuscatedEmail => 'toto@mailpoet.com', - 'form_id' => $this->form->id, - $this->obfuscatedSegments => array($this->segment_1->id, $this->segment_2->id), - // exists in table and in the form - 'first_name' => 'aaa', - // exists in table, but not in the form - 'last_name' => 'bbb', - // doesn't exist - 'bogus' => 'hahaha' - )); - expect($response->status)->equals(APIResponse::STATUS_OK); - expect($response->data['first_name'])->equals('aaa'); - expect($response->data['last_name'])->isEmpty(); - expect(isset($response->data['bogus']))->false(); - } - function testItCannotMassSubscribe() { $_SERVER['REMOTE_ADDR'] = '127.0.0.1'; @@ -569,7 +550,7 @@ class SubscribersTest extends \MailPoetTest { )); // Try to resubscribe an existing subscriber that was updated just now - $subscriber = Subscriber::findOne($response->data['id']); + $subscriber = Subscriber::where('email', 'toto@mailpoet.com')->findOne(); $subscriber->created_at = Carbon::yesterday(); $subscriber->updated_at = Carbon::now(); $subscriber->save();