Merge pull request #799 from ltb-project/update-phpunit

Update phpunit
ltb-project · Sep 15, 2023 · f8c6e00 · f8c6e00
2 parents 76c96d5 + ca530ec
commit f8c6e00
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,17 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build-test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: PHPUnit Tests for php7.4
+      uses: php-actions/phpunit@v3
+      with:
+        configuration: tests/phpunit.xml
+        version: 5.7.25
+        php_version: 7.4
+        args: --coverage-text
diff --git a/lang/ca.inc.php b/lang/ca.inc.php
@@ -1,5 +1,4 @@
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"></head><body><pre>&lt;?php
+<?php
 #==============================================================================
 # LTB Self Service Password
 #
@@ -158,4 +157,4 @@
 $messages['badquality'] = "La qualitat de la contrasenya és molt baixa";
 $messages['tooyoung'] = "La contrasenya s'ha canviat massa recentment";
 $messages['inhistory'] = "La contresenya es troba dins l'històric de les contrasenyes antigues";
-</pre></body></html>
+$messages['invalidsshkey'] = "Input SSH Key looks invalid";
diff --git a/lang/it.inc.php b/lang/it.inc.php
@@ -152,3 +152,4 @@
 $messages['badquality'] = "La qualità della password è troppo bassa";
 $messages['tooyoung'] = "La password è stata cambiata troppo di recente";
 $messages['inhistory'] = "La password è nello storico delle precedenti";
+$messages['invalidsshkey'] = "Input SSH Key looks invalid";
diff --git a/tests/CheckPasswordTest.php b/tests/CheckPasswordTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__ . '/../lib/vendor/defuse-crypto.phar';
 
-class CheckPasswordTest extends \PHPUnit_Framework_TestCase
+class CheckPasswordTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test check_password_strength function

diff --git a/tests/CheckSshkeyTest.php b/tests/CheckSshkeyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class CheckSshkeyTest extends \PHPUnit_Framework_TestCase
+class CheckSshkeyTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test check_sshkey function

diff --git a/tests/CryptoTest.php b/tests/CryptoTest.php
@@ -3,7 +3,7 @@
 require_once __DIR__ . '/../lib/vendor/defuse-crypto.phar';
 require_once __DIR__ . '/../lib/functions.inc.php';
 
-class CryptoTest extends \PHPUnit_Framework_TestCase
+class CryptoTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test encrypt and decrypt functions

diff --git a/tests/HookTest.php b/tests/HookTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class HookTest extends \PHPUnit_Framework_TestCase
+class HookTest extends \PHPUnit\Framework\TestCase
 {
     public function testCommand()
     {

diff --git a/tests/LangTest.php b/tests/LangTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class LangTest extends \PHPUnit_Framework_TestCase
+class LangTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test language files for missing and excess translations

diff --git a/tests/phpunit.xml b/tests/phpunit.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+	<testsuites>
+		<testsuite name="main">
+			<directory suffix="Test.php">.</directory>
+		</testsuite>
+	</testsuites>
+	<logging/>
+</phpunit>