Skip to content

Commit 41957e6

Browse files
committed
Removed WebDriver extension. Moved Cli tests to the root of Functional folder
1 parent 5983c40 commit 41957e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+28
-327
lines changed

phpunit.xml

-8
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,5 @@
77
<testsuite name="Functional">
88
<directory>tests/Functional</directory>
99
</testsuite>
10-
11-
<testsuite name="Cli">
12-
<directory>tests/Functional/Cli</directory>
13-
</testsuite>
14-
15-
<testsuite name="WebDriver">
16-
<directory>tests/Functional/WebDriver</directory>
17-
</testsuite>
1810
</testsuites>
1911
</phpunit>

src/Utils/Decorator/WebDriver/AcceptAlertDecorator.php

-20
This file was deleted.

src/Utils/Decorator/WebDriver/ClearDecorator.php

-23
This file was deleted.

src/Utils/Decorator/WebDriver/ClickDecorator.php

-24
This file was deleted.

src/Utils/Decorator/WebDriver/NavigateDecorator.php

-38
This file was deleted.

src/Utils/Decorator/WebDriver/TypeDecorator.php

-25
This file was deleted.

src/Utils/Decorator/WebDriver/WaitForAlertDecorator.php

-30
This file was deleted.

src/Utils/WebDriverDecorators.php

-34
This file was deleted.

tests/Functional/Cli/Project1Test.php tests/Functional/Project1Test.php

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
declare(strict_types=1);
33

4-
namespace ThenLabs\PyramidalTests\Tests\Functional\Cli;
4+
namespace ThenLabs\PyramidalTests\Tests\Functional;
55

66
use PHPUnit\Framework\TestCase;
77

@@ -45,7 +45,7 @@ public function test2()
4545
$command = sprintf(
4646
"php %s -c %s",
4747
ROOT_DIR.'/bin/pyramidal',
48-
ROOT_DIR.'/tests/Functional/Cli/projects/project1/phpunit.xml',
48+
__DIR__.'/projects/project1/phpunit.xml',
4949
);
5050

5151
$outputString = exec($command, $outputArray, $returnValue);
@@ -70,7 +70,7 @@ public function test3(string $arg)
7070
$command = sprintf(
7171
"php %s -c %s --filter %s",
7272
ROOT_DIR.'/bin/pyramidal',
73-
ROOT_DIR.'/tests/Functional/Cli/projects/project1/phpunit.xml',
73+
__DIR__.'/projects/project1/phpunit.xml',
7474
$arg
7575
);
7676

@@ -88,7 +88,7 @@ public function test4(string $arg)
8888
$command = sprintf(
8989
"php %s -c %s --filter=%s",
9090
ROOT_DIR.'/bin/pyramidal',
91-
ROOT_DIR.'/tests/Functional/Cli/projects/project1/phpunit.xml',
91+
__DIR__.'/projects/project1/phpunit.xml',
9292
$arg
9393
);
9494

@@ -103,7 +103,7 @@ public function test5()
103103
$command = sprintf(
104104
"php %s -c %s --filter 'my parent test case' --testdox",
105105
ROOT_DIR.'/bin/pyramidal',
106-
ROOT_DIR.'/tests/Functional/Cli/projects/project1/phpunit.xml'
106+
__DIR__.'/projects/project1/phpunit.xml'
107107
);
108108

109109
$outputString = exec($command, $outputArray, $returnValue);
@@ -121,7 +121,7 @@ public function test6()
121121
$command = sprintf(
122122
'php %s -c %s --filter="my child test case"',
123123
ROOT_DIR.'/bin/pyramidal',
124-
ROOT_DIR.'/tests/Functional/Cli/projects/project1/phpunit.xml'
124+
__DIR__.'/projects/project1/phpunit.xml'
125125
);
126126

127127
$outputString = exec($command, $outputArray, $returnValue);
@@ -136,8 +136,8 @@ public function test7()
136136
$command = sprintf(
137137
'php %s -c %s --testdox --filter="%s"',
138138
ROOT_DIR.'/bin/pyramidal',
139-
ROOT_DIR.'/tests/Functional/Cli/projects/project1/phpunit.xml',
140-
ROOT_DIR.'/tests/Functional/Cli/projects/project1/tests/test-1.php:3',
139+
__DIR__.'/projects/project1/phpunit.xml',
140+
__DIR__.'/projects/project1/tests/test-1.php:3',
141141
);
142142

143143
$outputString = exec($command, $outputArray, $returnValue);
@@ -155,8 +155,8 @@ public function test8()
155155
$command = sprintf(
156156
'php %s -c %s --testdox --filter="%s"',
157157
ROOT_DIR.'/bin/pyramidal',
158-
ROOT_DIR.'/tests/Functional/Cli/projects/project1/phpunit.xml',
159-
ROOT_DIR.'/tests/Functional/Cli/projects/project1/tests/test-1.php:25',
158+
__DIR__.'/projects/project1/phpunit.xml',
159+
__DIR__.'/projects/project1/tests/test-1.php:25',
160160
);
161161

162162
$outputString = exec($command, $outputArray, $returnValue);
@@ -172,8 +172,8 @@ public function test9()
172172
$command = sprintf(
173173
'php %s -c %s --testdox --filter="%s"',
174174
ROOT_DIR.'/bin/pyramidal',
175-
ROOT_DIR.'/tests/Functional/Cli/projects/project1/phpunit.xml',
176-
ROOT_DIR.'/tests/Functional/Cli/projects/project1/tests/test-1.php:26',
175+
__DIR__.'/projects/project1/phpunit.xml',
176+
__DIR__.'/projects/project1/tests/test-1.php:26',
177177
);
178178

179179
$outputString = exec($command, $outputArray, $returnValue);
@@ -189,8 +189,8 @@ public function test10()
189189
$command = sprintf(
190190
'php %s -c %s --testdox --filter="%s"',
191191
ROOT_DIR.'/bin/pyramidal',
192-
ROOT_DIR.'/tests/Functional/Cli/projects/project1/phpunit.xml',
193-
ROOT_DIR.'/tests/Functional/Cli/projects/project1/tests/test-1.php:12',
192+
__DIR__.'/projects/project1/phpunit.xml',
193+
__DIR__.'/projects/project1/tests/test-1.php:12',
194194
);
195195

196196
$outputString = exec($command, $outputArray, $returnValue);

tests/Functional/Cli/Project2Test.php tests/Functional/Project2Test.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
declare(strict_types=1);
33

4-
namespace ThenLabs\PyramidalTests\Tests\Functional\Cli;
4+
namespace ThenLabs\PyramidalTests\Tests\Functional;
55

66
use PHPUnit\Framework\TestCase;
77

@@ -15,7 +15,7 @@ public function test1()
1515
$command = sprintf(
1616
"php %s -c %s",
1717
ROOT_DIR.'/bin/pyramidal',
18-
ROOT_DIR.'/tests/Functional/Cli/projects/project2/phpunit.xml',
18+
__DIR__.'/projects/project2/phpunit.xml',
1919
);
2020

2121
$outputString = exec($command, $outputArray, $returnValue);

tests/Functional/Cli/Project3Test.php tests/Functional/Project3Test.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
declare(strict_types=1);
33

4-
namespace ThenLabs\PyramidalTests\Tests\Functional\Cli;
4+
namespace ThenLabs\PyramidalTests\Tests\Functional;
55

66
use PHPUnit\Framework\TestCase;
77

@@ -15,7 +15,7 @@ public function test1()
1515
$command = sprintf(
1616
"php %s -c %s",
1717
ROOT_DIR.'/bin/pyramidal',
18-
ROOT_DIR.'/tests/Functional/Cli/projects/project3/phpunit.xml',
18+
__DIR__.'/projects/project3/phpunit.xml',
1919
);
2020

2121
$outputString = exec($command, $outputArray, $returnValue);

tests/Functional/Cli/Project4Test.php tests/Functional/Project4Test.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
declare(strict_types=1);
33

4-
namespace ThenLabs\PyramidalTests\Tests\Functional\Cli;
4+
namespace ThenLabs\PyramidalTests\Tests\Functional;
55

66
use PHPUnit\Framework\TestCase;
77

@@ -15,7 +15,7 @@ public function test1()
1515
$command = sprintf(
1616
"php %s -c %s",
1717
ROOT_DIR.'/bin/pyramidal',
18-
ROOT_DIR.'/tests/Functional/Cli/projects/project4/phpunit.xml',
18+
__DIR__.'/projects/project4/phpunit.xml',
1919
);
2020

2121
$outputString = exec($command, $outputArray, $returnValue);

tests/Functional/Cli/Project5Test.php tests/Functional/Project5Test.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
declare(strict_types=1);
33

4-
namespace ThenLabs\PyramidalTests\Tests\Functional\Cli;
4+
namespace ThenLabs\PyramidalTests\Tests\Functional;
55

66
use PHPUnit\Framework\TestCase;
77

@@ -15,7 +15,7 @@ public function test1()
1515
$command = sprintf(
1616
"php %s -c %s",
1717
ROOT_DIR.'/bin/pyramidal',
18-
ROOT_DIR.'/tests/Functional/Cli/projects/project5/phpunit.xml',
18+
__DIR__.'/projects/project5/phpunit.xml',
1919
);
2020

2121
$outputString = exec($command, $outputArray, $returnValue);

0 commit comments

Comments
 (0)