removed zrazy characters and updated screenshot naming path

Author: khalidumarr

src/Classes/Feature.php

@@ -108,7 +108,7 @@ public function getScreenshotFolder()
      */
     public function setScreenshotFolder($featureName)
     {
-        $this->screenshotFolder = str_replace(' ','', $featureName);
+        $this->screenshotFolder = $featureName;
     }
 
     /**

src/Classes/Scenario.php

@@ -54,7 +54,7 @@ public function getScreenshotName()
 
     public function setScreenshotName($scenarioName)
     {
-        $this->screenshotName = str_replace(' ','', $scenarioName) . '.png';
+        $this->screenshotName = str_replace(' ','', $scenarioName);
     }
 
     /**

src/Formatter/BehatFormatter.php

@@ -588,7 +588,7 @@ public function onBeforeFeatureTested(BeforeFeatureTested $event)
         $feature->setDescription($event->getFeature()->getDescription());
         $feature->setTags($event->getFeature()->getTags());
         $feature->setFile($event->getFeature()->getFile());
-        $feature->setScreenshotFolder($event->getSuite()->getName().'/'.$event->getFeature()->getTitle());
+        $feature->setScreenshotFolder(strtolower(preg_replace('/[^a-z]/i','',$event->getSuite()->getName()).'/'.preg_replace('/[^a-z]/i','',$event->getFeature()->getTitle())));
         $this->currentFeature = $feature;
 
         $print = $this->renderer->renderBeforeFeature($this);
@@ -744,17 +744,17 @@ public function onAfterStepTested(AfterStepTested $event)
                     }
                 }
             }
+        }    
+
+
+        $stepName = strtolower(preg_replace('/[^a-z]/i','',$event->getStep()->getText()));        
+        $relativeScreenshotPath = 'screenshots/' . $this->getCurrentFeature()->getScreenshotFolder() . '/' . strtolower($this->getCurrentScenario()->getScreenshotName()) . '/' . $stepName . '.png';        
+        $fullScreenshotPath = $this->getOutputPrinter()->getOutputPath() . '/' . $relativeScreenshotPath;
+        
+        if (file_exists($fullScreenshotPath)) {
+            $step->setScreenshot($relativeScreenshotPath);
         }
-        if(($step->getResultCode() == "99") || ($step->getResult()->isPassed() && $step->getKeyword() === "Then")){
-            $scenarioLine = empty($this->currentExampleLines) ? $this->currentScenario->getLine() : $this->currentExampleLines[$this->currentExampleCount++];
-            $screenshot = $event->getSuite()->getName().".".basename($event->getFeature()->getFile()).".$scenarioLine.".$event->getStep()->getLine().".png";
-            $screenshot = str_replace('.feature', '', $screenshot);
-
-            if (file_exists(getcwd().DIRECTORY_SEPARATOR.".tmp_behatFormatter".DIRECTORY_SEPARATOR.$screenshot)){
-                $screenshot = 'assets'.DIRECTORY_SEPARATOR.'screenshots'.DIRECTORY_SEPARATOR.$screenshot;
-                $step->setScreenshot($screenshot);
-            }
-        }
+
         $this->currentScenario->addStep($step);
 
         $print = $this->renderer->renderAfterStep($this);