Revert "Fix mariadb services" (#24)

* Revert "Fix mariadb services (#23)" This reverts commit 905ac10. * Add typesense to tests again
laravel · Jul 23, 2024 · 42fb5e4 · 42fb5e4
1 parent 905ac10
commit 42fb5e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/routes/web.php b/routes/web.php
@@ -14,8 +14,6 @@
         'mysql',
         'pgsql',
         'mariadb',
-        'mariadb10',
-        'mariadb11',
         'redis',
         'memcached',
         'meilisearch',
@@ -30,11 +28,6 @@
 
     $with = array_unique(explode(',', $request->query('with', 'mysql,redis,meilisearch,mailpit,selenium')));
 
-    if(in_array('mariadb', $with)) {
-        $with = array_diff($with, ['mariadb']);
-        $with[] = 'mariadb11';
-    }
-
     try {
         Validator::validate(
             [

diff --git a/tests/Feature/SailServerTest.php b/tests/Feature/SailServerTest.php
@@ -89,22 +89,22 @@ public function test_it_does_not_accept_empty_with_query_when_present()
         $response = $this->get('/example-app?with');
 
         $response->assertStatus(400);
-        $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);
+        $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);
     }
 
     public function test_it_does_not_accept_invalid_services()
     {
         $response = $this->get('/example-app?with=redis,invalid_service_name');
 
         $response->assertStatus(400);
-        $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);
+        $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);
     }
 
     public function test_it_does_not_accept_none_with_other_services()
     {
         $response = $this->get('/example-app?with=none,redis');
 
         $response->assertStatus(400);
-        $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);
+        $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);
     }
 }