summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/codeigniter/helpers/captcha_helper_test.php2
-rw-r--r--tests/codeigniter/helpers/cookie_helper_test.php4
-rw-r--r--tests/codeigniter/helpers/download_helper_test.php2
-rw-r--r--tests/codeigniter/libraries/Upload_test.php10
-rw-r--r--tests/phpunit.xml7
5 files changed, 13 insertions, 12 deletions
diff --git a/tests/codeigniter/helpers/captcha_helper_test.php b/tests/codeigniter/helpers/captcha_helper_test.php
index 4fbda2a88f..fc86305e3 100644
--- a/tests/codeigniter/helpers/captcha_helper_test.php
+++ b/tests/codeigniter/helpers/captcha_helper_test.php
@@ -4,7 +4,7 @@ class Captcha_helper_test extends CI_TestCase {
public function test_create_captcha()
{
- $this->markTestIncomplete();
+ $this->markTestSkipped('Cant easily test');
}
} \ No newline at end of file
diff --git a/tests/codeigniter/helpers/cookie_helper_test.php b/tests/codeigniter/helpers/cookie_helper_test.php
index 3c7c9fd2e..fba68f20f 100644
--- a/tests/codeigniter/helpers/cookie_helper_test.php
+++ b/tests/codeigniter/helpers/cookie_helper_test.php
@@ -19,7 +19,7 @@ class Cookie_helper_test extends CI_TestCase {
'foobar'
));*/
- $this->markTestIncomplete('Need to find a way to overcome a headers already set exception');
+ $this->markTestSkipped('Need to find a way to overcome a headers already set exception');
}
// ------------------------------------------------------------------------
@@ -53,7 +53,7 @@ class Cookie_helper_test extends CI_TestCase {
'my_cookie'
));*/
- $this->markTestIncomplete('Need to find a way to overcome a headers already set exception');
+ $this->markTestSkipped('Need to find a way to overcome a headers already set exception');
}
} \ No newline at end of file
diff --git a/tests/codeigniter/helpers/download_helper_test.php b/tests/codeigniter/helpers/download_helper_test.php
index b41a8532a..d2b42e46b 100644
--- a/tests/codeigniter/helpers/download_helper_test.php
+++ b/tests/codeigniter/helpers/download_helper_test.php
@@ -4,7 +4,7 @@ class Download_helper_test extends CI_TestCase {
public function test_force_download()
{
- $this->markTestIncomplete();
+ $this->markTestSkipped('Cant easily test');
}
} \ No newline at end of file
diff --git a/tests/codeigniter/libraries/Upload_test.php b/tests/codeigniter/libraries/Upload_test.php
index d79a3ffc9..b4ef7bbd1 100644
--- a/tests/codeigniter/libraries/Upload_test.php
+++ b/tests/codeigniter/libraries/Upload_test.php
@@ -18,9 +18,9 @@ class Upload_test extends CI_TestCase {
$this->_test_dir = vfsStreamWrapper::getRoot();
}
- function test_do_upload()
+ function test_do_upload()
{
- $this->markTestIncomplete('We can\'t really test this at the moment because of the call to `is_uploaded_file` in do_upload which isn\'t supported by vfsStream');
+ $this->markTestSkipped('We can\'t really test this at the moment because of the call to `is_uploaded_file` in do_upload which isn\'t supported by vfsStream');
}
function test_data()
@@ -75,7 +75,7 @@ class Upload_test extends CI_TestCase {
{
$this->upload->set_max_filesize(100);
$this->assertEquals(100, $this->upload->max_size);
- }
+ }
function test_set_max_filename()
{
@@ -87,7 +87,7 @@ class Upload_test extends CI_TestCase {
{
$this->upload->set_max_width(100);
$this->assertEquals(100, $this->upload->max_width);
- }
+ }
function test_set_max_height()
{
@@ -181,7 +181,7 @@ class Upload_test extends CI_TestCase {
$this->upload->file_type = 'image/gif';
$this->upload->file_temp = 'tests/mocks/uploads/ci_logo.gif';
- $this->upload->max_width = 10;
+ $this->upload->max_width = 10;
$this->assertFalse($this->upload->is_allowed_dimensions());
$this->upload->max_width = 170;
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 56cb8841c..96c3af9bb 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<phpunit
+<phpunit
bootstrap="./Bootstrap.php"
colors="true"
convertNoticesToExceptions="true"
@@ -16,10 +16,11 @@
<directory suffix="test.php">./codeigniter/libraries</directory>
</testsuite>
</testsuites>
- <filters>
+ <filter>
<blacklist>
<directory suffix=".php">PEAR_INSTALL_DIR</directory>
<directory suffix=".php">PHP_LIBDIR</directory>
+ <directory suffix=".php">../vendor</directory>
</blacklist>
- </filters>
+ </filter>
</phpunit> \ No newline at end of file