Merge branch 'master' into 'feature/zhaoyinghui'

Master See merge request !10

Merge branch 'master' into 'feature/zhaoyinghui'
Master See merge request !10
赵迎辉
2 parents b49bcddb 752ceca1
Showing 22 changed files with 574 additions and 10 deletions
README.md
atdd/ATDDCase.py
atdd/PcPost.py
atdd/__pycache__/ATDDCase.cpython-36.pyc
atdd/__pycache__/PcPost.cpython-36.pyc
tests/Staff_Management/AdminSettings/public_adminSettings.py
tests/Staff_Management/AdminSettings/test_jobSetting.py
tests/Staff_Management/AdminSettings/test_roleSetting.py
tests/Staff_Management/Invite/test_InvitationLetters.py
tests/Staff_Management/Invite/test_Invitation_authority.py
tests/Staff_Management/MemberList/test_delete_mem.py
tests/Staff_Management/MemberList/test_detail_mem.py
tests/Staff_Management/MemberList/test_memlist_mem.py
tests/Staff_Management/MemberList/test_memuid_list.py
tests/Staff_Management/MemberList/test_roleId_jobid.py
tests/Staff_Management/MemberList/test_save_mem.py
tests/Staff_Management/MemberList/test_search_mem.py
tests/Staff_Management/Organization/public_org.py
tests/Staff_Management/Organization/test_DepartmentMember.py
tests/Staff_Management/Organization/test_add_org.py
+先去gitlab上创建开发分支：feature/自己的名字拼音
+
+在本地项目中git输入命令：
+git pull
+
+现在可以看到创建的开发分之，然后拉取开发分支
+git fetch origin feature/jipeihong:feature/jipeihong
+
+（运行git status, 切记要没有修改）
+
+切换到开发分支：
+git checkout feature/jipeihong
+
+创建本地开发分支，对应gitlab开发分支：
+git checkout topic/jipeihong
+
+然后进行rebase：
+git rebase feature/jipeihong
+
+（然后就可以进行你的开发了）
+
+查看已经修改的东西
+git status
+
+确认好后进行提交
+git add .
+
+接着提交
+git commit -m '你的提交评论'
+
+然后推送到gitlab
+git push origin topic/jipeihong:feature/jipeihong
+
+如果上面命令失败了，说明别人也同时有修改提交，需要你拉取下代码
+git fetch origin feature/jipeihong:feature/jipeihong
+
+git rebase feature/jipeihong
+
+rebase没问题就可以继续前面的git push命令了。
+
+rebase有问题的话需要解决下冲突。
+
+编码注意：
+1、Python测试文件前以'test_'命名；
+2、类之前不需要test，类名首字母大写；
+3、单词分割线用英文下划线‘_’，不要用中间线“-”；
+4、随机函数random；
+5、接口返回结果格式转换，以及结果中所需值的提取；
 \ No newline at end of file
@@ -14,12 +14,12 @@ class ATDDCase(unittest.TestCase):
     global list
     host = "https://yq.vchangyi.com"
     uc_host = "http://l-rst.vchangyi.com"
-    domain = '6B2A70EB0A6916AB0A71D556550EA970'
+    domain = '755DD9770A69039F18591A2906A3C371' # 企业号“小仙女”
  
  
     mobile = '17321009308'
     psw = '123456'
-    uid = '6B2A7F0F0A69039F559F4AA2A010BB26'
+    jipeihong_uid = '755DE0550A69039F0BA12102F4A4F8E1' # 季培红的UID
     cert = ('1_vchangyi.com_bundle.crt', '2_vchangyi.com.key')
  
     header_json = {"Content-Type": "application/json; charset=utf-8"}
@@ -10,7 +10,7 @@ class PcPost(ATDDCase):
         result = data['result']
  
         if isinstance(result, list):
-            user = result[0]
+            user = result[1]
             if len(result) > 1:
                 print("选择企业：", user['enterpriseInfo']['epName'])
  
@@ -73,10 +73,10 @@ class PcPost(ATDDCase):
  
         url = self.host + '/' + self.domain + self.interfaceUrl
         r = self.post(url, self.data, **options)
-        self.assertEquals(200, r.status_code)
+        self.assertEqual(200, r.status_code)
         result = json.loads(r.text)
         errcode = result['errcode']
-        self.assertEquals(0, errcode)
+        self.assertEqual(0, errcode)
         return result
  
     # 后端接口模板-异常判断
@@ -87,8 +87,8 @@ class PcPost(ATDDCase):
  
         url = self.host + '/' + self.domain + self.interfaceUrl
         r = self.post(url, self.data, **options)
-        self.assertEquals(200, r.status_code)
+        self.assertEqual(200, r.status_code)
         result = json.loads(r.text)
         errcode = result['errcode']
-        self.assertEquals(code, errcode)
+        self.assertEqual(code, errcode)
         return result
 \ No newline at end of file
+
+from atdd.PcPost import PcPost
+
+from atdd.PcPost import PcPost
+
+class JobSetting(PcPost):
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 岗位list——岗位管理页面
+    def test_getJobList(self):
+        interfaceUrl = "/Contact/Apicp/Job/List"
+        data = {
+            "page": 1,
+            "limit": 10
+        }
+        result = self.PcPost(interfaceUrl,data)
+        return result
+
+    # 获取所有岗位的ID，以list格式返回
+    def get_all_jobId(self):
+        jobList = self.test_getJobList()['result']['list']
+        jobIdList = []
+        for i in range(len(jobList)):
+            jobId = jobList[i]['jobId'].split()
+            # 将jobId加入到jobIdList中
+            jobIdList[len(jobIdList):len(jobIdList)] = jobId
+        return jobIdList
+
+    # 根据岗位名称获取岗位ID
+    def getJobID(self, jobName):
+        jobList = self.test_getJobList()['result']['list']
+        for i in range(len(jobList)):
+            if (jobList[i]['jobName'] == jobName):
+                jobId = jobList[i]['jobId']
+            else:
+                jobId = None
+            return jobId
+
+from atdd.PcPost import PcPost
+
+class RoleSetting(PcPost):
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 角色list——角色管理页面
+    def test_getRoleList(self):
+        interfaceUrl = "/Contact/Apicp/Role/List"
+        data = {
+            "page": 1,
+            "limit": 10
+        }
+        result = self.PcPost(interfaceUrl,data)
+        return result
+
+    # 获取所有角色的ID，以list格式返回
+    def get_all_roleId(self):
+        roleList = self.test_getRoleList()['result']['list']
+        roleIdList = []
+        for i in range(len(roleList)):
+            jobId = roleList[i]['roleId'].split()
+            # 将jobId加入到jobIdList中
+            roleIdList[len(roleIdList):len(roleIdList)] = jobId
+        return roleIdList
+
+    # 根据角色名称获取角色ID
+    def getRoleID(self, roleName):
+        roleList = self.test_getRoleList()['result']['list']
+        for i in range(len(roleList)):
+            if (roleList[i]['roleName'] == roleName):
+                roleId = roleList[i]['roleId']
+            else:
+                roleId = None
+            return roleId
+
+from atdd.PcPost import PcPost
+
+class InvitationLetter(PcPost):
+
+    interfaceUrl = "/contact/Apicp/Invite/Save"
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    def test_invitationLetter(self):
+        data = {
+            "content": "<p>欢迎加入【小仙女】！</p><p>这里是学习成长赋能新平台，深度整合公司资料、知识、技能、能力测评以及各种好"
+                       "玩的活动和服务，真正帮助大家达到能力提升、快速高效提高工作效能。</p><p>大家可以通过碎片化时间随时随地参与"
+                       "学习各种新知识、技能，了解公司新动态，公司构建平台的目的是希望同事们可以互动沟通，人人学习、人人分享，大家"
+                       "一起享受企业赋能的无限可能。</p><p>打通员工、公司总部、培训管理之间的时空距离，提升大家学习成长体验，打造"
+                       "不一样的共同成长氛围。333</p>",
+            "share_content": "点击链接加入“【小仙女】”，一起享受企业赋能之旅吧。222"
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        return result
+
+
+from atdd.PcPost import PcPost
+from tests.Staff_Management.AdminSettings.test_jobSetting import JobSetting
+from tests.Staff_Management.AdminSettings.test_roleSetting import RoleSetting
+import random
+
+class InvitationAuth(PcPost):
+
+    interfaceUrl = "/Public/Apicp/ChooseMem/ConfirmChoose"
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 选择成员
+    def test_invitationauth_mem(self):
+        data = {
+            "_identifier": "yuanquan",
+            "memArray[0][memID]": self.jipeihong_uid
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
+        return result
+
+    # 选择岗位
+    def test_invitationauth_job(self):
+        jobIdList = JobSetting().get_all_jobId()
+        x = random.randint(0,len(jobIdList)-1)
+        data = {
+            "_identifier": "yuanquan",
+            "jobArray[0][jobID]": jobIdList[x]
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
+        return result
+
+    # 选择角色
+    def test_invitationauth_role(self):
+        roleIdList = RoleSetting().get_all_roleId()
+        x = random.randint(0,len(roleIdList)-1)
+        data = {
+            "_identifier": "yuanquan",
+            "roleArray[0][roleID]": roleIdList[x]
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
+        return result
+
+import unittest
+from atdd.PcPost import PcPost
+
+
+class DeleteMem(PcPost):
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    def test_delete_mem(self):
+        url = ''
+
+
+if __name__ == '__main__':
+    unittest.main()
+import unittest
+from atdd.PcPost import PcPost
+
+
+class MemDetail(PcPost):
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 返回新增员工字段信息接口
+    def test_memdetail(self):
+        url = '/contact/Apicp/User/AttributeInfo'
+        data = {
+        }
+        result = self.PcPost(url, data)
+        print('接口地址：' + self.host + self.domain + url)
+        self.assertEqual('ok', result['errmsg'], msg=result['errmsg'])  # limit判断？   判断通过打印？
+        # print(result)
+
+if __name__ == '__main__':
+    unittest.main()
+# Author: liuyang 2017年11月7日16:43:08
+
+from atdd.PcPost import PcPost
+
+
+class ReadMemList(PcPost):
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    def test_memlist(self):
+        url = "/contact/Apicp/User/DepartmentMember"
+        data = {
+        }
+        result = self.PcPost(url, data)
+        print(self.host + '/' + self.domain + url)
+        self.assertEqual("ok", result["errmsg"], msg=result["errmsg"])  # 怎样断言返回结果中的limit（动态）数据？
+        print(result)
+        return result
+import unittest
+from atdd.PcPost import PcPost
+
+
+class Memuid(PcPost):
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 员工列表接口
+    def test_memlist(self):
+        url = '/contact/Apicp/User/DepartmentMember'
+        data = {
+        }
+        result = self.PcPost(url, data)
+        print('接口地址：' + self.host + self.domain + url)
+        self.assertEqual('ok', result['errmsg'], msg=result['errmsg'])
+        list = result['result']['list']
+        memberList = []
+        for i in range(len(list)):
+            mem_Uid = result['result']['list'][i]['uid'].split()
+            memberList[len(memberList):len(memberList)] = mem_Uid
+        print(memberList)
+        return memberList
+
+if __name__ == '__main__':
+    unittest.main()
+import unittest
+from atdd.PcPost import PcPost
+
+
+class RoleId(PcPost):
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 获取角色列表
+    def test_get_roleid(self):
+        url = '/Contact/Apicp/Role/List'
+        data = {
+        }
+        result = self.PcPost(url, data)
+        print('接口地址： ' + self.host + self.domain + url)
+        list = result['result']['list']
+        roleidlist = []
+        for i in range(len(list)):
+            roleId = result['result']['list'][i]['roleId'].split()
+            roleidlist[len(roleidlist):len(roleidlist)] = roleId
+        print(roleidlist)
+        return roleidlist
+
+    # 获取岗位列表
+    def test_get_jobid(self):
+        url = '/Contact/Apicp/Job/List'
+        data = {
+        }
+        result = self.PcPost(url, data)
+        resultlist = result['result']['list']
+        jobIdlist = []
+        for i in range(len(resultlist)):
+            jobId = result['result']['list'][i][jobId].split()
+
+
+if __name__ == '__main__':
+    unittest.main()
+import unittest
+from atdd.PcPost import PcPost
+
+
+class SaveMem(PcPost):
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    def test_add_mem(self):
+        url = '/contact/Apicp/User/Save'
+        data = {
+            'field_name': 'api-boy',
+            'memGender': 2,
+            'memMobile': '13818801801',
+            'memEmail': '13818801801@163.com',
+            'dpName': '755DDF7E0A69039F0BA121026E5D4D00',
+            'memJob': '755DDF0C0A6916AB3CE15C27CE2D41BB',
+            'memRole': '755DE1790A692CB94314A8BA1FEC458A'  # 管理者
+        }
+        result = self.PcPost(url, data)
+        print(self.host + '/' + self.domain + url)
+        print(result)
+        return result
+
+if __name__ == '__main__':
+    unittest.main()
+import unittest
+from atdd.PcPost import PcPost
+
+
+class SearchMem(PcPost):
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 全部列表
+    def test_search_mem(self):
+        url = '/contact/Apicp/User/DepartmentMember'
+        data = {
+        }
+        result = self.PcPost(url, data)
+        print('接口地址:' + self.host + '/' + self.domain + url)
+        # print(result)
+        return result
+
+    # 按姓名搜索
+    def test_search_name(self):
+        url = '/contact/Apicp/User/DepartmentMember'
+        data = {
+            'name': '刘洋'
+        }
+        result = self.PcPost(url, data)
+        type(result)
+        print('接口地址: ' + self.host + '/' + self.domain + url)
+        self.assertEqual(0, result['errcode'], msg=result['errcode'])
+        # self.assertEqual('ok', result['errsdkcode'], msg=result['errsdkcode'])  # 怎样断言返回结果中的limit（动态）数据？
+        return result
+
+    # 按手机号搜索
+    def test_search_mobile(self):
+        url = '/contact/Apicp/User/DepartmentMember'
+        data = {
+            'mobile': 13818801804
+        }
+        result = self.PcPost(url, data)
+        print('接口地址：' + self.host + '/' + self.domain + url)
+        self.assertEqual(0, result['errcode'], msg=result['errcode'])
+        return result
+
+    # 按角色搜索
+    def test_search_role(self):
+        url = '/contact/Apicp/User/DepartmentMember'
+        data = {
+            'role_ids[0]': '755DE1EC0A69039F18591A299B47E6F3'  # 需动态获取角色列表数据作为参数读取
+        }
+        result = self.PcPost(url, data)
+        self.assertEqual(0, result['errcode'], msg=result['errcode'])
+        print(result)  # 返回结果待验证？
+        return result
+
+
+if __name__ == '__main__':
+    unittest.main()
+
+from atdd.PcPost import PcPost
+
+class PulbicOrg(PcPost):
+    url_ListChildren = "/Contact/Apicp/Department/ListChildren"
+
+    # 获取顶级部门的ID
+    def get_top_org(self):
+        url = "/Contact/Apicp/Department/List"
+        data = {
+            "_identifier": 'contact',
+            "limit": 99999
+        }
+        result = self.PcPost(url,data)
+        top_dpId = result['result']['list'][0]['dpId']
+        return top_dpId
+
+    # 查找某一个部门以及其子部门的dpId,以list格式返回
+    def get_all_dpId(self,dpParentId):
+        data = {
+            "dpParentId":dpParentId
+        }
+        result = self.PcPost(self.url_ListChildren,data)
+        orglist = result['result']['list']     # 组织列表的list信息
+        dpIdList = []
+        for i in range(len(orglist)):
+            dpId = orglist[i]['dpId'].split()
+            # 将dpId加入到dpIdList中
+            dpIdList[len(dpIdList):len(dpIdList)] = dpId
+        return dpIdList
+
+    # 获取组织下的人员总数
+    def get_org_user_total(self,dpParentId):
+        data = {
+            "dpParentId": dpParentId
+        }
+        result = self.PcPost(self.url_ListChildren,data)
+        user_total = result['result']['list'][0]['user_total']
+        return user_total
+
+
+
+
+
+
+from atdd.PcPost import PcPost
+from tests.Staff_Management.Organization.public_org import PulbicOrg
+import random
+
+# 点击组织，跳转至人员列表页面，即查询该组织下的人员情况
+class DepartmentMember(PcPost):
+
+    interfaceUrl = "/contact/Apicp/User/DepartmentMember"
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    def test_departmentMember(self):
+        top_Id = PulbicOrg().get_top_org()
+        dpId_all = PulbicOrg().get_all_dpId(top_Id)  # 所有部门的dpId
+        x = random.randint(0, len(dpId_all) - 1)  # 在所有部门中随机取一个部门
+        data = {
+            "department_id[0]": dpId_all[x]
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
 \ No newline at end of file
+# Author: jipeihong 2017年11月7日14:52:52
+
+from atdd.PcPost import PcPost
+from tests.Staff_Management.Organization.public_org import PulbicOrg
+import random
+
+class AddOrg(PcPost):
+
+    interfaceUrl = "/contact/Apicp/Department/Save"
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+
+    # 添加非门店
+    def test_add_org(self):
+        x = random.randint(0,1000)
+        top_dpId = PulbicOrg().get_top_org()
+        data = {
+            "department_id": None,
+            "parent_id": top_dpId, # 顶级部门
+            "dp_name": "总部组织"+ str(x),
+            "is_all": 1,
+            "is_dept": 0,
+            "dpt_id": "755DD9820A69039F18591A29AC42531A", # 组织类型
+            "dp_serial_num": 1,
+            "dp_leader_uids[0]": self.jipeihong_uid
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
+        return result
+
+    # 新增门店
+    def test_add_mendian(self):
+        x = random.randint(0,1000)
+        top_dpId = PulbicOrg().get_top_org()
+        data = {
+            "department_id": None,
+            "parent_id": top_dpId, # 顶级部门
+            "dp_name": "门店"+ str(x),
+            "is_all": 1,
+            "is_dept": 0,
+            "extList[755DD98A0A69039F18591A29234CC182]": 1,
+            "extList[755DD98B0A69039F18591A29737749E6]": 2,
+            "extList[755DD98C0A69039F18591A295933D690]": 1,
+            "extList[755DD98D0A69039F18591A2959748F91][province]": "山西省",
+            "extList[755DD98D0A69039F18591A2959748F91][city]": "晋城市",
+            "extList[755DD98D0A69039F18591A2959748F91][town]": "泽州县",
+            "extList[755DD98E0A69039F18591A2935DC27D1]": 222,
+            "extList[755DD98F0A69039F18591A2929431878]": 222,
+            "extList[755DD9900A69039F18591A298A2C8C20]": 22222,
+            "extList[755DD9920A69039F18591A29EFFCB47E]": 222,
+            "dpt_id": "755DD9880A69039F18591A294E089AC7",
+            "dp_serial_num": 33,
+            "dp_leader_uids[0]": self.jipeihong_uid
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
+# Author: jipeihong 2017年11月7日14:52:52
+
+from atdd.PcPost import PcPost
+from tests.Staff_Management.Organization.public_org import PulbicOrg
+import random
+
+class DeleteOrg(PcPost):
+
+    interfaceUrl = "/contact/Apicp/Department/Delete"
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    def test_delete_org(self):
+        top_Id = PulbicOrg().get_top_org()
+        dpId_all = PulbicOrg().get_all_dpId(top_Id)   # 所有部门的dpId
+        x = random.randint(0, len(dpId_all)-1)    # 在所有部门中随机取一个部门
+        dpIdList = PulbicOrg().get_all_dpId(dpId_all[x])  #获取该部门以及子部门的ID
+        user_total = PulbicOrg().get_org_user_total(dpId_all[x]) # 获取该该部门的人员总数
+        if len(dpIdList)>1 or user_total>0 or len(dpId_all)==1 : # 如果存在子部门或人员 或只剩下顶级部门
+            code = 700
+            data = {
+                "department_id": dpIdList[x]
+            }
+            result = self.PcPostAbnormal(self.interfaceUrl,data,code)
+        else: # 删除非顶级部门，且部门下无子部门和人员
+            data = {
+                "department_id": dpIdList[0]  #顶级部门
+            }
+            result = self.PcPost(self.interfaceUrl,data)
+            print(result)
+        return result
+
+
+
+
+
+
  
- # Author: jipeihong 2017年11月7日11:22:08
+# Author: jipeihong 2017年11月7日11:22:08
  
 from atdd.PcPost import PcPost
  
+# 搜索组织
 class SearchOrg(PcPost):
+
+    interfaceUrl = "/contact/Apicp/Department/Search"
+
     def setUp(self):
         self.do_login(self.host, self.mobile, self.psw, self.domain)
  
+    # 搜索存在的组织
     def test_search_org(self):
-        interfaceUrl = "/contact/Apicp/Department/Search"
         data = {
             "keyword": 123
         }
-        result = self.PcPost(interfaceUrl,data)
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
+        return result
+
+    # 搜索不存在的组织
+    def test_search_org_abnormal(self):
+        data = {
+            "keyword": 12345
+        }
+        result = self.PcPost(self.interfaceUrl,data)
         print(result)
         return result