登录

WorkApi/APP/Members/members_create.py

@@ -28,6 +28,7 @@ class MembersCreate(object):
 
         self.local_json = {}
 
+        self.token = None
         self.name = None
         self.position = None
         self.role = None
@@ -41,6 +42,9 @@ class MembersCreate(object):
         self.api = UtilsRequest()
 
     def get_response(self):
+        self._headers = {
+            "token": self.token
+        }
 
         base = ApiBase()
         base.dict_add_key(_key="name", value=self.name)
@@ -56,4 +60,4 @@ class MembersCreate(object):
         self.local_json = base._json
 
         self._json = self.local_json
-        self.response = self.api.post(url=self._url, json=self._json)
+        self.response = self.api.post(url=self._url, headers=self._headers, json=self._json)

WorkApi/APP/Settings/Get/settings_get_member.py

+# -*- coding: utf-8 -*-
+# 查询我的信息
+# 作者: 陈磊
+# 时间: 2019-11-20
+from WorkUtils.UtilsRequest import UtilsRequest
+from WorkUtils.UtilsLog import UtilsLog
+from WorkApi.ApiBase import ApiBase, GetBase
+
+
+class SettingsGetMember(object):
+    def __init__(self, _host):
+        """
+        :param _host: 域名
+        :return:
+        """
+        self.log = UtilsLog()
+        self.log.info("调用查询我的信息")
+        self.log.info(self.__class__)
+
+        self._host = _host
+        self._headers = {}
+        self._path = "/settings/get/member"
+        self._url = self._host + self._path
+        self._params = {}
+        self._json = {}
+        self._data = {}
+        self.response = ""
+
+        self.local_json = {}
+
+        self.token = None
+        self.memberId = None
+
+        self.api = UtilsRequest()
+
+    def get_response(self):
+        self._headers = {
+            "token": self.token
+        }
+
+        base = ApiBase()
+        base.dict_add_key(_key="memberId", value=self.memberId)
+
+        self._params = base._json
+        self.response = self.api.get(url=self._url, headers=self._headers, params=self._params)

WorkCase/APP/Api/test_api_login.py

@@ -26,7 +26,9 @@ class TestApiLogin(object):
     db_user = env["db_user"]
     db_pw = env["db_pw"]
     db_base = env["db_base"]
-    base_name = "admin"
+
+    base_id = 10
+    base_name = "SS测试用户名"
     base_password = "123456"
 
     @classmethod
@@ -39,12 +41,15 @@ class TestApiLogin(object):
 
     def setup_method(self):
         self.log.debug("测试用例执行开始...")
+        self.log.debug("恢复测试数据...")
+        self.update_members_del_flag(members_id=self.base_id, value=0)
+        self.update_members_status(members_id=self.base_id, value=0)
 
     def teardown_method(self):
         self.log.debug("测试用例执行结束...")
         self.log.debug("恢复测试数据...")
-        self.update_members_del_flag(members_id=1, value=0)
-        self.update_members_status(members_id=1, value=0)
+        self.update_members_del_flag(members_id=self.base_id, value=0)
+        self.update_members_status(members_id=self.base_id, value=0)
 
     @allure.step("调用接口：api.login")
     def api_login(self, name=None, password=None):
@@ -120,7 +125,7 @@ class TestApiLogin(object):
     @allure.title("api.login：已删除的用户无法登录")
     @allure.story("登录：已删除的用户无法登录")
     def test_case_04(self):
-        self.update_members_del_flag(members_id=1, value=1)
+        self.update_members_del_flag(members_id=self.base_id, value=1)
 
         response = self.api_login(name=self.base_name, password=self.base_password)
         self.check_code(response=response, code=2004)
@@ -129,7 +134,7 @@ class TestApiLogin(object):
     @allure.title("api.login：已禁用的用户无法登录")
     @allure.story("登录：已禁用的用户无法登录")
     def test_case_05(self):
-        self.update_members_status(members_id=1, value=1)
+        self.update_members_status(members_id=self.base_id, value=1)
 
         response = self.api_login(name=self.base_name, password=self.base_password)
         self.check_code(response=response, code=2003)
@@ -150,5 +155,5 @@ if __name__ == "__main__":
 
     # a = TestApiLogin()
     # a.setup_class()
-    # a.test_case_05()
+    # a.test_case_01()
     # a.teardown_method()

WorkCase/APP/Members/test_members_create.py

@@ -33,8 +33,6 @@ class TestMembersCreate(object):
     @classmethod
     def setup_class(cls):
         cls.log.debug("开始执行测试套件.......")
-        session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataMembers().delete_like_name(session=session, name=cls.base_name)
 
     @classmethod
     def teardown_class(cls):
@@ -47,9 +45,10 @@ class TestMembersCreate(object):
         self.log.debug("测试用例执行结束...")
 
     @allure.step("调用接口：members.create")
-    def members_create(self, name=None, position=None, role=None, password=None,
+    def members_create(self, token=None, name=None, position=None, role=None, password=None,
                        phone=None, email=None, wechatUrl=None, dingdingUrl=None, remark=None):
         api = MembersCreate(_host=self.host)
+        api.token = token
         api.name = name
         api.position = position
         api.role = role
@@ -113,11 +112,11 @@ class TestMembersCreate(object):
         _status = UtilsResponse().get_status(response=response)
         assert _status == status
 
-    @allure.title("members.create：创建一个用户")
-    @allure.story("创建用户：创建一个用户")
+    @allure.title("members.create：创建一个新用户")
+    @allure.story("创建用户：创建一个新用户")
     @allure.severity("blocker")
     def test_case_01(self):
-        response = self.members_create(name=self.base_name, role=0, password=123456)
+        response = self.members_create(token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIxIn0.qfd0G-elhE1aGr15LrnYlIZ_3UToaOM5HeMcXrmDGBM",name=self.base_name, role=0, password=123456)
         self.check_code(response=response, code=0)
 
         members_id = UtilsResponse().get_data(response=response)

WorkCase/APP/Settings/Get/test_settings_get_member.py

+# -*- coding: utf-8 -*-
+# 测试用例
+# 作者: 陈磊
+# 时间: 2019-11-20
+
+
+from __future__ import division
+
+from WorkCase import CaseBase
+from WorkUtils.UtilsLog import UtilsLog
+from WorkUtils.UtilsResponse import UtilsResponse
+from WorkUtils.UtilsDataBase import UtilsDataBase
+from WorkApi.APP.Api.api_login import ApiLogin
+from WorkApi.APP.Settings.Get.settings_get_member import SettingsGetMember
+
+from WorkData.Argus.members import DataMembers
+
+import allure
+
+
+@allure.feature("测试模块：settings.get.member")
+class TestSettingsGetMember(object):
+    log = UtilsLog()
+    env = CaseBase().app_environment
+    host = env["host"]
+    db_url = env["db_url"]
+    db_port = env["db_port"]
+    db_user = env["db_user"]
+    db_pw = env["db_pw"]
+    db_base = env["db_base"]
+
+    base_id = 10
+    base_name = "SS测试用户名"
+    base_password = "123456"
+
+    @classmethod
+    def setup_class(cls):
+        cls.log.debug("开始执行测试套件.......")
+
+    @classmethod
+    def teardown_class(cls):
+        cls.log.debug("结束执行测试套件.......")
+
+    def setup_method(self):
+        self.log.debug("测试用例执行开始...")
+        self.log.debug("恢复测试数据...")
+        self.update_members_del_flag(members_id=self.base_id, value=0)
+        self.update_members_status(members_id=self.base_id, value=0)
+
+    def teardown_method(self):
+        self.log.debug("测试用例执行结束...")
+        self.log.debug("恢复测试数据...")
+        self.update_members_del_flag(members_id=self.base_id, value=0)
+        self.update_members_status(members_id=self.base_id, value=0)
+
+    @allure.step("调用接口：api.login")
+    def api_login(self, name=None, password=None):
+        api = ApiLogin(_host=self.host)
+        api.name = name
+        api.password = password
+        api.get_response()
+        return api.response
+
+    @allure.step("调用接口：settings.get.member")
+    def settings_get_member(self, token=None, memberId=None):
+        api = SettingsGetMember(_host=self.host)
+        api.token = token
+        api.memberId = memberId
+        api.get_response()
+        return api.response
+
+    @allure.step("断言返回结果")
+    def check_code(self, response, code):
+        _code = UtilsResponse().get_code(response=response)
+        assert _code == code
+
+    @allure.step("断言返回错误信息")
+    def check_msg(self, response, msg):
+        _msg = UtilsResponse().get_msg(response=response)
+        assert _msg == msg
+
+    @allure.step("连接数据库：Argus")
+    def db_session(self):
+        session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
+        return session
+
+    @allure.step("更新表数据：members -- del_flag")
+    def update_members_del_flag(self, members_id=None, value=None):
+        session = self.db_session()
+        sql = DataMembers().update_del_flag(session=session, _id=members_id, value=value)
+        return sql
+
+    @allure.step("更新表数据：members -- status")
+    def update_members_status(self, members_id=None, value=None):
+        session = self.db_session()
+        sql = DataMembers().update_status(session=session, _id=members_id, value=value)
+        return sql
+
+    @allure.title("settings.get.member：token未传")
+    @allure.story("查询我的设置：token未传")
+    @allure.severity("blocker")
+    def test_case_01(self):
+        response = self.settings_get_member(memberId=self.base_id)
+        self.check_code(response=response, code=2001)
+        self.check_msg(response=response, msg="无token，请重新登录")
+
+    @allure.title("settings.get.member：token的用户已删除")
+    @allure.story("查询我的设置：token的用户已删除")
+    @allure.severity("blocker")
+    def test_case_02(self):
+        response = self.api_login(name=self.base_name, password=self.base_password)
+        data = UtilsResponse().get_data(response=response)
+        self.token = data
+        self.update_members_del_flag(members_id=self.base_id, value=1)
+        response = self.settings_get_member(token=self.token, memberId=self.base_id)
+        self.check_code(response=response, code=2004)
+        self.check_msg(response=response, msg="用户不存在")
+
+    @allure.title("settings.get.member：token的用户已禁用")
+    @allure.story("查询我的设置：token的用户已禁用")
+    @allure.severity("blocker")
+    def test_case_03(self):
+        response = self.api_login(name=self.base_name, password=self.base_password)
+        data = UtilsResponse().get_data(response=response)
+        self.token = data
+        self.update_members_status(members_id=self.base_id, value=1)
+        response = self.settings_get_member(token=self.token, memberId=self.base_id)
+        self.check_code(response=response, code=2003)
+        self.check_msg(response=response, msg="账户已被禁用")
+
+    @allure.title("settings.get.member：token错误")
+    @allure.story("查询我的设置：token错误")
+    def test_case_04(self):
+        response = self.api_login(name=self.base_name, password=self.base_password)
+        data = UtilsResponse().get_data(response=response)
+        self.token = data
+        self.update_members_status(members_id=self.base_id, value=1)
+        response = self.settings_get_member(token="Test", memberId=self.base_id)
+        self.check_code(response=response, code=2001)
+        self.check_msg(response=response, msg="token错误，请重新登录")
+
+    @allure.title("settings.get.member：正常查询")
+    @allure.story("查询我的设置：正常查询")
+    @allure.severity("blocker")
+    def test_case_05(self):
+        response = self.api_login(name=self.base_name, password=self.base_password)
+        self.token = UtilsResponse().get_data(response=response)
+        response = self.settings_get_member(token=self.token, memberId=self.base_id)
+        self.check_code(response=response, code=0)
+
+        data = UtilsResponse().get_data(response=response)
+        assert "管理员角色" == data["roleName"]
+
+
+if __name__ == "__main__":
+    from WorkUtils.UtilsPyTest import UtilsPyTest
+    from WorkUtils.UtilsCmd import UtilsCmd
+
+    import os
+
+    # 执行自动化测试用例
+    case_info = os.path.split(__file__)
+    case = UtilsCmd().pytest_cmd()
+    r = UtilsPyTest(case=case, case_info=case_info)
+    r.run_main()
+
+    # a = TestSettingsGetMember()
+    # a.setup_class()
+    # a.test_case_05()
+    # a.teardown_method()