Merge remote-tracking branch 'mainline/2.1-develop' into 2.1-develop

zakdma · zakdma · commit 0cbdd0ff3d93 · 2021-02-05T09:33:57.000+02:00
diff --git a/AdobeStockImageAdminUi/Test/Unit/Controller/Adminhtml/Preview/DownloadTest.php b/AdobeStockImageAdminUi/Test/Unit/Controller/Adminhtml/Preview/DownloadTest.php
@@ -102,7 +102,7 @@ protected function setUp(): void
                     'isAjax' => 'true',
                     'media_id' => 283415387,
                     'destination_path' => '',
-                    'form_key' => 'PyXOATf2fL9Y8iZf'
+                    'form_key' => 'PyXOATf2fL9Y8iZf',
                 ]
             );
         $this->getAssetById->expects($this->once())

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ protected function setUp(): void`
`102`	`102`	`'isAjax' => 'true',`
`103`	`103`	`'media_id' => 283415387,`
`104`	`104`	`'destination_path' => '',`
`105`		`- 'form_key' => 'PyXOATf2fL9Y8iZf'`
	`105`	`+ 'form_key' => 'PyXOATf2fL9Y8iZf',`
`106`	`106`	`]`
`107`	`107`	`);`
`108`	`108`	`$this->getAssetById->expects($this->once())`