MAGETWO-37951: Internal Server error on clicking Continue on Billing information

Ievgen Shakhsuvarov · Ievgen Shakhsuvarov · commit e9b49bc9fdb5 · 2015-05-29T13:46:19.000+03:00
- Builds fix
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/ServiceDataAttributesScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/ServiceDataAttributesScannerTest.php
@@ -15,14 +15,20 @@ class ServiceDataAttributesScannerTest extends \PHPUnit_Framework_TestCase
      */
     protected $model;
 
+    /**
+     * @var string
+     */
+    protected $testFile;
+
     protected function setUp()
     {
         $this->model = new ServiceDataAttributesScanner();
+        $this->testFile = str_replace('\\', '/', realpath(__DIR__ . '/../../') . '/_files/service_data_attributes.xml');
     }
 
     public function testCollectEntities()
     {
-        $files = [realpath('../../_files/service_data_attributes.xml')];
+        $files = [$this->testFile];
         $expectedResult = [
             'Magento\Sales\Api\Data\OrderExtensionInterface',
             'Magento\Sales\Api\Data\OrderExtension',
@@ -34,6 +40,6 @@ public function testCollectEntities()
             'Magento\Quote\Api\Data\TotalsAdditionalDataExtension'
         ];
 
-        $this->assertEquals($expectedResult, $this->model->collectEntities($files));
+        $this->assertSame($expectedResult, $this->model->collectEntities($files));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,20 @@ class ServiceDataAttributesScannerTest extends \PHPUnit_Framework_TestCase`
`15`	`15`	`*/`
`16`	`16`	`protected $model;`
`17`	`17`
	`18`	`+ /**`
	`19`	`+ * @var string`
	`20`	`+ */`
	`21`	`+ protected $testFile;`
	`22`	`+`
`18`	`23`	`protected function setUp()`
`19`	`24`	`{`
`20`	`25`	`$this->model = new ServiceDataAttributesScanner();`
	`26`	`+ $this->testFile = str_replace('\\', '/', realpath(__DIR__ . '/../../') . '/_files/service_data_attributes.xml');`
`21`	`27`	`}`
`22`	`28`
`23`	`29`	`public function testCollectEntities()`
`24`	`30`	`{`
`25`		`- $files = [realpath('../../_files/service_data_attributes.xml')];`
	`31`	`+ $files = [$this->testFile];`
`26`	`32`	`$expectedResult = [`
`27`	`33`	`'Magento\Sales\Api\Data\OrderExtensionInterface',`
`28`	`34`	`'Magento\Sales\Api\Data\OrderExtension',`
`@@ -34,6 +40,6 @@ public function testCollectEntities()`
`34`	`40`	`'Magento\Quote\Api\Data\TotalsAdditionalDataExtension'`
`35`	`41`	`];`
`36`	`42`
`37`		`- $this->assertEquals($expectedResult, $this->model->collectEntities($files));`
	`43`	`+ $this->assertSame($expectedResult, $this->model->collectEntities($files));`
`38`	`44`	`}`
`39`	`45`	`}`