Merge pull request #32 from ischenko/master

Do not display "examples index" when examples are not set

Author: sergeyklay

src/Codeception/Specify.php

@@ -28,22 +28,28 @@ private function specifyInit()
     }
 
 	function specify($specification, \Closure $callable = null, $params = [])
-	{
+    {
         if (!$callable) return;
         $this->specifyInit();
 
         $test = $callable->bindTo($this);
-        $name = $this->getName();
-        $this->setName($this->getName().' | '.$specification);
+        $oldName = $this->getName();
+        $newName = $oldName . ' | ' . $specification;
+
+        $this->setName($newName);
 
         $properties = get_object_vars($this);
 
         // prepare for execution
         $throws = $this->getSpecifyExpectedException($params);
         $examples = $this->getSpecifyExamples($params);
+        $showExamplesIndex = $examples !== [[]];
 
         foreach ($examples as $idx => $example) {
-            $this->setName($name.' | '.$specification .' | examples index '. $idx);
+            if ($showExamplesIndex) {
+                $this->setName($newName . ' | examples index ' . $idx);
+            }
+
             // copy current object properties
             $this->specifyCloneProperties($properties);
 
@@ -67,8 +73,8 @@ function specify($specification, \Closure $callable = null, $params = [])
         }
 
         // restore test name
-        $this->setName($name);
-	}
+        $this->setName($oldName);
+    }
 
     /**
      * @param $params

tests/SpecifyTest.php

@@ -233,6 +233,52 @@ function testPropertyRestore()
         $this->assertEquals(['hello', 'world'], $this->testOne->prop);
     }
 
+    public function testExamplesIndexInName()
+    {
+        $name = $this->getName();
+
+        $this->specify('it appends index of an example to a test case name', function ($idx, $example) use ($name) {
+            $name .= ' | it appends index of an example to a test case name';
+            $this->assertEquals($name . ' | examples index ' . $idx, $this->getName());
+
+            $this->specify('nested specification without examples', function () use ($idx, $name) {
+                $name .= ' | examples index ' . $idx;
+                $name .= ' | nested specification without examples';
+                $this->assertEquals($name, $this->getName());
+            });
+
+            $this->specify('nested specification with examples', function () use ($idx, $name) {
+                $name .= ' | examples index ' . $idx;
+                $name .= ' | nested specification with examples';
+                $name .= ' | examples index 0';
+                $this->assertEquals($name, $this->getName());
+            }, ['examples' => [
+                [$example]
+            ]]);
+        }, ['examples' => [
+            [0, ''],
+            [1, '0'],
+            [2, null],
+            [3, 'bye'],
+            [4, 'world'],
+        ]]);
+
+        $this->specify('it does not append index to a test case name if there are no examples', function () use ($name) {
+            $name .= ' | it does not append index to a test case name if there are no examples';
+            $this->assertEquals($name, $this->getName());
+
+            $this->specify('nested specification without examples', function () use ($name) {
+                $this->assertEquals($name . ' | nested specification without examples', $this->getName());
+            });
+
+            $this->specify('nested specification with examples', function () use ($name) {
+                $this->assertEquals($name . ' | nested specification with examples | examples index 0', $this->getName());
+            }, ['examples' => [
+                [null]
+            ]]);
+        });
+    }
+
 //    public function testFail()
 //    {
 //        $this->specify('this will fail', function(){