+ Added auto parameter to expectation, that reads automatically dataProvider name

585b8938 · Ivan Chepurnyi · 3852c97c · 585b8938
Commit 585b8938 authored Jan 13, 2013 by Ivan Chepurnyi
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

app/code/community/EcomDev/PHPUnit/Test/Case.php app/code/community/EcomDev/PHPUnit/Test/Case.php +3 -3

No files found.
--- a/app/code/community/EcomDev/PHPUnit/Test/Case.php
+++ b/app/code/community/EcomDev/PHPUnit/Test/Case.php
@@ -354,10 +354,10 @@ abstract class EcomDev_PHPUnit_Test_Case extends PHPUnit_Framework_TestCase
     */
    protected function expected($firstArgument = null)
    {
-        if (!is_array($firstArgument)) {
-            $arguments = func_get_args();
-        } elseif ($firstArgument === 'auto' && $this->readAttribute($this, 'dataName')) {
+        if ($firstArgument === 'auto' && $this->readAttribute($this, 'dataName')) {
            $arguments = $this->readAttribute($this, 'dataName');
+        } elseif (!is_array($firstArgument)) {
+            $arguments = func_get_args();
        } else {
            $arguments = $firstArgument;
        }