Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Merge pull request #1352 from mailpoet/less-info

Browse Source 
Returning only the id and email on form's response [MAILPOET-1370]
This commit is contained in:
Michelle Shull
2018-05-17 06:59:10 -04:00
committed by GitHub
parent 952c0f5aa7 3c499d0626
commit 4da7ed44e5
2 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/API/JSON/v1/Subscribers.php
View File

@ -170,7 +170,7 @@ class Subscribers extends APIEndpoint {
}
return $this->successResponse(
Subscriber::findOne($subscriber->id)->asArray(),
array(),
$meta
);
}

23
tests/unit/API/JSON/v1/SubscribersTest.php
View File

@ -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();