Skip to content

Fix consumption endpoint and adding better test expectations #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 20, 2023
Merged

Fix consumption endpoint and adding better test expectations #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85af120
Fixing consumption and adding test excpectation
arnebr Feb 20, 2023
9e2369d
Fix styling
arnebr Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .phpunit.cache/test-results
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"version":1,"defects":{"P\\Tests\\TibberTest::it_can_make_home_request":7,"P\\Tests\\TibberTest::it_can_make_consumption_request":7},"times":{"P\\Tests\\TibberTest::it_can_make_push_notification_request":0.079,"P\\Tests\\TibberTest::it_can_make_consumption_request":0.198,"P\\Tests\\TibberTest::it_can_make_request":0.083,"P\\Tests\\TibberTest::it_can_make_home_request":0.107,"P\\Tests\\TibberTest::it_can_make_viewer_request":0.089,"P\\Tests\\ExampleTest::it_can_test":0}}
56 changes: 19 additions & 37 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
executionOrder="random"
failOnWarning="true"
failOnRisky="true"
failOnEmptyTestSuite="true"
beStrictAboutOutputDuringTests="true"
verbose="true"
>
<testsuites>
<testsuite name="Arnebr Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<coverage>
<include>
<directory suffix=".php">./src</directory>
</include>
<report>
<html outputDirectory="build/coverage"/>
<text outputFile="build/coverage.txt"/>
<clover outputFile="build/logs/clover.xml"/>
</report>
</coverage>
<logging>
<junit outputFile="build/report.junit.xml"/>
</logging>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
<testsuites>
<testsuite name="Arnebr Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<coverage>
<include>
<directory suffix=".php">./src</directory>
</include>
<report>
<html outputDirectory="build/coverage"/>
<text outputFile="build/coverage.txt"/>
<clover outputFile="build/logs/clover.xml"/>
</report>
</coverage>
<logging>
<junit outputFile="build/report.junit.xml"/>
</logging>
</phpunit>
21 changes: 21 additions & 0 deletions phpunit.xml.dist.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
<testsuites>
<testsuite name="Arnebr Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<coverage>
<include>
<directory suffix=".php">./src</directory>
</include>
<report>
<html outputDirectory="build/coverage"/>
<text outputFile="build/coverage.txt"/>
<clover outputFile="build/logs/clover.xml"/>
</report>
</coverage>
<logging>
<junit outputFile="build/report.junit.xml"/>
</logging>
</phpunit>
1 change: 1 addition & 0 deletions src/Tibber.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ public function consumption($homeId = null, $resolution = Tibber::HOURLY, $last
consumptionUnit
currency
}
}
GQL;

return $this->homes($homeId, $subquery);
Expand Down
7 changes: 7 additions & 0 deletions tests/TibberTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,21 @@
it('can make viewer request', function () {
$tibber = Tibber::viewer();
expect($tibber)->toBeArray();
expect($tibber)->toHaveKeys(['data.viewer.login']);
});
it('can make home request', function () {
$tibber = Tibber::homes();
expect($tibber)->toBeArray();
expect($tibber)->toHaveKeys(['data.viewer.login']);
expect($tibber)->toHaveKeys(['data.viewer.homes']);
});
it('can make consumption request', function () {
$tibber = Tibber::consumption();
expect($tibber)->toBeArray();
expect($tibber)->toHaveKeys(['data.viewer.login']);
expect($tibber)->toHaveKeys(['data.viewer.homes']);
expect($tibber)->toHaveKeys(['data.viewer.homes.0.consumption']);
expect($tibber)->toHaveKeys(['data.viewer.homes.0.consumption.nodes']);
});
it('can make push notification request', function () {
$tibber = Tibber::sendPushNotification('test', 'test');
Expand Down