From 3c499d062635640c3ee345ae36ca26f4a92e4378 Mon Sep 17 00:00:00 2001
From: Amine Ben hammou <amine@mailpoet.com>
Date: Fri, 11 May 2018 17:46:04 +0100
Subject: [PATCH] retuning empty response on subscribe

---
 lib/API/JSON/v1/Subscribers.php            |  2 +-
 tests/unit/API/JSON/v1/SubscribersTest.php | 23 ++--------------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/lib/API/JSON/v1/Subscribers.php b/lib/API/JSON/v1/Subscribers.php
index 70cc04ae7f..342ceaf118 100644
--- a/lib/API/JSON/v1/Subscribers.php
+++ b/lib/API/JSON/v1/Subscribers.php
@@ -169,7 +169,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 a4e2d334f3..054eb50096 100644
--- a/tests/unit/API/JSON/v1/SubscribersTest.php
+++ b/tests/unit/API/JSON/v1/SubscribersTest.php
@@ -488,7 +488,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]);
@@ -513,25 +513,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';
 
@@ -565,7 +546,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();