minor fixes

SamR1 · Dec 8, 2019 · b6ec302 · b6ec302
1 parent 39973df
commit b6ec302
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 14 deletions.
diff --git a/rdltr/dist/index.html b/rdltr/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><link rel=stylesheet href=https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css integrity=sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS crossorigin=anonymous><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/fork-awesome@1.1.5/css/fork-awesome.min.css integrity="sha256-P64qV9gULPHiZTdrS1nM59toStkgjM0dsf5mK/UwBV4=" crossorigin=anonymous><title>rdltr</title><link href=/static/css/app.b9819106.css rel=preload as=style><link href=/static/css/chunk-vendors.96a655cf.css rel=preload as=style><link href=/static/js/app.b608f7ba.js rel=preload as=script><link href=/static/js/chunk-vendors.3eff8379.js rel=preload as=script><link href=/static/css/chunk-vendors.96a655cf.css rel=stylesheet><link href=/static/css/app.b9819106.css rel=stylesheet></head><body><div id=app></div><script src=/static/js/chunk-vendors.3eff8379.js></script><script src=/static/js/app.b608f7ba.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><link rel=stylesheet href=https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css integrity=sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS crossorigin=anonymous><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/fork-awesome@1.1.5/css/fork-awesome.min.css integrity="sha256-P64qV9gULPHiZTdrS1nM59toStkgjM0dsf5mK/UwBV4=" crossorigin=anonymous><title>rdltr</title><link href=/static/css/app.14df5e46.css rel=preload as=style><link href=/static/css/chunk-vendors.96a655cf.css rel=preload as=style><link href=/static/js/app.9a330fa0.js rel=preload as=script><link href=/static/js/chunk-vendors.3eff8379.js rel=preload as=script><link href=/static/css/chunk-vendors.96a655cf.css rel=stylesheet><link href=/static/css/app.14df5e46.css rel=stylesheet></head><body><div id=app></div><script src=/static/js/chunk-vendors.3eff8379.js></script><script src=/static/js/app.9a330fa0.js></script></body></html>
diff --git a/rdltr/dist/static/css/app.b9819106.css → rdltr/dist/static/css/app.14df5e46.css b/rdltr/dist/static/css/app.b9819106.css → rdltr/dist/static/css/app.14df5e46.css
diff --git a/rdltr/dist/static/js/app.b608f7ba.js → rdltr/dist/static/js/app.9a330fa0.js b/rdltr/dist/static/js/app.b608f7ba.js → rdltr/dist/static/js/app.9a330fa0.js
diff --git a/rdltr/dist/static/js/app.9a330fa0.js.map b/rdltr/dist/static/js/app.9a330fa0.js.map
diff --git a/rdltr/dist/static/js/app.b608f7ba.js.map b/rdltr/dist/static/js/app.b608f7ba.js.map
diff --git a/rdltr/tests/ui_tests/test_02_registration.py b/rdltr/tests/ui_tests/test_02_registration.py
@@ -2,11 +2,12 @@
 
 
 def test_register_ok(selenium):
-    user_infos = register_valid_user(selenium)
+    register_valid_user(selenium)
     nav = selenium.find_element_by_tag_name('nav').text
     assert "Register" not in nav
     assert "Log in" not in nav
-    assert user_infos['username'] in nav
+    assert "Settings" in nav
+    assert "Logout" in nav
 
 
 def test_register_invalid_email(selenium):

diff --git a/rdltr/tests/ui_tests/test_03_login_and_logout.py b/rdltr/tests/ui_tests/test_03_login_and_logout.py
@@ -1,4 +1,9 @@
-from rdltr.tests.utils import login, random_string, register_valid_user
+from rdltr.tests.utils import (
+    login,
+    login_valid_user,
+    random_string,
+    register_valid_user,
+)
 
 
 def test_logout_and_login_ok(selenium):
@@ -12,7 +17,7 @@ def test_logout_and_login_ok(selenium):
     menus = nav.find_elements_by_class_name('menu')
     menus[2].click()
 
-    login(selenium, user_infos)
+    login_valid_user(selenium, user_infos)
     nav = selenium.find_element_by_tag_name('nav')
     nav_text = nav.text
     assert user_infos['username'] in nav_text
@@ -42,13 +47,17 @@ def test_password_update_ok(selenium):
     user_infos = register_valid_user(selenium)
     menus = selenium.find_elements_by_class_name('menu')
     menus[2].click()
-    login(selenium, user_infos)
+    login_valid_user(selenium, user_infos)
+
+    # click on user name
     menus = selenium.find_elements_by_class_name('menu')
     menus[0].click()
 
+    # click on 'Change password'
     submit_button = selenium.find_element_by_tag_name('button')
     submit_button.click()
 
+    # update password
     new_password = 'newp@ssw0rd'
     password = selenium.find_element_by_id('oldPassword')
     password.send_keys(user_infos.get('password'))
@@ -61,8 +70,10 @@ def test_password_update_ok(selenium):
     submit_button = selenium.find_element_by_tag_name('button')
     submit_button.click()
 
+    # log out
     menus = selenium.find_elements_by_class_name('menu')
     menus[2].click()
 
-    user_infos['password'] = new_password
-    login(selenium, user_infos)
+    # log in
+    user_infos['password'] = user_infos['password_conf'] = new_password
+    login_valid_user(selenium, user_infos)