nizhouting
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests Activity
487 Commits
162 Branches
4 Tags
12 MiB
Commit Graph

73 Commits (aca827a912104578ea8c7c25e715cc6d392a0936)

Author SHA1 Message Date
丁晟晔 23f0dfd8ca 更新 app/test/test_bug551_DingZeYu.py 
我这边好像没有helper文件所以我直接判断有没有这个账号，如果没有就注册一个来进行测试。这样子可以吗
 2024-05-12 13:39:14 +08:00
丁晟晔 6ee94d1610 上传文件至 app/test 2024-05-06 11:48:19 +08:00
丁晟晔 416f40222e 删除 app/test/test_bug551_DingZeYu.py 2024-05-06 11:46:39 +08:00
丁晟晔 66f5c28ead 上传文件至 app/test 2024-05-06 11:46:15 +08:00
唐娇 1d23062c47 Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug528-TangJiao 2024-04-29 13:41:09 +08:00
林杉 b626df7c4b Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 2024-04-24 18:15:04 +08:00
唐娇 184656230f Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug528-TangJiao 2024-04-23 17:35:07 +08:00
林杉 bd5f8f63f5 Merge branch 'Bug553_LinShan' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 2024-04-22 12:47:50 +08:00
林杉 2500fa5fc8 Fix bug553 2024-04-22 12:46:31 +08:00
AliasJeff ddcc5206d5 Merge branch 'Alpha-snapshot20230621' into Bug544-TangXinyuan 
merge latest branch
 2024-04-22 10:37:33 +08:00
林杉 6b3ad77c44 Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 2024-04-22 09:11:29 +08:00
唐娇 739094e844 Fix Test File 2024-04-22 04:59:51 +08:00
唐娇 8d76133cca Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug528-TangJiao 2024-04-22 04:57:36 +08:00
Lan Hui 6dbb1e2c06 No webdriver manager 2024-04-21 15:40:35 +08:00
Lan Hui 374da86174 Why not use PyPI's webdriver-manager? 2024-04-21 15:31:39 +08:00
AliasJeff 8e769587cf simplify module import path 2024-04-19 08:50:41 +08:00
Lan Hui 9aa718b236 Simplify the test code, use the Edge WebDriver 2024-04-18 20:06:02 +08:00
Lan Hui 230e8e92dc Merge branch 'Bug553_LinShan' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 2024-04-18 19:39:53 +08:00
林杉 4ea6d9aeed Fix Bug553 2024-04-16 08:48:55 +08:00
林杉 768c81828d Fix Bug553 2024-04-16 08:46:16 +08:00
AliasJeff 9901d887e0 revert conftest.py 2024-04-15 11:12:35 +08:00
AliasJeff 498639a753 signup in unit test 2024-04-15 11:08:06 +08:00
唐娇 db66b59513 Fix Test Files 2024-04-15 06:17:01 +08:00
唐娇 692d8cf453 Merge branch 'Bug528-TangJiao' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug528-TangJiao 2024-04-15 06:14:30 +08:00
唐娇 426d131f64 Fix Text Files 2024-04-15 06:12:41 +08:00
AliasJeff 4fe96cfc9c refactor: Implicitly use fixtures in conftest.py 2024-04-11 17:09:12 +08:00
AliasJeff 93264da3d9 Merge branch 'Alpha-snapshot20230621' into Bug544-TangXinyuan 
# Conflicts:
#	app/test/conftest.py
 2024-04-10 22:09:27 +08:00
Lan Hui 64b9c51fab Define a fixture that restarts flask app for each test run 2024-04-10 14:44:23 +08:00
AliasJeff 0fd1592036 rename unit test file 2024-04-10 08:55:57 +08:00
AliasJeff 46233ead1e Merge branch 'Alpha-snapshot20230621' into Bug544-TangXinyuan 
# Conflicts:
#	app/test/conftest.py
 2024-04-09 22:17:54 +08:00
AliasJeff b5bde9d33d test: update test file, update username/password config, add pytest to requirements.txt 2024-04-09 22:09:50 +08:00
Lan Hui 77a3adb546 Define fixture 'restore_sqlite_database' that will be automatically used to restore the database before starting each test 2024-04-09 20:06:30 +08:00
Lan Hui a4608db424 Correct code comments 2024-04-09 13:21:44 +08:00
Lan Hui 0a63c5354a Make test_add_word.py work again 2024-04-09 12:11:30 +08:00
林杉 b7fe68c54d test_bug553 2024-04-08 16:37:15 +08:00
唐娇 85a3faaa9f Fix bug 528 2024-04-06 00:18:44 +08:00
唐欣媛 2966a8162f Fix bug 544 2024-03-27 12:39:42 +08:00
Lan Hui 41d1d9619d Stress test code contributed by students 2023-08-13 16:14:43 +08:00
邱忠辉 9d420acd8b [REFACTOR] user_service.py: Added id to user name, word and frequency for click to execute AJAX request in JS (#30) 
1. Add jquery.js and word_operation.js to the static folder.

2. Changed the return type of the familiar, unfamiliar and deleteword methods of user_service.py.
    ```
    original: return redirect(url_for('userpage', username=username))
    now: return "success"
    ```
3. In order to get elements in JS to make ajax requests we add ids in userpage_get.html for familiar, unfamiliar, delete buttons and so on.

4. When the user's word book was retrieved, the list returned was already sorted in descending order of frequency, so redundant code was removed in userpage_get.html.

Co-authored-by: PeterQiu <www.1392993990@qq.com>
Co-authored-by: Lan Hui <1348141770@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/30
Co-authored-by: 邱忠辉 <1392993990@qq.com>
Co-committed-by: 邱忠辉 <1392993990@qq.com>
 2022-07-18 13:29:04 +08:00
Lan Hui 4d2dd2b68e Repalce old app folder with SoftArch王炫/english-pal-master/app/ 2022-01-26 21:10:09 +08:00
Hui Lan 246ddcc62a Remove HOME_PAGE as we use URL now. 2021-12-03 09:18:34 +08:00
Hui Lan f8a5cc2a40 test: use localhost to test 2021-12-03 09:16:18 +08:00
Hui Lan 3c118a53e2 add conftest.py 2021-12-03 09:08:45 +08:00
Hui Lan fa8fd4e414 (1) test_page_position.py: reduce the number of click_by_random. (2) Jenkinsfile: trigger build after each push. 2021-07-14 21:29:32 +08:00
Hui Lan b13df92bf7 (1) test_page_position.py: reduce the number of click_by_random. (2) Jenkinsfile: trigger build after each push. 2021-07-14 21:22:56 +08:00
Hui Lan cfb8dc6c78 test_page_position.py: let it pass for now (temporary fix). 2021-07-14 18:55:16 +08:00
Hui Lan bbb0c5396e test_page_position.py: change click order. 2021-07-14 18:50:34 +08:00
Hui Lan 5c7096a96b test_add_word.py: do not print many things out. 2021-07-14 18:47:55 +08:00
Hui Lan 1786651aa5 test_add_word.py: use a longer word 2021-07-14 18:06:12 +08:00
Hui Lan 5ce9b6167c test_*.py: use FIREFOX instead of CHROME 2021-07-14 17:50:38 +08:00