summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-11-22 16:41:29 +0100
committerMorris Jobke <hey@morrisjobke.de>2014-11-22 16:41:29 +0100
commitfe463931157a7897a5fc57e530690fc2fbaf945a (patch)
tree134c1247731b3be76bd31e8ebe29875270fce3ae
parent2cc3edb10d0a37dce9954f1a402c9c31c7c3dab9 (diff)
parent5f6f54e785a76b27ff8c3514a45c34d633f4cc65 (diff)
downloadnextcloud-server-fe463931157a7897a5fc57e530690fc2fbaf945a.tar.gz
nextcloud-server-fe463931157a7897a5fc57e530690fc2fbaf945a.zip
Merge pull request #12348 from owncloud/rename-to-avoid-complaining-ci
Rename providers to not begin with test
-rw-r--r--tests/lib/httphelper.php4
-rw-r--r--tests/lib/updater.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/lib/httphelper.php b/tests/lib/httphelper.php
index 34dee35fe02..eb58508f158 100644
--- a/tests/lib/httphelper.php
+++ b/tests/lib/httphelper.php
@@ -24,7 +24,7 @@ class TestHTTPHelper extends \Test\TestCase {
->getMock();
}
- public function testIsHTTPProvider() {
+ public function isHttpTestData() {
return array(
array('http://wwww.owncloud.org/enterprise/', true),
array('https://wwww.owncloud.org/enterprise/', true),
@@ -81,7 +81,7 @@ class TestHTTPHelper extends \Test\TestCase {
}
/**
- * @dataProvider testIsHTTPProvider
+ * @dataProvider isHttpTestData
*/
public function testIsHTTP($url, $expected) {
$this->assertSame($expected, $this->httpHelperMock->isHTTPURL($url));
diff --git a/tests/lib/updater.php b/tests/lib/updater.php
index cc82450cfb6..155dccf78a7 100644
--- a/tests/lib/updater.php
+++ b/tests/lib/updater.php
@@ -10,7 +10,7 @@ namespace OC;
class UpdaterTest extends \Test\TestCase {
- public function testVersionCompatbility() {
+ public function versionCompatibilityTestData() {
return array(
array('1.0.0.0', '2.2.0', true),
array('1.1.1.1', '2.0.0', true),
@@ -24,7 +24,7 @@ class UpdaterTest extends \Test\TestCase {
}
/**
- * @dataProvider testVersionCompatbility
+ * @dataProvider versionCompatibilityTestData
*/
function testIsUpgradePossible($oldVersion, $newVersion, $result) {
$updater = new Updater();