Skip to content

Commit 42fb5e4

Browse files
authored
Revert "Fix mariadb services" (#24)
* Revert "Fix mariadb services (#23)" This reverts commit 905ac10. * Add typesense to tests again
1 parent 905ac10 commit 42fb5e4

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

routes/web.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
'mysql',
1515
'pgsql',
1616
'mariadb',
17-
'mariadb10',
18-
'mariadb11',
1917
'redis',
2018
'memcached',
2119
'meilisearch',
@@ -30,11 +28,6 @@
3028

3129
$with = array_unique(explode(',', $request->query('with', 'mysql,redis,meilisearch,mailpit,selenium')));
3230

33-
if(in_array('mariadb', $with)) {
34-
$with = array_diff($with, ['mariadb']);
35-
$with[] = 'mariadb11';
36-
}
37-
3831
try {
3932
Validator::validate(
4033
[

tests/Feature/SailServerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,22 @@ public function test_it_does_not_accept_empty_with_query_when_present()
8989
$response = $this->get('/example-app?with');
9090

9191
$response->assertStatus(400);
92-
$response->assertSee('Invalid service name. Please provide one or more of the supported services (mysql, pgsql, mariadb, mariadb10, mariadb11, redis, memcached, meilisearch, typesense, minio, mailpit, selenium, soketi) or "none".', false);
92+
$response->assertSee('Invalid service name. Please provide one or more of the supported services (mysql, pgsql, mariadb, redis, memcached, meilisearch, typesense, minio, mailpit, selenium, soketi) or "none".', false);
9393
}
9494

9595
public function test_it_does_not_accept_invalid_services()
9696
{
9797
$response = $this->get('/example-app?with=redis,invalid_service_name');
9898

9999
$response->assertStatus(400);
100-
$response->assertSee('Invalid service name. Please provide one or more of the supported services (mysql, pgsql, mariadb, mariadb10, mariadb11, redis, memcached, meilisearch, typesense, minio, mailpit, selenium, soketi) or "none".', false);
100+
$response->assertSee('Invalid service name. Please provide one or more of the supported services (mysql, pgsql, mariadb, redis, memcached, meilisearch, typesense, minio, mailpit, selenium, soketi) or "none".', false);
101101
}
102102

103103
public function test_it_does_not_accept_none_with_other_services()
104104
{
105105
$response = $this->get('/example-app?with=none,redis');
106106

107107
$response->assertStatus(400);
108-
$response->assertSee('Invalid service name. Please provide one or more of the supported services (mysql, pgsql, mariadb, mariadb10, mariadb11, redis, memcached, meilisearch, typesense, minio, mailpit, selenium, soketi) or "none".', false);
108+
$response->assertSee('Invalid service name. Please provide one or more of the supported services (mysql, pgsql, mariadb, redis, memcached, meilisearch, typesense, minio, mailpit, selenium, soketi) or "none".', false);
109109
}
110110
}

0 commit comments

Comments
 (0)