change

季培红
1 parent b93557f5
Showing 7 changed files with 87 additions and 11 deletions
README.md
atdd/ATDDCase.py
atdd/PcPost.py
tests/Staff-Management/Organization/public_org.py
tests/Staff-Management/Organization/test_add_org.py
tests/Staff-Management/Organization/test_delete_org.py
tests/Staff-Management/Organization/test_search_org.py
-先去gitlab上创建开发分之：feature/jipeihong
+先去gitlab上创建开发分支：feature/自己的名字拼音
 在本地项目中git输入命令：
 git pull
@@ -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
+# Author: jipeihong 2017年11月7日14:52:52
+
+from atdd.PcPost import PcPost
+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 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
+
+
+    def test_add_org(self):
+        x = random.randint(0,1000)
+        top_dpId = self.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
 \ No newline at end of file
+# Author: jipeihong 2017年11月7日14:52:52
+
+from atdd.PcPost import PcPost
+
+class DeleteOrg(PcPost):
+
+    interfaceUrl = "/contact/Apicp/Department/Delete"
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 查找除了顶级部门之外的所有部门的dpId
+    def get_all_dpId(self):
+        url = "/Contact/Apicp/Department/ListChildren"
+        data = {
+            "dpParentId":
+        }
+
+
+    def test_delete_org(self):
+        # data = {
+        #     "department_id":
+        # }
- # 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