diff --git a/README.md b/README.md index 1b738472..c1ce12fc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Speedtest Tracker -[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.11.1-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE) +[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.12.0-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE) This program runs a speedtest check every hour and graphs the results. The back-end is written in [Laravel](https://laravel.com/) and the front-end uses [React](https://reactjs.org/). It uses the [Ookla's speedtest cli](https://www.speedtest.net/apps/cli) package to get the data and uses [Chart.js](https://www.chartjs.org/) to plot the results. @@ -18,6 +18,7 @@ Disclaimer: You will need to accept Ookla's EULA and privacy agreements in order - Slack/Discord/Telegram notifications - [healthchecks.io](https://healthchecks.io) integration - Organizr integration +- InfluxDB integration (currently v1 only, v2 is a WIP) ## Installation & Setup @@ -84,6 +85,8 @@ Container images are configured using parameters passed at runtime (such as thos | `-e PUID` | Optional. Supply a local user ID for volume permissions | | `-e PGID` | Optional. Supply a local group ID for volume permissions | | `-e AUTH` | Optional. Set to 'true' to enable authentication for the app | +| `-e INFLUXDB_RETENTION`| Optional. Sets the InfluxDB retention period, defaults to `30d` | +| `-e INFLUXDB_HOST_TAG | Optional. Sets the InfluxDB host tag value, defaults to `speedtest` | ### Authentication @@ -101,3 +104,7 @@ After enabling, you should change the password through the web UI. ### Manual Install For manual installations, please follow the instructions [here](https://github.com/henrywhitaker3/Speedtest-Tracker/wiki/Manual-Installation). + +### Kubernetes + +There is a 3rd party helm chart available [here](https://github.com/sOblivionsCall/charts). diff --git a/app/Actions/GetFailedSpeedtestData.php b/app/Actions/GetFailedSpeedtestData.php index 7ffd586a..652f85c7 100644 --- a/app/Actions/GetFailedSpeedtestData.php +++ b/app/Actions/GetFailedSpeedtestData.php @@ -2,7 +2,7 @@ namespace App\Actions; -use App\Speedtest; +use App\Models\Speedtest; use Cache; use Carbon\Carbon; use DB; diff --git a/app/Actions/GetLatestSpeedtestData.php b/app/Actions/GetLatestSpeedtestData.php index ec6b8044..bc456ded 100644 --- a/app/Actions/GetLatestSpeedtestData.php +++ b/app/Actions/GetLatestSpeedtestData.php @@ -4,7 +4,7 @@ namespace App\Actions; use App\Helpers\SettingsHelper; use App\Helpers\SpeedtestHelper; -use App\Speedtest; +use App\Models\Speedtest; use DB; use Henrywhitaker3\LaravelActions\Interfaces\ActionInterface; diff --git a/app/Actions/GetSpeedtestTimeData.php b/app/Actions/GetSpeedtestTimeData.php index 105baa00..d2b15988 100644 --- a/app/Actions/GetSpeedtestTimeData.php +++ b/app/Actions/GetSpeedtestTimeData.php @@ -3,7 +3,7 @@ namespace App\Actions; use App\Helpers\SettingsHelper; -use App\Speedtest; +use App\Models\Speedtest; use Cache; use Carbon\Carbon; use Henrywhitaker3\LaravelActions\Interfaces\ActionInterface; diff --git a/app/Console/Commands/ClearOldSessionsCommand.php b/app/Console/Commands/ClearOldSessionsCommand.php index b6d69933..223b2bf5 100644 --- a/app/Console/Commands/ClearOldSessionsCommand.php +++ b/app/Console/Commands/ClearOldSessionsCommand.php @@ -2,7 +2,7 @@ namespace App\Console\Commands; -use App\Auth\LoginSession; +use App\Models\Auth\LoginSession; use Carbon\Carbon; use Illuminate\Console\Command; use Log; diff --git a/app/Exceptions/InfluxDBConnectionErrorException.php b/app/Exceptions/InfluxDBConnectionErrorException.php new file mode 100644 index 00000000..24266020 --- /dev/null +++ b/app/Exceptions/InfluxDBConnectionErrorException.php @@ -0,0 +1,10 @@ +make(SpeedtestProvider::class); return $tester->run(); } diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 2a610fe9..abbf0564 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -2,14 +2,14 @@ namespace App\Http\Controllers; -use App\Auth\EmailVerification; -use App\Auth\LoginSession as AuthLoginSession; +use App\Models\Auth\EmailVerification; +use App\Models\Auth\LoginSession as AuthLoginSession; use App\Helpers\EmailVerificationHelper; use Illuminate\Support\Facades\Auth; use App\Http\Controllers\Controller; use App\LoginSession; use App\Rules\CurrentPasswordMatches; -use App\User; +use App\Models\User; use DateTime; use Hash; use Illuminate\Support\Facades\Request as RequestFacade; diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 4d7202d6..b8359c37 100644 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers; use App\Helpers\SettingsHelper; use App\Rules\Cron; -use App\Setting; +use App\Models\Setting; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Validator; diff --git a/app/Http/Controllers/SpeedtestController.php b/app/Http/Controllers/SpeedtestController.php index f4204ff0..20169675 100644 --- a/app/Http/Controllers/SpeedtestController.php +++ b/app/Http/Controllers/SpeedtestController.php @@ -9,7 +9,7 @@ use App\Actions\QueueSpeedtest; use App\Helpers\SettingsHelper; use App\Helpers\SpeedtestHelper; use App\Jobs\SpeedtestJob; -use App\Speedtest; +use App\Models\Speedtest; use Carbon\Carbon; use Exception; use Illuminate\Http\Request; diff --git a/app/Http/Middleware/CheckActiveSession.php b/app/Http/Middleware/CheckActiveSession.php index 6b46bfb1..11c43a27 100644 --- a/app/Http/Middleware/CheckActiveSession.php +++ b/app/Http/Middleware/CheckActiveSession.php @@ -2,7 +2,7 @@ namespace App\Http\Middleware; -use App\Auth\LoginSession; +use App\Models\Auth\LoginSession; use Closure; use Exception; diff --git a/app/Interfaces/InfluxDBWrapperInterface.php b/app/Interfaces/InfluxDBWrapperInterface.php new file mode 100644 index 00000000..329429b7 --- /dev/null +++ b/app/Interfaces/InfluxDBWrapperInterface.php @@ -0,0 +1,13 @@ + (int) $this->id, + 'download' => (float) $this->download, + 'upload' => (float) $this->upload, + 'ping' => (float) $this->ping, + 'server_id' => (int) $this->server_id, + 'server_host' => $this->server_host, + 'server_name' => $this->server_name, + 'scheduled' => (bool) $this->scheduled, + ]; + } +} diff --git a/app/User.php b/app/Models/User.php similarity index 97% rename from app/User.php rename to app/Models/User.php index 2f5cf899..35333805 100644 --- a/app/User.php +++ b/app/Models/User.php @@ -1,6 +1,6 @@ attributes['password'] = Hash::make($password); } } diff --git a/app/Observers/SpeedtestObserver.php b/app/Observers/SpeedtestObserver.php new file mode 100644 index 00000000..1ad26d27 --- /dev/null +++ b/app/Observers/SpeedtestObserver.php @@ -0,0 +1,30 @@ +store($speedtest); + } catch (InfluxDBNotEnabledException $e) { + // / + } catch (Exception $e) { + Log::error($e); + } + } +} diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index b33e65d5..e343a8b6 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -10,6 +10,8 @@ use App\Listeners\SpeedtestCompleteListener; use App\Listeners\SpeedtestFailedListener; use App\Listeners\SpeedtestOverviewListener; use App\Listeners\TestNotificationListener; +use App\Observers\SpeedtestObserver; +use App\Models\Speedtest; use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Listeners\SendEmailVerificationNotification; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; @@ -49,6 +51,6 @@ class EventServiceProvider extends ServiceProvider { parent::boot(); - // + Speedtest::observe(SpeedtestObserver::class); } } diff --git a/app/Speedtest.php b/app/Speedtest.php deleted file mode 100644 index f0bc85ad..00000000 --- a/app/Speedtest.php +++ /dev/null @@ -1,28 +0,0 @@ -client = $client; + } + + /** + * Connect to influx db + * + * @param string $host + * @param integer $port + * @param string $database + * @return InfluxDB + */ + public static function connect() + { + if (!(bool) SettingsHelper::get('influx_db_enabled')->value) { + throw new InfluxDBNotEnabledException(); + } + + $host = SettingsHelper::get('influx_db_host')->value; + $port = SettingsHelper::get('influx_db_port')->value; + $username = SettingsHelper::get('influx_db_username')->value; + $password = SettingsHelper::get('influx_db_password')->value; + $database = SettingsHelper::get('influx_db_database')->value; + $version = (int) SettingsHelper::get('influx_db_version')->value; + + $wrapper = $version === 1 + ? new InfluxDBVersion1Wrapper( + new Version1( + str_replace(['http://', 'https://'], '', $host), + $port, + $username, + $password + ) + ) + : new InfluxDBVersion2Wrapper( + new Version2([ + 'url' => $host . ':' . $port, + 'token' => '', + ]) + ); + + return (new self($wrapper))->setDatabase($database) + ->testConnection(); + } + + /** + * Set the database field + * + * @param string $database + * @return InfluxDB + */ + public function setDatabase(string $database): InfluxDB + { + $this->database = $database; + + return $this; + } + + /** + * Test the connection + * + * @throws InfluxDBConnectionErrorException + * @return InfluxDB + */ + public function testConnection(): InfluxDB + { + if (!$this->client->testConnection()) { + throw new InfluxDBConnectionErrorException(); + } + + if (!$this->doesDatabaseExist()) { + $this->createDatabase(); + } + + return $this; + } + + public function doesDatabaseExist(): bool + { + return $this->client->doesDatabaseExist($this->database); + } + + public function createDatabase(): bool + { + return $this->client->createDatabase($this->database); + } + + public function store(Speedtest $speedtest): InfluxDB + { + $this->client->store($speedtest); + + return $this; + } +} diff --git a/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php b/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php new file mode 100644 index 00000000..c439f712 --- /dev/null +++ b/app/Utils/InfluxDB/InfluxDBVersion1Wrapper.php @@ -0,0 +1,74 @@ +client = $client; + } + + public function testConnection(): bool + { + try { + $this->client->listDatabases(); + + return true; + } catch (Exception $e) { + Log::error($e); + + return false; + } + } + + public function doesDatabaseExist(string $database): bool + { + $this->database = $this->client->selectDB($database); + + return (bool) $this->database->exists(); + } + + public function createDatabase(string $database): bool + { + try { + $this->database->create( + new RetentionPolicy( + 'speedtest_retention_policy', + config('services.influxdb.retention'), + 1, + true + ) + ); + + return true; + } catch (Exception $e) { + Log::error($e); + return false; + } + } + + public function store(Speedtest $speedtest): bool + { + return $this->database->writePoints([ + new Point( + 'speedtest', + null, + ['host' => config('services.influxdb.host')], + $speedtest->formatForInfluxDB(), + ) + ]); + } +} diff --git a/app/Utils/InfluxDB/InfluxDBVersion2Wrapper.php b/app/Utils/InfluxDB/InfluxDBVersion2Wrapper.php new file mode 100644 index 00000000..f7d24946 --- /dev/null +++ b/app/Utils/InfluxDB/InfluxDBVersion2Wrapper.php @@ -0,0 +1,37 @@ +client = $client; + } + + public function testConnection(): bool + { + return $this->client->health()->getStatus() !== 'pass'; + } + + public function doesDatabaseExist(string $database): bool + { + return true; + } + + public function createDatabase(string $database): bool + { + return true; + } + + public function store(Speedtest $speedtest): bool + { + return true; + } +} diff --git a/app/Utils/OoklaTester.php b/app/Utils/OoklaTester.php index 74e617da..f127b08f 100644 --- a/app/Utils/OoklaTester.php +++ b/app/Utils/OoklaTester.php @@ -6,7 +6,7 @@ use App\Exceptions\SpeedtestFailureException; use App\Helpers\SettingsHelper; use App\Helpers\SpeedtestHelper; use App\Interfaces\SpeedtestProvider; -use App\Speedtest; +use App\Models\Speedtest; use Cache; use Exception; use JsonException; diff --git a/changelog.json b/changelog.json index 7302b2c9..89c3ab38 100644 --- a/changelog.json +++ b/changelog.json @@ -1,4 +1,10 @@ { + "1.12.0": [ + { + "description": "Added InfluxDB intergation.", + "link": "" + } + ], "1.11.1": [ { "description": "Add option to show/hide columns in the all tests table.", diff --git a/composer.json b/composer.json index eacdb52c..aa56ac7e 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,8 @@ "guzzlehttp/guzzle": "^7.0.1", "henrywhitaker3/healthchecks-io": "^1.0", "henrywhitaker3/laravel-actions": "^1.0", + "influxdata/influxdb-client-php": "^1.12", + "influxdb/influxdb-php": "^1.15", "laravel-notification-channels/telegram": "^0.5.0", "laravel/framework": "^8.0", "laravel/slack-notification-channel": "^2.0", @@ -45,12 +47,10 @@ }, "autoload": { "psr-4": { - "App\\": "app/" - }, - "classmap": [ - "database/seeds", - "database/factories" - ] + "App\\": "app/", + "Database\\Factories\\": "database/factories/", + "Database\\Seeders\\": "database/seeders/" + } }, "autoload-dev": { "psr-4": { diff --git a/composer.lock b/composer.lock index b16ed50e..120c2d80 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2c905613bf401a9978baa23d1a80b710", + "content-hash": "46d75195c9e28db55cd2b086a6846e13", "packages": [ { "name": "asm89/stack-cors", @@ -1309,6 +1309,118 @@ }, "time": "2021-02-06T09:50:49+00:00" }, + { + "name": "influxdata/influxdb-client-php", + "version": "1.12.0", + "source": { + "type": "git", + "url": "https://github.com/influxdata/influxdb-client-php.git", + "reference": "e04f802a4d9c52b5b497077673269e8463fdb6ea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/influxdata/influxdb-client-php/zipball/e04f802a4d9c52b5b497077673269e8463fdb6ea", + "reference": "e04f802a4d9c52b5b497077673269e8463fdb6ea", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", + "guzzlehttp/guzzle": "^6.2|^7.0.1", + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.4|^9.1", + "squizlabs/php_codesniffer": "~2.6" + }, + "type": "library", + "autoload": { + "psr-4": { + "InfluxDB2\\": "src/InfluxDB2" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "InfluxDB (v2+) Client Library for PHP", + "homepage": "https://www.github.com/influxdata/influxdb-client-php", + "keywords": [ + "influxdb" + ], + "support": { + "issues": "https://github.com/influxdata/influxdb-client-php/issues", + "source": "https://github.com/influxdata/influxdb-client-php/tree/1.12.0" + }, + "time": "2021-04-01T06:28:57+00:00" + }, + { + "name": "influxdb/influxdb-php", + "version": "1.15.2", + "source": { + "type": "git", + "url": "https://github.com/influxdata/influxdb-php.git", + "reference": "d6e59f4f04ab9107574fda69c2cbe36671253d03" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/influxdata/influxdb-php/zipball/d6e59f4f04ab9107574fda69c2cbe36671253d03", + "reference": "d6e59f4f04ab9107574fda69c2cbe36671253d03", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "^6.0|^7.0", + "php": "^5.5 || ^7.0 || ^8.0" + }, + "require-dev": { + "dms/phpunit-arraysubset-asserts": "^0.2.1", + "phpunit/phpunit": "^9.5" + }, + "suggest": { + "ext-curl": "Curl extension, needed for Curl driver", + "stefanotorresi/influxdb-php-async": "An asyncronous client for InfluxDB, implemented via ReactPHP." + }, + "type": "library", + "autoload": { + "psr-4": { + "InfluxDB\\": "src/InfluxDB" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Stephen Hoogendijk", + "email": "stephen@tca0.nl" + }, + { + "name": "Daniel Martinez", + "email": "danimartcas@hotmail.com" + }, + { + "name": "Gianluca Arbezzano", + "email": "gianarb92@gmail.com" + } + ], + "description": "InfluxDB client library for PHP", + "keywords": [ + "client", + "influxdata", + "influxdb", + "influxdb class", + "influxdb client", + "influxdb library", + "time series" + ], + "support": { + "issues": "https://github.com/influxdata/influxdb-php/issues", + "source": "https://github.com/influxdata/influxdb-php/tree/1.15.2" + }, + "time": "2020-12-26T17:45:17+00:00" + }, { "name": "laravel-notification-channels/telegram", "version": "0.5.1", diff --git a/config/services.php b/config/services.php index 88eb96e4..c966d76e 100644 --- a/config/services.php +++ b/config/services.php @@ -34,4 +34,9 @@ return [ 'token' => env('TELEGRAM_BOT_TOKEN', 'YOUR BOT TOKEN HERE') ], + 'influxdb' => [ + 'retention' => env('INFLUXDB_RETENTION', '30d'), + 'host' => env('INFLUXDB_HOST_TAG', 'speedtest'), + ], + ]; diff --git a/config/speedtest.php b/config/speedtest.php index 1db30b80..d39eaf89 100644 --- a/config/speedtest.php +++ b/config/speedtest.php @@ -7,7 +7,7 @@ return [ |-------------------------------------------------------------------------- */ - 'version' => '1.11.1', + 'version' => '1.12.0', /* |-------------------------------------------------------------------------- diff --git a/database/factories/SpeedtestFactory.php b/database/factories/SpeedtestFactory.php new file mode 100644 index 00000000..c09c6798 --- /dev/null +++ b/database/factories/SpeedtestFactory.php @@ -0,0 +1,32 @@ + rand(15, 900), + 'upload' => rand(15, 900), + 'ping' => rand(1, 25), + 'scheduled' => (bool) rand(0, 1), + 'failed' => false, + ]; + } +} diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 741edead..fa9360e7 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -2,7 +2,7 @@ /** @var \Illuminate\Database\Eloquent\Factory $factory */ -use App\User; +use App\Models\User; use Faker\Generator as Faker; use Illuminate\Support\Str; diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 4bfd7b91..5d0ad5dc 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -1,6 +1,6 @@ 'influx_db_enabled', + 'value' => false, + 'description' => 'Enable the InfluxDB integration for speedtests.' + ]); + } + + if (!SettingsHelper::get('influx_db_host')) { + Setting::create([ + 'name' => 'influx_db_host', + 'value' => '', + 'description' => 'InfluxDB hostname, include the protocol (http:// or https://).' + ]); + } + + if (!SettingsHelper::get('influx_db_port')) { + Setting::create([ + 'name' => 'influx_db_port', + 'value' => '', + 'description' => 'InfluxDB port' + ]); + } + + if (!SettingsHelper::get('influx_db_database')) { + Setting::create([ + 'name' => 'influx_db_database', + 'value' => '', + 'description' => 'InfluxDB database' + ]); + } + + if (!SettingsHelper::get('influx_db_username')) { + Setting::create([ + 'name' => 'influx_db_username', + 'value' => '', + 'description' => 'InfluxDB username' + ]); + } + + if (!SettingsHelper::get('influx_db_password')) { + Setting::create([ + 'name' => 'influx_db_password', + 'value' => '', + 'description' => 'InfluxDB password' + ]); + } + + if (!SettingsHelper::get('influx_db_version')) { + Setting::create([ + 'name' => 'influx_db_version', + 'value' => 1, + 'description' => 'InfluxDB version' + ]); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Setting::whereIn('name', [ + 'influx_db_enabled', + 'influx_db_host', + 'influx_db_port', + 'influx_db_database', + 'influx_db_username', + 'influx_db_password', + 'influx_db_version', + ])->delete(); + } +} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php similarity index 64% rename from database/seeds/DatabaseSeeder.php rename to database/seeders/DatabaseSeeder.php index 237dfc5d..79580814 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -1,5 +1,8 @@ call(UserSeeder::class); + $this->call(SpeedtestSeeder::class); } } diff --git a/database/seeders/SpeedtestSeeder.php b/database/seeders/SpeedtestSeeder.php new file mode 100644 index 00000000..5e628dbe --- /dev/null +++ b/database/seeders/SpeedtestSeeder.php @@ -0,0 +1,21 @@ +count(250) + ->create(); + } +} diff --git a/database/speed.db b/database/speed.db index 14f8cce3..b84a194a 100644 Binary files a/database/speed.db and b/database/speed.db differ diff --git a/public/js/app.js b/public/js/app.js index 24d6b2cc..fabc9b55 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -146695,7 +146695,7 @@ var TableRow = /*#__PURE__*/function (_Component) { }); _defineProperty(_assertThisInitialized(_this), "delete", function (id) { - var url = 'api/speedtest/delete/' + id; + var url = 'api/speedtest/delete/' + id + '?token=' + window.token; axios__WEBPACK_IMPORTED_MODULE_3___default.a["delete"](url).then(function (resp) { console.log(resp); react_toastify__WEBPACK_IMPORTED_MODULE_4__["toast"].success('Speedtest deleted'); @@ -148414,6 +148414,27 @@ var SettingsIndex = /*#__PURE__*/function (_Component) { inline: true, earlyReturn: true, classes: 'mr-2' + }], + influxdb: [{ + obj: data.influx_db_enabled, + type: 'checkbox' + }, { + obj: data.influx_db_host, + type: 'text' + }, { + obj: data.influx_db_port, + type: 'number' + }, { + obj: data.influx_db_database, + type: 'text' + }, { + obj: data.influx_db_username, + type: 'text', + autoComplete: false + }, { + obj: data.influx_db_password, + type: 'password', + autoComplete: false }] }; }); @@ -148552,6 +148573,10 @@ var SettingsInput = /*#__PURE__*/function (_Component) { input = _this.generateTextInput(disabled); } + if (_this.state.type === 'password') { + input = _this.generatePasswordInput(disabled); + } + if (_this.state.type === 'btn-get') { input = _this.generateButtonGetInput(); } @@ -148593,7 +148618,8 @@ var SettingsInput = /*#__PURE__*/function (_Component) { url: _this.props.url, inline: _this.props.inline ? 'd-inline-block' : 'd-block', btnType: _this.props.btnType, - earlyReturn: _this.props.earlyReturn ? true : false + earlyReturn: _this.props.earlyReturn ? true : false, + autoComplete: String(_this.props.autoComplete ? true : "off") }; return _this; } @@ -148621,7 +148647,8 @@ var SettingsInput = /*#__PURE__*/function (_Component) { disabled: disabled, min: this.state.min, max: this.state.max, - onInput: this.handleInput + onInput: this.handleInput, + autoComplete: this.state.autoComplete }); } }, { @@ -148662,7 +148689,20 @@ var SettingsInput = /*#__PURE__*/function (_Component) { type: this.state.type, defaultValue: this.state.value, disabled: disabled, - onInput: this.handleInput + onInput: this.handleInput, + autoComplete: this.state.autoComplete + }); + } + }, { + key: "generatePasswordInput", + value: function generatePasswordInput(disabled) { + return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_1__["Form"].Control, { + name: this.state.name, + type: this.state.type, + defaultValue: this.state.value, + disabled: disabled, + onInput: this.handleInput, + autoComplete: this.state.autoComplete }); } }, { @@ -148723,6 +148763,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _tabs_NotificationsSettings__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./tabs/NotificationsSettings */ "./resources/js/components/Settings/tabs/NotificationsSettings.js"); /* harmony import */ var _Authentication_Authentication__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../Authentication/Authentication */ "./resources/js/components/Authentication/Authentication.js"); /* harmony import */ var _tabs_TableSettings__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./tabs/TableSettings */ "./resources/js/components/Settings/tabs/TableSettings.js"); +/* harmony import */ var _tabs_InfluxDBSettings__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./tabs/InfluxDBSettings */ "./resources/js/components/Settings/tabs/InfluxDBSettings.js"); function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } @@ -148762,6 +148803,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope + var SettingsTabs = /*#__PURE__*/function (_Component) { _inherits(SettingsTabs, _Component); @@ -148775,7 +148817,7 @@ var SettingsTabs = /*#__PURE__*/function (_Component) { _this = _super.call(this, props); _defineProperty(_assertThisInitialized(_this), "generateTabs", function () { - var tabs = ['General', 'Graphs', 'Tables', 'Notifications', 'healthchecks.io', 'Reset', 'Backup/Restore']; + var tabs = ['General', 'Graphs', 'Tables', 'Notifications', 'healthchecks.io', 'InfluxDB', 'Reset', 'Backup/Restore']; if (window.config.auth) { tabs.push('Authentication'); @@ -148838,7 +148880,7 @@ var SettingsTabs = /*#__PURE__*/function (_Component) { description: setting.obj.description, handler: handler, label: setting.obj.name - }, _defineProperty(_React$createElement, "description", setting.obj.description), _defineProperty(_React$createElement, "options", setting.type == 'select' ? setting.options : []), _defineProperty(_React$createElement, "hideDescription", setting.hideDescription ? setting.hideDescription : false), _defineProperty(_React$createElement, "min", setting.min ? setting.min : false), _defineProperty(_React$createElement, "max", setting.max ? setting.max : false), _defineProperty(_React$createElement, "btnType", setting.btnType), _defineProperty(_React$createElement, "inline", setting.inline), _defineProperty(_React$createElement, "url", setting.url), _defineProperty(_React$createElement, "earlyReturn", setting.earlyReturn ? true : false), _defineProperty(_React$createElement, "classes", setting.classes ? setting.classes : ''), _React$createElement)); + }, _defineProperty(_React$createElement, "description", setting.obj.description), _defineProperty(_React$createElement, "options", setting.type == 'select' ? setting.options : []), _defineProperty(_React$createElement, "hideDescription", setting.hideDescription ? setting.hideDescription : false), _defineProperty(_React$createElement, "min", setting.min ? setting.min : false), _defineProperty(_React$createElement, "max", setting.max ? setting.max : false), _defineProperty(_React$createElement, "btnType", setting.btnType), _defineProperty(_React$createElement, "inline", setting.inline), _defineProperty(_React$createElement, "url", setting.url), _defineProperty(_React$createElement, "earlyReturn", setting.earlyReturn ? true : false), _defineProperty(_React$createElement, "classes", setting.classes ? setting.classes : ''), _defineProperty(_React$createElement, "autoComplete", setting.autoComplete ? true : false), _React$createElement)); }); }); @@ -148881,6 +148923,13 @@ var SettingsTabs = /*#__PURE__*/function (_Component) { save: _this.save }); + case 'InfluxDB': + return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(_tabs_InfluxDBSettings__WEBPACK_IMPORTED_MODULE_14__["default"], { + data: data.influxdb, + generateInputs: _this.generateInputs, + save: _this.save + }); + case 'Reset': return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(_tabs_ResetSettings__WEBPACK_IMPORTED_MODULE_6__["default"], { data: data.healthchecks, @@ -149356,6 +149405,115 @@ if (document.getElementById('HealthchecksSettings')) { /***/ }), +/***/ "./resources/js/components/Settings/tabs/InfluxDBSettings.js": +/*!*******************************************************************!*\ + !*** ./resources/js/components/Settings/tabs/InfluxDBSettings.js ***! + \*******************************************************************/ +/*! exports provided: default */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return InfluxDBSettings; }); +/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js"); +/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__); +/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-dom */ "./node_modules/react-dom/index.js"); +/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_dom__WEBPACK_IMPORTED_MODULE_1__); +/* harmony import */ var react_bootstrap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-bootstrap */ "./node_modules/react-bootstrap/esm/index.js"); +/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js"); +/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_3__); +function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } + +function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + +function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } + +function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } + +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } + +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + + + + + + +var InfluxDBSettings = /*#__PURE__*/function (_Component) { + _inherits(InfluxDBSettings, _Component); + + var _super = _createSuper(InfluxDBSettings); + + function InfluxDBSettings(props) { + var _this; + + _classCallCheck(this, InfluxDBSettings); + + _this = _super.call(this, props); + + _defineProperty(_assertThisInitialized(_this), "inputHandler", function (name, val) { + var settings = _this.state.data; + var i = 0; + settings.forEach(function (ele) { + if (ele.obj.name == name) { + ele.obj.value = val; + } + + settings[i] = ele; + i++; + }); + + _this.setState({ + data: settings + }); + }); + + _this.state = { + data: _this.props.data + }; + return _this; + } + + _createClass(InfluxDBSettings, [{ + key: "render", + value: function render() { + var _this2 = this; + + var settings = this.props.generateInputs(this.state.data, this.inputHandler); + return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react_bootstrap__WEBPACK_IMPORTED_MODULE_2__["Tab"].Content, null, settings, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", { + className: "mt-3" + }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", { + className: "btn btn-primary", + onClick: function onClick() { + _this2.props.save(_this2.state.data, 'healthchecks.io'); + } + }, "Save"))); + } + }]); + + return InfluxDBSettings; +}(react__WEBPACK_IMPORTED_MODULE_0__["Component"]); + + + +if (document.getElementById('InfluxDBSettings')) { + react_dom__WEBPACK_IMPORTED_MODULE_1___default.a.render( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(InfluxDBSettings, null), document.getElementById('InfluxDBSettings')); +} + +/***/ }), + /***/ "./resources/js/components/Settings/tabs/NotificationsSettings.js": /*!************************************************************************!*\ !*** ./resources/js/components/Settings/tabs/NotificationsSettings.js ***! diff --git a/resources/js/components/Settings/SettingsIndex.js b/resources/js/components/Settings/SettingsIndex.js index ddd5c8cf..0733e7d2 100644 --- a/resources/js/components/Settings/SettingsIndex.js +++ b/resources/js/components/Settings/SettingsIndex.js @@ -259,7 +259,35 @@ export default class SettingsIndex extends Component { classes: 'mr-2' }, - ] + ], + influxdb: [ + { + obj: data.influx_db_enabled, + type: 'checkbox' + }, + { + obj: data.influx_db_host, + type: 'text' + }, + { + obj: data.influx_db_port, + type: 'number' + }, + { + obj: data.influx_db_database, + type: 'text' + }, + { + obj: data.influx_db_username, + type: 'text', + autoComplete: false, + }, + { + obj: data.influx_db_password, + type: 'password', + autoComplete: false, + } + ], }; } diff --git a/resources/js/components/Settings/SettingsInput.js b/resources/js/components/Settings/SettingsInput.js index 464edd3c..2d11f9f6 100644 --- a/resources/js/components/Settings/SettingsInput.js +++ b/resources/js/components/Settings/SettingsInput.js @@ -24,6 +24,7 @@ export default class SettingsInput extends Component { inline: this.props.inline ? 'd-inline-block' : 'd-block', btnType: this.props.btnType, earlyReturn: this.props.earlyReturn ? true : false, + autoComplete: String(this.props.autoComplete ? true : Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 7)), } } @@ -72,7 +73,8 @@ export default class SettingsInput extends Component { disabled={disabled} min={this.state.min} max={this.state.max} - onInput={this.handleInput} /> + onInput={this.handleInput} + autoComplete={this.state.autoComplete} /> } generateSelectInput(disabled) { @@ -109,7 +111,18 @@ export default class SettingsInput extends Component { type={this.state.type} defaultValue={this.state.value} disabled={disabled} - onInput={this.handleInput} /> + onInput={this.handleInput} + autoComplete={this.state.autoComplete} /> + } + + generatePasswordInput(disabled) { + return } generateButtonGetInput() { @@ -146,6 +159,10 @@ export default class SettingsInput extends Component { input = this.generateTextInput(disabled); } + if(this.state.type === 'password') { + input = this.generatePasswordInput(disabled); + } + if(this.state.type === 'btn-get') { input = this.generateButtonGetInput(); } diff --git a/resources/js/components/Settings/SettingsTabs.js b/resources/js/components/Settings/SettingsTabs.js index d4721dac..59dc4cba 100644 --- a/resources/js/components/Settings/SettingsTabs.js +++ b/resources/js/components/Settings/SettingsTabs.js @@ -12,6 +12,7 @@ import HealthchecksSettings from './tabs/HealthchecksSettings'; import NotificationsSettings from './tabs/NotificationsSettings'; import Authentication from '../Authentication/Authentication'; import TableSettings from './tabs/TableSettings'; +import InfluxDBSettings from './tabs/InfluxDBSettings'; export default class SettingsTabs extends Component { constructor(props) { @@ -30,6 +31,7 @@ export default class SettingsTabs extends Component { 'Tables', 'Notifications', 'healthchecks.io', + 'InfluxDB', 'Reset', 'Backup/Restore', ]; @@ -105,6 +107,7 @@ export default class SettingsTabs extends Component { url={setting.url} earlyReturn={setting.earlyReturn ? true : false} classes={setting.classes ? setting.classes : ''} + autoComplete={setting.autoComplete ? true : false} /> }) } @@ -138,6 +141,11 @@ export default class SettingsTabs extends Component { data={data.healthchecks} generateInputs={this.generateInputs} save={this.save} /> + case 'InfluxDB': + return case 'Reset': return { + var settings = this.state.data; + var i = 0; + settings.forEach(ele => { + if(ele.obj.name == name) { + ele.obj.value = val; + } + settings[i] = ele; + i++; + }); + this.setState({ + data: settings + }); + } + + render() { + var settings = this.props.generateInputs(this.state.data, this.inputHandler); + + return ( + +
{ e.preventDefault() }} autoComplete="off"> + + + {settings} +
+
+ +
+ + ); + } +} + +if (document.getElementById('InfluxDBSettings')) { + ReactDOM.render(, document.getElementById('InfluxDBSettings')); +} diff --git a/routes/api.php b/routes/api.php index 939628e3..8970db36 100644 --- a/routes/api.php +++ b/routes/api.php @@ -7,7 +7,7 @@ use App\Http\Controllers\HomepageDataController; use App\Http\Controllers\SettingsController; use App\Http\Controllers\SpeedtestController; use App\Http\Controllers\UpdateController; -use App\Speedtest; +use App\Models\Speedtest; use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; diff --git a/tests/Feature/APISpeedtestTest.php b/tests/Feature/APISpeedtestTest.php index fa13e7d0..4c40ca10 100644 --- a/tests/Feature/APISpeedtestTest.php +++ b/tests/Feature/APISpeedtestTest.php @@ -2,7 +2,7 @@ namespace Tests\Feature; -use App\Speedtest; +use App\Models\Speedtest; use Faker\Factory; use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\WithFaker; diff --git a/tests/Feature/SpeedtestTest.php b/tests/Feature/SpeedtestTest.php index 4efc6e17..e3560a20 100644 --- a/tests/Feature/SpeedtestTest.php +++ b/tests/Feature/SpeedtestTest.php @@ -3,14 +3,28 @@ namespace Tests\Feature; use App\Helpers\SpeedtestHelper; +use App\Interfaces\SpeedtestProvider; use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\WithFaker; +use Tests\Mocks\OoklaTesterMocker; use Tests\TestCase; class SpeedtestTest extends TestCase { use RefreshDatabase; + public function setUp(): void + { + parent::setUp(); + + $this->app->singleton( + SpeedtestProvider::class, + function () { + return new OoklaTesterMocker(); + } + ); + } + /** * Runs a speedtest * diff --git a/tests/Feature/Utils/InfluxDB/InfluxDBWrapperWrapperTest.php b/tests/Feature/Utils/InfluxDB/InfluxDBWrapperWrapperTest.php new file mode 100644 index 00000000..2ccdc5e8 --- /dev/null +++ b/tests/Feature/Utils/InfluxDB/InfluxDBWrapperWrapperTest.php @@ -0,0 +1,26 @@ +expectException(InfluxDBNotEnabledException::class); + + InfluxDB::connect(); + } +} diff --git a/tests/Mocks/OoklaTesterMocker.php b/tests/Mocks/OoklaTesterMocker.php new file mode 100644 index 00000000..035696c3 --- /dev/null +++ b/tests/Mocks/OoklaTesterMocker.php @@ -0,0 +1,59 @@ +passes = $passes; + } + + public function run($output = null): Speedtest + { + $output = $output ?? $this->output(); + + try { + $output = json_decode($output, true, 512, JSON_THROW_ON_ERROR); + } catch (Exception $e) { + throw new SpeedtestFailureException(); + } + + return $this->passes + ? Speedtest::factory()->create() + : Speedtest::factory()->create([ + 'download' => 0, + 'upload' => 0, + 'ping' => 0, + 'failed' => true, + ]); + } + + public function output() + { + return !$this->passes + ? null + : json_encode([ + 'type' => 'result', + 'download' => ['bandwidth' => '50'], + 'upload' => ['bandwidth' => '50'], + 'ping' => ['latency' => '50'], + 'server' => [ + 'id' => '1', + 'name' => 'PHPUnit', + 'host' => 'phpunit', + 'port' => '443', + ], + 'result' => [ + 'url' => 'some-url', + ] + ]); + } +} diff --git a/tests/Unit/Controllers/SpeedtestController/DeleteTest.php b/tests/Unit/Controllers/SpeedtestController/DeleteTest.php index 00e1ed95..4265c184 100644 --- a/tests/Unit/Controllers/SpeedtestController/DeleteTest.php +++ b/tests/Unit/Controllers/SpeedtestController/DeleteTest.php @@ -3,7 +3,7 @@ namespace Tests\Unit\Controllers\SpeedtestController; use App\Http\Controllers\SpeedtestController; -use App\Speedtest; +use App\Models\Speedtest; use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; diff --git a/tests/Unit/Controllers/SpeedtestController/LatestTest.php b/tests/Unit/Controllers/SpeedtestController/LatestTest.php index af7209cd..f1e18b53 100644 --- a/tests/Unit/Controllers/SpeedtestController/LatestTest.php +++ b/tests/Unit/Controllers/SpeedtestController/LatestTest.php @@ -3,7 +3,7 @@ namespace Tests\Unit\Controllers\SpeedtestController; use App\Http\Controllers\SpeedtestController; -use App\Speedtest; +use App\Models\Speedtest; use DB; use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; diff --git a/tests/Unit/Helpers/SpeedtestHelper/AbsoluteThresholdTest.php b/tests/Unit/Helpers/SpeedtestHelper/AbsoluteThresholdTest.php index f257f6ff..b372dc50 100644 --- a/tests/Unit/Helpers/SpeedtestHelper/AbsoluteThresholdTest.php +++ b/tests/Unit/Helpers/SpeedtestHelper/AbsoluteThresholdTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper; use App\Helpers\SettingsHelper; use App\Helpers\SpeedtestHelper; -use App\Speedtest; +use App\Models\Speedtest; use Illuminate\Foundation\Testing\RefreshDatabase; use InvalidArgumentException; use Tests\TestCase; diff --git a/tests/Unit/Helpers/SpeedtestHelper/CheckOutputTest.php b/tests/Unit/Helpers/SpeedtestHelper/CheckOutputTest.php index d017cb7b..febf818f 100644 --- a/tests/Unit/Helpers/SpeedtestHelper/CheckOutputTest.php +++ b/tests/Unit/Helpers/SpeedtestHelper/CheckOutputTest.php @@ -4,6 +4,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper; use App\Utils\OoklaTester; use PHPUnit\Framework\TestCase; +use Tests\Mocks\OoklaTesterMocker; class CheckOutputTest extends TestCase { @@ -12,6 +13,7 @@ class CheckOutputTest extends TestCase public function setUp(): void { $this->speedtestProvider = new OoklaTester(); + $this->mocker = new OoklaTesterMocker(); } /** diff --git a/tests/Unit/Helpers/SpeedtestHelper/FailureRateTest.php b/tests/Unit/Helpers/SpeedtestHelper/FailureRateTest.php index fe32692e..50ab4332 100644 --- a/tests/Unit/Helpers/SpeedtestHelper/FailureRateTest.php +++ b/tests/Unit/Helpers/SpeedtestHelper/FailureRateTest.php @@ -3,7 +3,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper; use App\Helpers\SpeedtestHelper; -use App\Speedtest; +use App\Models\Speedtest; use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; diff --git a/tests/Unit/Helpers/SpeedtestHelper/PercentageThresholdTest.php b/tests/Unit/Helpers/SpeedtestHelper/PercentageThresholdTest.php index 2ac63c27..d3ab232a 100644 --- a/tests/Unit/Helpers/SpeedtestHelper/PercentageThresholdTest.php +++ b/tests/Unit/Helpers/SpeedtestHelper/PercentageThresholdTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper; use App\Helpers\SettingsHelper; use App\Helpers\SpeedtestHelper; -use App\Speedtest; +use App\Models\Speedtest; use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; diff --git a/tests/Unit/Helpers/SpeedtestHelper/SpeedtestTest.php b/tests/Unit/Helpers/SpeedtestHelper/SpeedtestTest.php index 9c5db28f..7e4670bb 100644 --- a/tests/Unit/Helpers/SpeedtestHelper/SpeedtestTest.php +++ b/tests/Unit/Helpers/SpeedtestHelper/SpeedtestTest.php @@ -6,6 +6,7 @@ use App\Exceptions\SpeedtestFailureException; use App\Helpers\SpeedtestHelper; use App\Utils\OoklaTester; use Illuminate\Foundation\Testing\RefreshDatabase; +use Tests\Mocks\OoklaTesterMocker; use Tests\TestCase; class SpeedtestTest extends TestCase @@ -22,17 +23,7 @@ class SpeedtestTest extends TestCase $this->speedtestProvider = new OoklaTester(); - $this->output = $this->speedtestProvider->output(); - } - - /** - * A basic unit test example. - * - * @return void - */ - public function testOutputFunction() - { - $this->assertJson($this->output); + $this->output = (new OoklaTesterMocker())->output(); } /** diff --git a/tests/Unit/Listeners/SpeedtestCompleteListener/SlackTest.php b/tests/Unit/Listeners/SpeedtestCompleteListener/SlackTest.php index 65708a8e..72b94ffb 100644 --- a/tests/Unit/Listeners/SpeedtestCompleteListener/SlackTest.php +++ b/tests/Unit/Listeners/SpeedtestCompleteListener/SlackTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestCompleteListener; use App\Helpers\SettingsHelper; use App\Listeners\SpeedtestCompleteListener; -use App\Speedtest; +use App\Models\Speedtest; use Exception; use Illuminate\Foundation\Testing\RefreshDatabase; use stdClass; diff --git a/tests/Unit/Listeners/SpeedtestCompleteListener/TelegramTest.php b/tests/Unit/Listeners/SpeedtestCompleteListener/TelegramTest.php index 8c37051b..17fd28a2 100644 --- a/tests/Unit/Listeners/SpeedtestCompleteListener/TelegramTest.php +++ b/tests/Unit/Listeners/SpeedtestCompleteListener/TelegramTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestCompleteListener; use App\Helpers\SettingsHelper; use App\Listeners\SpeedtestCompleteListener; -use App\Speedtest; +use App\Models\Speedtest; use Exception; use Illuminate\Foundation\Testing\RefreshDatabase; use stdClass; diff --git a/tests/Unit/Listeners/SpeedtestFailedListener/SlackTest.php b/tests/Unit/Listeners/SpeedtestFailedListener/SlackTest.php index fea50dc1..1ab96fda 100644 --- a/tests/Unit/Listeners/SpeedtestFailedListener/SlackTest.php +++ b/tests/Unit/Listeners/SpeedtestFailedListener/SlackTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestFailedListener; use App\Helpers\SettingsHelper; use App\Listeners\SpeedtestFailedListener; -use App\Speedtest; +use App\Models\Speedtest; use Exception; use Illuminate\Foundation\Testing\RefreshDatabase; use stdClass; diff --git a/tests/Unit/Listeners/SpeedtestFailedListener/TelegramTest.php b/tests/Unit/Listeners/SpeedtestFailedListener/TelegramTest.php index 2e273738..f437abe5 100644 --- a/tests/Unit/Listeners/SpeedtestFailedListener/TelegramTest.php +++ b/tests/Unit/Listeners/SpeedtestFailedListener/TelegramTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestFailedListener; use App\Helpers\SettingsHelper; use App\Listeners\SpeedtestFailedListener; -use App\Speedtest; +use App\Models\Speedtest; use Exception; use Illuminate\Foundation\Testing\RefreshDatabase; use stdClass; diff --git a/tests/Unit/Listeners/SpeedtestOverviewListener/SlackTest.php b/tests/Unit/Listeners/SpeedtestOverviewListener/SlackTest.php index 8e471aa0..aa88395c 100644 --- a/tests/Unit/Listeners/SpeedtestOverviewListener/SlackTest.php +++ b/tests/Unit/Listeners/SpeedtestOverviewListener/SlackTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestOverviewListener; use App\Helpers\SettingsHelper; use App\Listeners\SpeedtestOverviewListener; -use App\Speedtest; +use App\Models\Speedtest; use Exception; use Illuminate\Foundation\Testing\RefreshDatabase; use stdClass; diff --git a/tests/Unit/Listeners/SpeedtestOverviewListener/TelegramTest.php b/tests/Unit/Listeners/SpeedtestOverviewListener/TelegramTest.php index fb841e03..001e0189 100644 --- a/tests/Unit/Listeners/SpeedtestOverviewListener/TelegramTest.php +++ b/tests/Unit/Listeners/SpeedtestOverviewListener/TelegramTest.php @@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestOverviewListener; use App\Helpers\SettingsHelper; use App\Listeners\SpeedtestOverviewListener; -use App\Speedtest; +use App\Models\Speedtest; use Exception; use Illuminate\Foundation\Testing\RefreshDatabase; use stdClass;