From 715e8d781c59667f3660ce3cbe703c7e3f32666c Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 12 Mar 2021 20:53:40 +0900
Subject: [PATCH] Clean up references to travis in all tests

---
 .github/workflows/ci.yml               | 10 +++-------
 modules/install/install.controller.php |  2 +-
 tests/install.suite.dist.yml           | 21 ++++-----------------
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b2688929d..eb9897207 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,14 +16,10 @@ jobs:
       with:
         php-version: ${{ matrix.php }}
     
-    - name: Start MySQL
-      run: sudo systemctl start mysql.service
-    
-    - name: Create MySQL database and user
+    - name: Start MySQL and create database
       run: |
+        sudo systemctl start mysql.service
         sudo mysql -uroot -proot -e "CREATE DATABASE rhymix CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci"
-        sudo mysql -uroot -proot -e "CREATE USER travis@localhost IDENTIFIED WITH mysql_native_password BY 'travis'"
-        sudo mysql -uroot -proot -e "GRANT ALL PRIVILEGES ON rhymix.* TO travis@localhost; FLUSH PRIVILEGES"
 
     - name: PHP Lint
       run: if find . -name "*.php" ! -path "./vendor/*" -print0 | xargs -0 -n 1 -P 8 php -l | grep -v "No syntax errors detected"; then exit 1; fi
@@ -42,4 +38,4 @@ jobs:
     - name: Build and run codeception
       run: |
         php codecept.phar build
-        php codecept.phar run --debug --fail-fast --env travis
+        php codecept.phar run --debug --fail-fast
diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index 7e6f881ee..a529e9793 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -33,7 +33,7 @@ class installController extends install
 		$config = Context::gets('db_type', 'db_host', 'db_port', 'db_user', 'db_pass', 'db_database', 'db_prefix');
 		
 		// Disallow installation using the root account.
-		if (trim($config->db_user) === 'root')
+		if (trim($config->db_user) === 'root' && !preg_match('/Development Server$/', $_SERVER['SERVER_SOFTWARE']))
 		{
 			return new BaseObject(-1, 'msg_dbroot_disallowed');
 		}
diff --git a/tests/install.suite.dist.yml b/tests/install.suite.dist.yml
index a414f8974..147996603 100644
--- a/tests/install.suite.dist.yml
+++ b/tests/install.suite.dist.yml
@@ -8,23 +8,10 @@ modules:
                 CURLOPT_TIMEOUT: 180
         DbDropTablesHelper:
             dsn: 'mysql:host=localhost;dbname=rhymix'
-            user: 'travis'
-            password: 'travis'
+            user: 'root'
+            password: 'root'
         Db:
             dsn: 'mysql:host=localhost;dbname=rhymix'
-            user: 'travis'
-            password: 'travis'
+            user: 'root'
+            password: 'root'
             cleanup: true
-env:
-    travis:
-        modules:
-            config:
-                Db:
-                    dsn: 'mysql:host=localhost;dbname=rhymix'
-                    user: 'travis'
-                    password: 'travis'
-                    cleanup: true
-                DbDropTablesHelper:
-                    dsn: 'mysql:host=localhost;dbname=rhymix'
-                    user: 'travis'
-                    password: 'travis'