Simplify JSON response from File Upload Wizard's upload endpoint

because there's no reasons to wrap the list of upload files in a label/envelope, and because it's easier to mock in our fake api server we use for javascript tests without an envelope.
rija · Sep 15, 2020 · ef2ebd1 · ef2ebd1
1 parent 2c30435
commit ef2ebd1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/fuw/app/frontend/controllers/UploadController.php b/fuw/app/frontend/controllers/UploadController.php
@@ -16,10 +16,6 @@
 class UploadController extends ActiveController
 {
     public $modelClass = 'common\models\Upload';
-    public $serializer = [
-        'class' => 'yii\rest\Serializer',
-        'collectionEnvelope' => 'uploads',
-    ];
 
     /**
      * @inheritdoc

diff --git a/fuw/app/frontend/tests/functional/UploadCest.php b/fuw/app/frontend/tests/functional/UploadCest.php
@@ -46,8 +46,8 @@ public function getUpload(FunctionalTester $I)
         $I->seeResponseIsJson();
         $I->seeResponseContainsJson(array('doi' => "$doi"));
         $I->dontSeeResponseContainsJson(array('doi' => "010020"));
-        $I->seeResponseJsonMatchesJsonPath('$.uploads[0].name');
-        $I->seeResponseJsonMatchesJsonPath('$.uploads[1].name');
-        $I->dontSeeResponseJsonMatchesJsonPath('$.uploads[2].name');
+        $I->seeResponseJsonMatchesJsonPath('$.[0].name');
+        $I->seeResponseJsonMatchesJsonPath('$.[1].name');
+        $I->dontSeeResponseJsonMatchesJsonPath('$.[2].name');
     }
 }