Skip to content

Commit f9d3d6a

Browse files
SpudsSpuds
authored
Merge pull request #3774 from Spuds/xmlUpdate
uUdate xml
2 parents c589dbf + 9552e90 commit f9d3d6a

8 files changed

+57
-64
lines changed

‎.github/phpunit-mariadb.xml

+12-15
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,30 @@
99
stopOnFailure="false"
1010
verbose="true"
1111
bootstrap="bootstrap.php">
12+
1213
<testsuites>
1314
<testsuite name="DB Tests">
1415
<directory suffix="DatabaseTestExt.php">../tests</directory>
1516
</testsuite>
1617
<testsuite name="Unit Tests">
17-
<directory suffix="Test.php">../tests/ElkArte</directory>
18-
<directory suffix="Test.php">../tests/subs</directory>
19-
<directory suffix="Test.php">../tests/sources</directory>
18+
<directory suffix="Test.php">../tests</directory>
2019
</testsuite>
2120
<testsuite name="Bootstrap Tests">
2221
<directory suffix="BootstrapRunTestExt.php">../tests</directory>
2322
</testsuite>
2423
</testsuites>
2524

26-
<logging>
27-
<log type="coverage-clover" target="/tmp/coverage.madb.clover"/>
28-
<log type="coverage-text" target="php://stdout" />
29-
</logging>
30-
31-
<filter>
32-
<whitelist addUncoveredFilesFromWhitelist="true">
25+
<coverage includeUncoveredFiles="false">
26+
<include>
3327
<directory suffix=".php">../sources</directory>
34-
<exclude>
35-
<directory suffix=".php">../sources/ext</directory>
36-
</exclude>
37-
</whitelist>
38-
</filter>
28+
</include>
29+
<exclude>
30+
<directory suffix=".php">../sources/ext</directory>
31+
</exclude>
32+
<report>
33+
<clover outputFile="/tmp/madb.xml"/>
34+
</report>
35+
</coverage>
3936

4037
<php>
4138
<const name="DBTYPE" value="MySQL"/>

‎.github/phpunit-mysql.xml

+13-15
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,36 @@
33
<phpunit backupGlobals="true"
44
colors="true"
55
convertErrorsToExceptions="true"
6-
convertNoticesToExceptions="false"
6+
convertNoticesToExceptions="true"
77
convertWarningsToExceptions="true"
88
processIsolation="false"
99
stopOnFailure="false"
1010
verbose="true"
1111
bootstrap="bootstrap.php">
12+
1213
<testsuites>
1314
<testsuite name="DB Tests">
1415
<directory suffix="DatabaseTestExt.php">../tests</directory>
1516
</testsuite>
1617
<testsuite name="Unit Tests">
17-
<directory suffix="Test.php">../tests/ElkArte</directory>
18-
<directory suffix="Test.php">../tests/subs</directory>
19-
<directory suffix="Test.php">../tests/sources</directory>
18+
<directory suffix="Test.php">../tests</directory>
2019
</testsuite>
2120
<testsuite name="Bootstrap Tests">
2221
<directory suffix="BootstrapRunTestExt.php">../tests</directory>
2322
</testsuite>
2423
</testsuites>
2524

26-
<logging>
27-
<log type="coverage-clover" target="/tmp/coverage.mydb.clover"/>
28-
</logging>
29-
30-
<filter>
31-
<whitelist addUncoveredFilesFromWhitelist="true">
25+
<coverage includeUncoveredFiles="false">
26+
<include>
3227
<directory suffix=".php">../sources</directory>
33-
<exclude>
34-
<directory suffix=".php">../sources/ext</directory>
35-
</exclude>
36-
</whitelist>
37-
</filter>
28+
</include>
29+
<exclude>
30+
<directory suffix=".php">../sources/ext</directory>
31+
</exclude>
32+
<report>
33+
<clover outputFile="/tmp/mydb.xml"/>
34+
</report>
35+
</coverage>
3836

3937
<php>
4038
<const name="DBTYPE" value="MySQL"/>

‎.github/phpunit-postgres.xml

+12-14
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,30 @@
99
stopOnFailure="false"
1010
verbose="true"
1111
bootstrap="bootstrap.php">
12+
1213
<testsuites>
1314
<testsuite name="DB Tests">
1415
<directory suffix="DatabaseTestExt.php">../tests</directory>
1516
</testsuite>
1617
<testsuite name="Unit Tests">
17-
<directory suffix="Test.php">../tests/ElkArte</directory>
18-
<directory suffix="Test.php">../tests/subs</directory>
19-
<directory suffix="Test.php">../tests/sources</directory>
18+
<directory suffix="Test.php">../tests</directory>
2019
</testsuite>
2120
<testsuite name="Bootstrap Tests">
2221
<directory suffix="BootstrapRunTestExt.php">../tests</directory>
2322
</testsuite>
2423
</testsuites>
2524

26-
<logging>
27-
<log type="coverage-clover" target="/tmp/coverage.pgdb.clover"/>
28-
</logging>
29-
30-
<filter>
31-
<whitelist addUncoveredFilesFromWhitelist="false">
25+
<coverage includeUncoveredFiles="false">
26+
<include>
3227
<directory suffix=".php">../sources</directory>
33-
<exclude>
34-
<directory suffix=".php">../sources/ext</directory>
35-
</exclude>
36-
</whitelist>
37-
</filter>
28+
</include>
29+
<exclude>
30+
<directory suffix=".php">../sources/ext</directory>
31+
</exclude>
32+
<report>
33+
<clover outputFile="/tmp/pgdb.xml"/>
34+
</report>
35+
</coverage>
3836

3937
<php>
4038
<const name="DBTYPE" value="PostgreSQL"/>

‎.github/phpunit-static.xml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
processIsolation="false"
99
stopOnFailure="false"
1010
verbose="true">
11+
1112
<testsuites>
1213
<testsuite name="Static Tests">
1314
<directory suffix="Static.php">../tests/sources</directory>

‎.github/phpunit-webtest.xml

+11-13
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,25 @@
1010
verbose="true"
1111
beStrictAboutTestsThatDoNotTestAnything="false"
1212
bootstrap="bootstrapInstall.php">
13+
1314
<testsuites>
1415
<testsuite name="Browser Tests">
1516
<directory suffix="Web.php">../tests/install</directory>
1617
<directory suffix="Web.php">../tests/headless</directory>
1718
</testsuite>
1819
</testsuites>
1920

20-
<filter>
21-
<whitelist addUncoveredFilesFromWhitelist="false">
21+
<coverage includeUncoveredFiles="false">
22+
<include>
2223
<directory suffix=".php">../sources</directory>
23-
<directory suffix=".php">../themes/default</directory>
24-
<exclude>
25-
<directory suffix=".php">../sources/ext</directory>
26-
<directory suffix=".php">../themes/ElkArte/Languages</directory>
27-
</exclude>
28-
</whitelist>
29-
</filter>
30-
31-
<logging>
32-
<log type="coverage-clover" target="/tmp/coverage.web.clover"/>
33-
</logging>
24+
</include>
25+
<exclude>
26+
<directory suffix=".php">../sources/ext</directory>
27+
</exclude>
28+
<report>
29+
<clover outputFile="/tmp/web.xml"/>
30+
</report>
31+
</coverage>
3432

3533
<php>
3634
<const name="DBTYPE" value="MySQL"/>

‎.github/setup-results.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ vendor/bin/phpunit ${CONFIG}
1818
# Agents will merge all coverage data...
1919
if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]
2020
then
21-
bash <(curl -s https://codecov.io/bash) -s "/tmp" -f '*.clover'
21+
bash <(curl -s https://codecov.io/bash) -s "/tmp" -f '*.xml'
2222
fi

‎tests/sources/LanguageStringsTestStatic.php ‎tests/sources/LanguageStringsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* TestCase class for language files integrity
77
*/
8-
class LanguageStringsTestStatic extends TestCase
8+
class LanguageStringsTest extends TestCase
99
{
1010
protected $backupGlobalsExcludeList = ['user_info'];
1111

‎themes/default/scripts/script_elk.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -680,15 +680,16 @@ class SiteTooltip
680680
let viewportHeight = window.innerHeight;
681681

682682
let x = rect.left;
683-
let y = window.scrollY + rect.bottom + 5;
683+
// Initially trying to position above the element
684+
let y = window.scrollY + rect.top - tooltipHeight - 5;
684685

685-
// Don't position below if it fall off-screen, instead move it above
686-
if (rect.bottom + 5 + tooltipHeight > viewportHeight)
686+
// Don't position above if it falls off-screen, instead move it below
687+
if (rect.top - (tooltipHeight + 5) < 0)
687688
{
688-
y -= tooltipHeight + rect.height + 20;
689+
y = window.scrollY + rect.bottom + 5;
689690
}
690691

691-
tooltip.style.cssText = `left:${x}px; top:${y}px`;
692+
tooltip.style.cssText = 'left:' + x + 'px; top:' + y + 'px';
692693
}
693694

694695
/**

0 commit comments

Comments
 (0)