From 71c50537d1e7299d39105453efbbd68b38e2f94b Mon Sep 17 00:00:00 2001
From: Chris Penny <chris.penny@gmail.com>
Date: Thu, 2 Mar 2023 07:55:16 +1300
Subject: [PATCH] Enable JS test. Ignore linting. Add sample-test.js

---
 .eslintignore                   |  3 +--
 .github/workflows/main.yml      |  2 --
 client/src/tests/sample-test.js |  8 ++++++++
 phpunit.xml.dist                | 23 ++++++++++++-----------
 4 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 client/src/tests/sample-test.js

diff --git a/.eslintignore b/.eslintignore
index 81943c37..684bec4c 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,2 +1 @@
-client/dist/
-client/lang/
+client/
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2e6906d0..2004851c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,5 +8,3 @@ on:
 jobs:
   ci:
     uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
-    with:
-      js: false
diff --git a/client/src/tests/sample-test.js b/client/src/tests/sample-test.js
new file mode 100644
index 00000000..d6511e67
--- /dev/null
+++ b/client/src/tests/sample-test.js
@@ -0,0 +1,8 @@
+/* global jest, describe, it, expect */
+
+describe('sample tests', () => {
+  it('sample test', () => {
+    const css = 'sample css';
+    expect(css).toBe('sample css');
+  });
+});
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2dbbe210..2fdf2b19 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,16 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/silverstripe/cms/tests/bootstrap.php"
+         colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage includeUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+        <exclude>
+            <directory suffix=".php">tests/</directory>
+        </exclude>
+    </coverage>
     <testsuites>
         <testsuite name="Default">
-            <directory>tests</directory>
+            <directory>tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src/</directory>
-            <exclude>
-                <directory suffix=".php">tests/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
 </phpunit>