MAGETWO-87343: Uncaught fatal error in SOAP tests

Author: Stanislav Idolov

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -412,6 +411,7 @@ public function validOptionDataProvider()
      */
     public function testUpdateNegative($optionData, $message, $exceptionCode)
     {
+        $this->_markTestAsRestOnly();
         $productSku = 'simple';
         /** @var ProductRepository $productRepository */
         $productRepository = $this->objectManager->create(ProductRepository::class);
@@ -424,18 +424,9 @@ public function testUpdateNegative($optionData, $message, $exceptionCode)
                 'resourcePath' => '/V1/products/options/' . $optionId,
                 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
             ],
-            'soap' => [
-                'service' => self::SERVICE_NAME,
-                'serviceVersion' => 'V1',
-                'operation' => self::SERVICE_NAME . 'Save',
-            ],
         ];
 
-        if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
-            $this->setExpectedException('SoapFault');
-        } else {
-            $this->setExpectedException('Exception', $message, $exceptionCode);
-        }
+        $this->setExpectedException('Exception', $message, $exceptionCode);
         $this->_webApiCall($serviceInfo, ['option' => $optionData]);
     }
 

dev/tests/api-functional/testsuite/Magento/Integration/Model/IntegrationTest.php

@@ -13,7 +13,6 @@ class IntegrationTest extends \Magento\TestFramework\TestCase\WebapiAbstract
     /** @var  \Magento\Integration\Model\Integration */
     protected $integration;
 
-
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();

dev/tests/static/testsuite/Magento/Test/Legacy/CopyrightTest.php

@@ -17,7 +17,7 @@ public function testCopyright()
         $invoker(
             function ($filename) {
                 $fileText = file_get_contents($filename);
-                if (strpos($fileText, 'Copyright © 2013-' . date('Y')) === false) {
+                if (strpos($fileText, 'Copyright © Magento, Inc. All rights reserved.') === false) {
                     $this->fail('Copyright is missing or has wrong year in ' . $filename);
                 }
             },