Merge pull request #34 from buresmi7/fixFileNameFormat

Fix file name format

Author: RayRom

.gitignore

@@ -1,3 +1,4 @@
 .buildpath
 .project
 .settings/
+/vendor

.travis.yml

@@ -11,4 +11,6 @@ before_script:
   - composer install
   - php vendor/bin/codecept build -c test/integration/
 
-script: php vendor/bin/codecept run -c test/integration/
+script:
+  - php vendor/bin/codecept run -c test/integration/
+  - vendor/bin/phpunit test/unit/

composer.json

@@ -8,7 +8,8 @@
     "ext-imagick": "*"
   },
   "require-dev": {
-    "codeception/codeception": "^2.2.0"
+    "codeception/codeception": "^2.2.0",
+    "phpunit/phpunit": "^5.7.0"
   },
   "autoload": {
     "classmap": ["module/"]

module/Utils.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Codeception\Module\VisualCeption;
+
+class Utils
+{
+    public function getTestFileName($signature, $identifier)
+    {
+        return str_replace([':', '\\'],  '.', $signature) . '.' . $identifier . '.png';
+    }
+}

module/VisualCeption.php

@@ -4,6 +4,7 @@
 use Codeception\Module as CodeceptionModule;
 use Codeception\Test\Descriptor;
 use RemoteWebDriver;
+use Codeception\Module\VisualCeption\Utils;
 
 /**
  * Class VisualCeption
@@ -50,13 +51,20 @@ class VisualCeption extends CodeceptionModule
      */
     private $webDriverModule = null;
 
+    /**
+     * @var Utils
+     */
+    private $utils;
+
     private $failed = array();
     private $logFile;
     private $templateVars = array();
     private $templateFile;
 
     public function _initialize()
     {
+        $this->utils = new Utils();
+
         $this->maximumDeviation = $this->config["maximumDeviation"];
         $this->saveCurrentImageIfFailure = (boolean)$this->config["saveCurrentImageIfFailure"];
         $this->referenceImageDir = (file_exists($this->config["referenceImageDir"]) ? "" : codecept_data_dir()) . $this->config["referenceImageDir"];
@@ -312,7 +320,7 @@ private function getCoordinates($elementId)
     private function getScreenshotName($identifier)
     {
         $signature = $this->test->getSignature();
-        return str_replace(':',  '_', $signature). '.' . $identifier . '.png';
+        return $this->utils->getTestFileName($signature, $identifier);
     }
 
     /**

test/unit/UtilsTest.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Codeception\Module\VisualCeption\Test\Unit;
+
+use PHPUnit\Framework\TestCase;
+use Codeception\Module\VisualCeption\Utils;
+
+class UtilsTest extends TestCase
+{
+    public function testGetTestFileName()
+    {
+        $utils = new Utils();
+        $this->assertEquals('Acceptance.Work.Test.test.screenshot.png', $utils->getTestFileName('Acceptance\Work\Test:test', 'screenshot'));
+        $this->assertEquals('Test.test.screenshot.png', $utils->getTestFileName('Test:test', 'screenshot'));
+    }
+}