From 54a57d3ca9a4e39bc89546d91a3f49254ac8491b Mon Sep 17 00:00:00 2001
From: undefined <masnn0@outlook.com>
Date: Mon, 10 Aug 2020 18:51:07 +0800
Subject: [PATCH] add tests

---
 .eslintignore                            |  3 ++-
 .github/workflows/build.yml              |  2 +-
 .gitignore                               |  4 +++-
 jest.config.js                           |  5 ++---
 package.json                             |  3 ++-
 packages/hydrooj/package.json            |  2 +-
 packages/hydrooj/src/entry/setup.ts      | 10 ++--------
 packages/hydrooj/test/lib.pwhash.spec.ts | 14 ++++++++++++++
 8 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 packages/hydrooj/test/lib.pwhash.spec.ts

diff --git a/.eslintignore b/.eslintignore
index a1ca3511..c927bbe0 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,4 @@
 dist
 *.d.ts
-*.js
\ No newline at end of file
+*.js
+test
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 007d6ff9..ee3dc794 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
       uses: codecov/codecov-action@v1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./coverage/lcov.info
+        file: ./.coverage/lcov.info
         name: codecov
     - name: Publish
       run: node build/publish.js
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index f65a932f..eb6a7a10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,6 @@ packages/**/*.js
 packages/**/*.js.map
 packages/**/*.d.ts
 
-*.mmdb
\ No newline at end of file
+*.mmdb
+
+.coverage
\ No newline at end of file
diff --git a/jest.config.js b/jest.config.js
index dd1f2dfb..6880d4e2 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -9,9 +9,8 @@ module.exports = {
     preset: 'ts-jest',
     testEnvironment: 'node',
     moduleFileExtensions: ['ts', 'js', 'json'],
-    moduleNameMapper: {
-        '[\\w-]+': '<rootDir>/packages/$0/src',
-    },
+    collectCoverage: true,
+    coverageDirectory: '<rootDir>/.coverage',
     coverageProvider: 'v8',
     coverageReporters: ['text', 'lcov'],
     coveragePathIgnorePatterns: [
diff --git a/package.json b/package.json
index 44f5effd..30b60859 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "license": "AGPL-3.0-only",
     "devDependencies": {
         "@types/cross-spawn": "^6.0.2",
+        "@types/jest": "^26.0.9",
         "@types/node": "^14.0.27",
         "@typescript-eslint/eslint-plugin": "^3.8.0",
         "@typescript-eslint/parser": "^3.8.0",
@@ -36,4 +37,4 @@
         "fs-extra": "^9.0.1",
         "yargs": "^15.4.1"
     }
-}
\ No newline at end of file
+}
diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index 2f5bfcc7..9118e9d9 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.12.11",
+    "version": "2.12.12",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",
diff --git a/packages/hydrooj/src/entry/setup.ts b/packages/hydrooj/src/entry/setup.ts
index 3a1cb31f..1835f307 100644
--- a/packages/hydrooj/src/entry/setup.ts
+++ b/packages/hydrooj/src/entry/setup.ts
@@ -52,12 +52,6 @@ class Loader {
                         <input name="name" type="text" value="hydro">
                       </label>
                     </div></div>
-                    <div class="row"><div class="columns">
-                      <label class="inverse material textbox">
-                        {{ _('Table Prefix') }}
-                        <input name="prefix" type="text" placeholder="{{ _('Leave blank if none') }}">>
-                      </label>
-                    </div></div>
                     <div class="row"><div class="columns">
                       <label class="inverse material textbox">
                         {{ _('Database Username') }}
@@ -109,7 +103,7 @@ async function get(ctx: Context) {
 
 async function post(ctx: Context) {
     const {
-        host, port, name, username, password, prefix,
+        host, port, name, username, password,
     } = ctx.request.body;
     let mongourl = 'mongodb://';
     if (username) mongourl += `${username}:${password}@`;
@@ -119,7 +113,7 @@ async function post(ctx: Context) {
             useNewUrlParser: true, useUnifiedTopology: true,
         });
         const db = Database.db(name);
-        const coll = prefix ? db.collection('system') : db.collection(`${prefix}.system`);
+        const coll = db.collection('system');
         await Promise.all([
             coll.updateOne(
                 { _id: 'server.host' },
diff --git a/packages/hydrooj/test/lib.pwhash.spec.ts b/packages/hydrooj/test/lib.pwhash.spec.ts
new file mode 100644
index 00000000..94b817cb
--- /dev/null
+++ b/packages/hydrooj/test/lib.pwhash.spec.ts
@@ -0,0 +1,14 @@
+import 'hydrooj';
+import pwhash from 'hydrooj/src/lib/hash.hydro';
+import 'hydrooj/src/utils';
+
+describe('Hash', () => {
+    test('server', () => {
+        const password1 = 'password1';
+        const salt1 = '0326Bc23E6fac733K01g29fBBUSAj7O4';
+        const salt2 = String.random(32);
+        const hash1 = '70a2db6a53ecd75d8d4b19d8647a416b4e812c1a6635c4a1f5069a00382fdcb6';
+        expect(pwhash(password1, salt1)).toStrictEqual(hash1);
+        expect(pwhash(password1, salt2)).not.toEqual(hash1);
+    });
+});