Merge branch 'hotfix/fix-tests-dependencies' of https://github.com/Ma…

…ks3w/zf2
zendframework · Jul 23, 2012 · 8ee5274 · 8ee5274
10 parents 72c713c + 8ab0513 + 91eef93 + fce24bf + c98293e + ec0fa7a + 2480ecd + 6cbdeb6 + 0199841 + 19c47e8
commit 8ee5274
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/src/ReCaptcha.php b/src/ReCaptcha.php
@@ -38,7 +38,7 @@ class ReCaptcha extends AbstractAdapter
     /**
      * Recaptcha service object
      *
-     * @var Zend_Service_Recaptcha
+     * @var ReCaptchaService
      */
     protected $service;
 

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -149,6 +149,10 @@ public function testCanCreateImageCaptchaUsingShortName()
 
     public function testCanCreateReCaptcha()
     {
+        if (!constant('TESTS_ZEND_CAPTCHA_RECAPTCHA_SUPPORT')) {
+            $this->markTestSkipped('Enable TESTS_ZEND_CAPTCHA_RECAPTCHA_SUPPORT to test PDF render');
+        }
+
         $captcha = Captcha\Factory::factory(array(
             'class' => 'Zend\Captcha\ReCaptcha',
             'options' => array(
@@ -160,6 +164,10 @@ public function testCanCreateReCaptcha()
 
     public function testCanCreateReCaptchaUsingShortName()
     {
+        if (!constant('TESTS_ZEND_CAPTCHA_RECAPTCHA_SUPPORT')) {
+            $this->markTestSkipped('Enable TESTS_ZEND_CAPTCHA_RECAPTCHA_SUPPORT to test PDF render');
+        }
+
         $captcha = Captcha\Factory::factory(array(
             'class' => 'recaptcha',
             'options' => array(

diff --git a/test/ImageTest.php b/test/ImageTest.php
@@ -55,7 +55,7 @@ public function setUp()
         $this->captcha = new ImageCaptcha(array(
             'sessionClass' => 'ZendTest\Captcha\TestAsset\SessionContainer',
             'imgDir'       => $this->testDir,
-            'font'         => __DIR__. '/../Pdf/_fonts/Vera.ttf',
+            'font'         => __DIR__. '/_files/Vera.ttf',
         ));
     }
 

diff --git a/test/ReCaptchaTest.php b/test/ReCaptchaTest.php
@@ -29,6 +29,10 @@ class ReCaptchaTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+        if (!constant('TESTS_ZEND_CAPTCHA_RECAPTCHA_SUPPORT')) {
+            $this->markTestSkipped('Enable TESTS_ZEND_CAPTCHA_RECAPTCHA_SUPPORT to test PDF render');
+        }
+
         if (isset($this->word)) {
             unset($this->word);
         }

diff --git a/test/_files/Vera.ttf b/test/_files/Vera.ttf