mirror of
https://github.com/mCaptcha/mCaptcha.git
synced 2025-03-14 13:08:27 +03:00
addlevel and getlevel tests
This commit is contained in:
parent
30f457ca43
commit
6069509504
10 changed files with 199 additions and 10 deletions
|
@ -90,8 +90,8 @@ pub fn services(cfg: &mut web::ServiceConfig) {
|
|||
);
|
||||
}
|
||||
|
||||
// TODO try for non-existent token names
|
||||
|
||||
// TODO redo mcaptcha table to include levels as json field
|
||||
// so that the whole thing can be added/udpaed in a single stroke
|
||||
async fn add_levels(
|
||||
payload: web::Json<AddLevels>,
|
||||
data: web::Data<Data>,
|
||||
|
|
|
@ -47,7 +47,7 @@ const login = async (e: Event) => {
|
|||
password,
|
||||
};
|
||||
|
||||
const formUrl = getFormUrl(null);
|
||||
const formUrl = getFormUrl();
|
||||
|
||||
const res = await fetch(formUrl, genJsonPayload(payload));
|
||||
if (res.ok) {
|
||||
|
|
|
@ -67,7 +67,7 @@ const registerUser = async (e: Event) => {
|
|||
confirm_password: passwordCheck,
|
||||
email,
|
||||
};
|
||||
const formUrl = getFormUrl(null);
|
||||
const formUrl = getFormUrl();
|
||||
|
||||
const res = await fetch(formUrl, genJsonPayload(payload));
|
||||
if (res.ok) {
|
||||
|
|
|
@ -24,7 +24,6 @@ import {
|
|||
} from './removeLevelButton';
|
||||
import CONST from './const';
|
||||
|
||||
const ADD_LEVEL_BUTTON = 'sitekey-form__level-add-level-button';
|
||||
|
||||
/**
|
||||
* Gets executed when 'Add' Button is clicked to add levels
|
||||
|
@ -60,8 +59,8 @@ const addLevel = (e: Event) => {
|
|||
|
||||
/** adds onclick event listener */
|
||||
const addLevelButtonAddEventListener = () => {
|
||||
let addLevelButton = <HTMLElement>(
|
||||
document.querySelector(`.${ADD_LEVEL_BUTTON}`)
|
||||
const addLevelButton = <HTMLElement>(
|
||||
document.querySelector(`.${CONST.ADD_LEVEL_BUTTON}`)
|
||||
);
|
||||
addLevelButton.addEventListener('click', addLevel);
|
||||
};
|
||||
|
|
|
@ -31,6 +31,8 @@ const LEGEND_CLASS = 'sitekey__level-title';
|
|||
const REMOVE_LEVEL_BUTTON_ID_WITHOUT_LEVEL = 'remove-level';
|
||||
const REMOVE_LEVEL_LABEL_TEXT = "Remove Level";
|
||||
|
||||
const ADD_LEVEL_BUTTON = 'sitekey-form__level-add-level-button';
|
||||
|
||||
const CONST = {
|
||||
LABEL_CLASS,
|
||||
INPUT_ID_WITHOUT_LEVEL,
|
||||
|
@ -43,6 +45,7 @@ const CONST = {
|
|||
LEGEND_CLASS,
|
||||
REMOVE_LEVEL_BUTTON_ID_WITHOUT_LEVEL,
|
||||
REMOVE_LEVEL_LABEL_TEXT,
|
||||
ADD_LEVEL_BUTTON,
|
||||
};
|
||||
|
||||
export default CONST;
|
||||
|
|
42
templates/panel/sitekey/add/ts/levels/getLevelFields.test.ts
Normal file
42
templates/panel/sitekey/add/ts/levels/getLevelFields.test.ts
Normal file
|
@ -0,0 +1,42 @@
|
|||
/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import getLevelFields from './getLevelFields';
|
||||
import {getAddForm, addLevel} from '../setupTests';
|
||||
import {Level} from './index';
|
||||
//import CONST from '../const';
|
||||
|
||||
document.body.innerHTML = getAddForm();
|
||||
|
||||
const level1: Level = {
|
||||
difficulty_factor: 200,
|
||||
visitor_threshold: 500,
|
||||
};
|
||||
|
||||
const level2: Level = {
|
||||
difficulty_factor: 400,
|
||||
visitor_threshold: 700,
|
||||
};
|
||||
|
||||
it('get levels fields works', () => {
|
||||
addLevel(level1.visitor_threshold, level1.difficulty_factor);
|
||||
console.log(document.body.innerHTML);
|
||||
expect(getLevelFields(1)).toEqual(level1);
|
||||
|
||||
addLevel(level2.visitor_threshold, level2.difficulty_factor);
|
||||
expect(getLevelFields(2)).toEqual(level2);
|
||||
});
|
|
@ -18,8 +18,6 @@
|
|||
import {Level} from './index';
|
||||
import CONST from '../const';
|
||||
|
||||
import isNumber from '../../../../../utils/isNumber';
|
||||
|
||||
/** Fetches level from DOM using the ID passesd and validates */
|
||||
const getLevelFields = (id: number) => {
|
||||
console.log(`[getLevelFields]: id: ${id}`);
|
||||
|
|
30
templates/panel/sitekey/add/ts/levels/getNumLevels.test.ts
Normal file
30
templates/panel/sitekey/add/ts/levels/getNumLevels.test.ts
Normal file
|
@ -0,0 +1,30 @@
|
|||
/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import getNumLevels from './getNumLevels';
|
||||
import {getAddForm, addLevel} from '../setupTests';
|
||||
//import CONST from '../const';
|
||||
|
||||
document.body.innerHTML = getAddForm();
|
||||
|
||||
it('get num levels works', () => {
|
||||
expect(getNumLevels()).toBe(1);
|
||||
addLevel(2, 4);
|
||||
expect(getNumLevels()).toBe(2);
|
||||
addLevel(4, 9);
|
||||
expect(getNumLevels()).toBe(3);
|
||||
});
|
|
@ -17,11 +17,16 @@
|
|||
|
||||
import CONST from '../const';
|
||||
|
||||
import {mockAlert} from '../../../../../setUpTests';
|
||||
|
||||
mockAlert();
|
||||
|
||||
/** returns number of level input fields currently in DOM */
|
||||
const getNumLevels = () => {
|
||||
let numLevels = 0;
|
||||
document.querySelectorAll(`.${CONST.LEVEL_CONTAINER_CLASS}`).forEach(_ => numLevels++);
|
||||
document
|
||||
.querySelectorAll(`.${CONST.LEVEL_CONTAINER_CLASS}`)
|
||||
.forEach(_ => numLevels++);
|
||||
console.debug(`[getNumLevels]: numLevels: ${numLevels}`);
|
||||
return numLevels;
|
||||
};
|
||||
|
|
112
templates/panel/sitekey/add/ts/setupTests.ts
Normal file
112
templates/panel/sitekey/add/ts/setupTests.ts
Normal file
|
@ -0,0 +1,112 @@
|
|||
/*
|
||||
* Copyright (C) 2021 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
import getNumLevels from './levels/getNumLevels';
|
||||
import CONST from './const';
|
||||
import addLevelButtonAddEventListener from './addLevelButton';
|
||||
|
||||
export const getAddForm = () => `
|
||||
<form class="sitekey-form" action="/api/v1/mcaptcha/levels/add" method="post">
|
||||
<h1 class="form__title">
|
||||
Add Sitekey
|
||||
</h1>
|
||||
<label class="sitekey-form__label" for="description">
|
||||
Description
|
||||
<input
|
||||
class="sitekey-form__input"
|
||||
type="text"
|
||||
name="description"
|
||||
id="description"
|
||||
required=""
|
||||
value=""
|
||||
/>
|
||||
</label>
|
||||
|
||||
<label class="sitekey-form__label" for="duration">
|
||||
Cooldown Duratoin(in seconds)
|
||||
<input
|
||||
class="sitekey-form__input"
|
||||
type="number"
|
||||
name="duration"
|
||||
id="duration"
|
||||
min="0"
|
||||
required=""
|
||||
value="30"
|
||||
/>
|
||||
</label>
|
||||
|
||||
<fieldset class="sitekey__level-container" id="level-group-1">
|
||||
<legend class="sitekey__level-title">
|
||||
Level 1
|
||||
</legend>
|
||||
<label class="sitekey-form__level-label" for="visitor1"
|
||||
>Visitor
|
||||
<input
|
||||
class="sitekey-form__level-input"
|
||||
type="number"
|
||||
name=""
|
||||
value=""
|
||||
id="visitor1"
|
||||
/>
|
||||
</label>
|
||||
|
||||
<label class="sitekey-form__level-label" for="difficulty1">
|
||||
Difficulty
|
||||
<input
|
||||
type="number"
|
||||
name="difficulty"
|
||||
class="sitekey-form__level-input"
|
||||
value=""
|
||||
id="difficulty1"
|
||||
/>
|
||||
</label>
|
||||
<label class="sitekey-form__level-label--hidden" for="add">
|
||||
Add level
|
||||
<input
|
||||
class="sitekey-form__level-add-level-button"
|
||||
type="button"
|
||||
name="add"
|
||||
id="add"
|
||||
value="Add"
|
||||
/>
|
||||
</label>
|
||||
</fieldset>
|
||||
|
||||
<button class="sitekey-form__submit" type="submit">Submit</button>
|
||||
</form>
|
||||
`;
|
||||
|
||||
/** add level to DOM by filling add level form */
|
||||
export const addLevel = (visitor: number, diff: number) => {
|
||||
addLevelButtonAddEventListener();
|
||||
|
||||
const level = getNumLevels();
|
||||
const visitorField = <HTMLInputElement>(
|
||||
document.getElementById(`${CONST.VISITOR_WITHOUT_LEVEL}${level}`)
|
||||
);
|
||||
visitorField.value = visitor.toString();
|
||||
|
||||
const diffField = <HTMLInputElement>(
|
||||
document.getElementById(`${CONST.DIFFICULTY_WITHOUT_LEVEL}${level}`)
|
||||
);
|
||||
diffField.value = diff.toString();
|
||||
|
||||
const addLevelButton = <HTMLElement>(
|
||||
document.querySelector(`.${CONST.ADD_LEVEL_BUTTON}`)
|
||||
);
|
||||
|
||||
addLevelButton.click();
|
||||
};
|
Loading…
Add table
Reference in a new issue