YueMi-Development/cloudflare-php
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Anthony Sterling
2018-02-27 09:45:51 +00:00
parent 730b0c97ee dc53414c2a
commit 3585dde8ea
40 changed files with 640 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Configurations/ConfigurationsUARulesTest.php
View File

@@ -14,7 +14,7 @@ class ConfigurationsUARulesTest extends TestCase
$configuration->addUA('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/603.2.4 (KHTML, like Gecko) Version/10.1.1 Safari/603.2.4');
$array = $configuration->getArray();
$this->assertEquals(1, sizeof($array));
$this->assertCount(1, $array);
$this->assertObjectHasAttribute('target', $array[0]);
$this->assertEquals('ua', $array[0]->target);

6
tests/Configurations/ZoneLockdownTest.php → tests/Configurations/ConfigurationsZoneLockdownTest.php
View File

@@ -6,7 +6,7 @@
* Date: 05/09/2017
* Time: 13:50
*/
class ConfigurationZoneLockdownTest extends TestCase
class ConfigurationsZoneLockdownTest extends TestCase
{
public function testGetArray()
{
@@ -14,7 +14,7 @@ class ConfigurationZoneLockdownTest extends TestCase
$configuration->addIP('1.2.3.4');
$array = $configuration->getArray();
$this->assertEquals(1, sizeof($array));
$this->assertCount(1, $array);
$this->assertObjectHasAttribute('target', $array[0]);
$this->assertEquals('ip', $array[0]->target);
@@ -24,7 +24,7 @@ class ConfigurationZoneLockdownTest extends TestCase
$configuration->addIPRange('1.2.3.4/24');
$array = $configuration->getArray();
$this->assertEquals(2, sizeof($array));
$this->assertCount(2, $array);
$this->assertObjectHasAttribute('target', $array[1]);
$this->assertEquals('ip_range', $array[1]->target);

6
tests/Configurations/PageRulesTargetTest.php
View File

@@ -15,8 +15,8 @@ class PageRulesTargetTest extends TestCase
$targets = new PageRulesTargets('junade.com/*');
$array = $targets->getArray();
$this->assertEquals(1, sizeof($array));
$this->assertEquals("junade.com/*", $array[0]->constraint->value);
$this->assertEquals("matches", $array[0]->constraint->operator);
$this->assertCount(1, $array);
$this->assertEquals('junade.com/*', $array[0]->constraint->value);
$this->assertEquals('matches', $array[0]->constraint->operator);
}
}