xieshanghai
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests Activity
444 Commits
148 Branches
4 Tags
11 MiB
Commit Graph

46 Commits (4fe96cfc9ca6a50169d82942a48a15e5718b9550)

Author SHA1 Message Date
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
唐欣媛 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
Hui Lan 7f69d9a14d test scripts: change port from 5000 to 91. 2021-07-13 12:46:31 +08:00
Hui Lan 905e85f201 Merge branch 'SPM-Spring2021-2597-占健豪201831990539' of https://github.com/lanlab-org/EnglishPal 2021-07-13 11:46:37 +08:00
Hui Lan d431c0cb4b update .gitignore to ignore the folder .idea 2021-07-13 11:19:35 +08:00
mmmmmkj ad52e5a90b
change the password 2021-06-23 00:36:34 +08:00
mmmmmkj 515128caab
upload the test code of the function called delete 2021-06-23 00:33:19 +08:00
张小飞 10fd9afa6f 修改访问端口，避免和其他组冲突，同时修改main.py,主页显示 English Pal(SPM-Spring2021-2599-张小飞201831990641) 2021-06-22 12:24:34 +08:00
Zjh-jc 2ee854285c Test the page position after clicking the Familiar or Unfamiliar button. 2021-06-17 09:51:53 +08:00
Zjh-jc f7629f4d1c Test the page position after clicking the Familiar or Unfamiliar button. 2021-06-17 09:41:33 +08:00
Zjh-jc 006a144ec0 Test the page position after clicking the Familiar or Unfamiliar button. 2021-06-17 09:21:13 +08:00
张小飞 46dc9328cf 在test_add测试文件里添加输出语句，寻找测试不通过的原因 2021-06-13 11:10:56 +08:00
张小飞 d6e64e3465 删除test_login.py中添加的代码，添加test_login_security_fix.py用来检验bug是否修复 2021-06-11 15:16:28 +08:00
张小飞 d21dfc8da3 Merge branch 'master' of https://github.com/lanlab-org/EnglishPal into SPM-Spring2021-2599-张小飞201831990641 2021-06-09 22:58:30 +08:00
张小飞 fdb3259e3c 修改测试代码里的端口和master统一为91 2021-06-09 21:44:47 +08:00
张小飞 a9b2bc6fee 和新的master分支合并 2021-06-09 21:39:13 +08:00
张小飞 be0c9f1c8b 修改test_next_eassy.py，修复语法错误 2021-06-09 20:57:09 +08:00
Lan Hui 90ab0be3d6 app/test/test_next_essay.py: click Next 5 times. 2021-06-09 09:17:19 +08:00
Lan Hui 783a0b22e1 app/test/test_next_essay.py: correct the variable name 'differ'. 2021-06-09 08:05:30 +08:00
Lan Hui f4a6921297 app/test/test_add_word_and_essay_does_not_change.py: remove unnecessary test. 2021-06-08 21:48:38 +08:00
张小飞 f44a4ce90f 修改app\test\test_login.py添加若干代码，测试bug是否修复 2021-06-04 14:58:29 +08:00
张小飞 3aaaa90c6a 修改app\test\test_login.py添加若干代码，测试bug是否修复 2021-06-04 12:22:53 +08:00
张小飞 ae6c44e942 修改app\test\test_login.py访问端口 2021-06-04 12:01:19 +08:00
张小飞 03446abe22 修改测试文件中访问端口，删除jenkinsfile中不必要的阶段 2021-06-01 11:35:23 +08:00
Hui Lan 843ed03d4f Publish EnglishPal source code 2021-04-06 16:22:03 +08:00