Merge pull request #175 from RomanSyroeshko/develop

Fix for tests #3.

Author: Roman Syroeshko

tests/PhpWord/Tests/PhpWordTest.php

@@ -147,7 +147,7 @@ public function testLoadTemplateException()
     {
         $templateFqfn = \join(
             \DIRECTORY_SEPARATOR,
-            array(\PHPWORD_TESTS_BASE_DIR, 'Tests', 'data', 'templates', 'blanks.docx')
+            array(\PHPWORD_TESTS_BASE_DIR, 'PhpWord', 'Tests', 'data', 'templates', 'blanks.docx')
         );
         $phpWord = new PhpWord();
         $phpWord->loadTemplate($templateFqfn);

tests/PhpWord/Tests/Reader/Word2007Test.php

@@ -21,7 +21,7 @@ public function testCanRead()
         $object = new Word2007();
         $fqFilename = join(
             DIRECTORY_SEPARATOR,
-            array(PHPWORD_TESTS_BASE_DIR, 'Tests', '_files', 'documents', 'reader.docx')
+            array(PHPWORD_TESTS_BASE_DIR, 'PhpWord', 'Tests', '_files', 'documents', 'reader.docx')
         );
         $this->assertTrue($object->canRead($fqFilename));
     }
@@ -34,7 +34,7 @@ public function testCanReadFailed()
         $object = new Word2007();
         $fqFilename = join(
             DIRECTORY_SEPARATOR,
-            array(PHPWORD_TESTS_BASE_DIR, 'Tests', '_files', 'documents', 'foo.docx')
+            array(PHPWORD_TESTS_BASE_DIR, 'PhpWord', 'Tests', '_files', 'documents', 'foo.docx')
         );
         $this->assertFalse($object->canRead($fqFilename));
         $object = IOFactory::load($fqFilename);
@@ -44,9 +44,9 @@ public function testLoad()
     {
         $fqFilename = join(
             DIRECTORY_SEPARATOR,
-            array(PHPWORD_TESTS_BASE_DIR, 'Tests', '_files', 'documents', 'reader.docx')
+            array(PHPWORD_TESTS_BASE_DIR, 'PhpWord', 'Tests', '_files', 'documents', 'reader.docx')
         );
         $object = IOFactory::load($fqFilename);
         $this->assertInstanceOf('PhpOffice\\PhpWord\\PhpWord', $object);
     }
-}
+}

tests/bootstrap.php

@@ -3,7 +3,7 @@
 
 // defining base dir for tests
 if (!defined('PHPWORD_TESTS_BASE_DIR')) {
-    define('PHPWORD_TESTS_BASE_DIR', realpath(__DIR__ . '/PhpWord'));
+    define('PHPWORD_TESTS_BASE_DIR', realpath(__DIR__ . '/..'));
 }
 
 $vendor = realpath(__DIR__ . '/../vendor');