pull from upstream

Author: Neubert, Sebastian

.travis.yml

@@ -5,12 +5,21 @@ php:
   - 5.4
   - 5.5
 
+env:
+ - CODECEPT_VERSION="1"
+ - CODECEPT_VERSION="2"
+
+matrix:
+  exclude:
+    - php: 5.3
+      env: CODECEPT_VERSION="2"
+
 before_script:
   - printf "\n" | pecl install imagick
   - wget http://selenium.googlecode.com/files/selenium-server-standalone-2.35.0.jar
   - java -jar selenium-server-standalone-2.35.0.jar -port 4444 >/dev/null 2>&1 &
   - cd test/integration/
   - mkdir tests/_log
-  - php codecept.phar build
+  - php codecept${CODECEPT_VERSION}.phar build
 
-script: php codecept.phar run -d
+script: php codecept${CODECEPT_VERSION}.phar run -d

module/VisualCeption.php

@@ -183,6 +183,11 @@ private function getCoordinates ($elementId)
     private function getScreenshotName ($identifier)
     {
         $caseName = str_replace('Cept.php', '', $this->test->getFileName());
+
+        $search = array('/', '\\');
+        $replace = array('.', '.');
+        $caseName = str_replace($search, $replace, $caseName);
+
         return $caseName . '.' . $identifier . '.png';
     }
 
@@ -324,6 +329,8 @@ private function compare ($identifier)
      */
     private function compareImages ($image1, $image2)
     {
+        $this->debug("Trying to compare $image1 with $image2");
+
         $imagick1 = new \Imagick($image1);
         $imagick2 = new \Imagick($image2);
 

test/integration/codecept.phar renamed to test/integration/codecept1.phar

@@ -0,0 +1,11 @@
+<?php
+
+$I = new WebGuy($scenario);
+
+$I->amOnPage("/VisualCeption/seeVisualChanges.php");
+$I->seeVisualChanges("SimpleBlock", "#theblock");
+
+// the test has to be called twice for comparison on the travis server
+$I->wait(2);
+$I->amOnPage("/VisualCeption/seeVisualChanges.php");
+$I->seeVisualChanges("SimpleBlock", "#theblock");

test/integration/codecept2.phar

@@ -11,6 +11,8 @@ public function seeVisualChanges (WebGuy $I, $scenario)
         $I->amOnPage("/VisualCeption/seeVisualChanges.php");
         $I->seeVisualChanges("block", "#theblock");
 
+        $I->wait(1);
+
         // the test has to be called twice for comparison on the travis server
         $I->amOnPage("/VisualCeption/seeVisualChanges.php");
         $I->seeVisualChanges("block", "#theblock");
@@ -19,11 +21,23 @@ public function seeVisualChanges (WebGuy $I, $scenario)
     public function dontSeeVisualChanges (WebGuy $I, $scenario)
     {
         $I->amOnPage("/VisualCeption/dontSeeVisualChanges.php");
-        $I->dontSeeVisualChanges("block", "#theblock");
+        $I->dontSeeVisualChanges("block2", "#theblock");
+
+        $I->wait(1);
 
         // the test has to be called twice for comparison on the travis server
         $I->amOnPage("/VisualCeption/dontSeeVisualChanges.php");
-        $I->dontSeeVisualChanges("block", "#theblock");
+        $I->dontSeeVisualChanges("block2", "#theblock");
+    }
+
+    public function seeVisualChangesAndHideElement (WebGuy $I, $scenario)
+    {
+        $I->amOnPage("/VisualCeption/seeVisualChanges.php");
+        $I->seeVisualChanges("body", "body", "#intro");
+
+        // the test has to be called twice for comparison on the travis server
+        $I->amOnPage("/VisualCeption/seeVisualChanges.php");
+        $I->dontSeeVisualChanges("body", "body", array("#intro"));
     }
 
     public function dontSeeVisualChangesAndHideElement (WebGuy $I, $scenario)
@@ -33,7 +47,6 @@ public function dontSeeVisualChangesAndHideElement (WebGuy $I, $scenario)
 
         // the test has to be called twice for comparison on the travis server
         $I->amOnPage("/VisualCeption/seeVisualChanges.php");
-        $I->dontSeeVisualChanges("body", "body", "#theblock");
+        $I->dontSeeVisualChanges("body", "body", array("#theblock"));
     }
-
 }