diff --git a/TestData/account/account_test_data.py b/TestData/account/account_test_data.py index 151f6dfde4b874daaa6183c4dbdecfb56e88592f..74d38d6316663cee77c417d292e309bb0b250390 100644 --- a/TestData/account/account_test_data.py +++ b/TestData/account/account_test_data.py @@ -7,5 +7,7 @@ class accountData(Global): target_language = 'zh-CN' #要翻译的语言 old_name = 'zhs' #旧名字 new_name = 'auto_test' #新名字 - trans_key = 'account.account' + trans_key = 'settingWidget.businessTitle' accountData_sql_handler = SqlHandler(address=base_config.get_value('mysql','address'),port=int(base_config.get_value('mysql','port')),account=base_config.get_value('mysql','account'),password=base_config.get_value('mysql','password')) + + diff --git a/TestData/inbox/livechat_test_data.py b/TestData/inbox/livechat_test_data.py index 463f9864d5d8cb5b4373a95cf22015cfdb79ef9a..bb6b432a700b8fcdef64be6921427a65560a60f3 100644 --- a/TestData/inbox/livechat_test_data.py +++ b/TestData/inbox/livechat_test_data.py @@ -9,5 +9,4 @@ class livechatData(Global): faq = "{\"contentList\":\"
The product I want is out-of-stock, when will it be available?

We strive to maintain our stock levels in line with demand. However, from time to time we may become out of stock of a certain product. If one of our products is out of stock, please feel free to send us a message and well make sure to let you know when you will be able to order it again. 

View all →
\",\"attachmentList\":[]}" rate = "[&*{\"reviewContent\":\"

Would you mind sharing your feedback on your experience so fa222r?

\",\"thumbsReviews\":{\"good\":\"\",\"bad\":\"FeedbackURL\"},\"startReviews\":{\"one_start\":\"FeedbackURL\",\"two_start\":\"FeedbackURL\",\"three_start\":\"FeedbackURL\",\"four_start\":\"\",\"five_start\":\"www.baidu.com\"},\"reviewTitle\":\"How was your chat with {AgentName}222?\",\"reviewChoose\":\"thumbs\",\"askSendReview\":\"true\",\"autoSendReview\":\"false\",\"primaryColor\":\"#2C23E5\"}]" product = "{\"contentList\":\"
Selling Plans Ski Wax
\",\"attachmentList\":[]}" - coupon = "{\"contentList\":\"KP7ZYSNMS9ES\",\"attachmentList\":[]}" - + coupon = "{\"contentList\":\"KP7ZYSNMS9ES\",\"attachmentList\":[]}" \ No newline at end of file diff --git a/TestFile/inbox/channel_select.py b/TestFile/inbox/channel_select.py index b5aa95e9a8ccadb725137a722e915827842bb7b4..2b6d2929452dc502219bb574fa9bcc033dfde624 100644 --- a/TestFile/inbox/channel_select.py +++ b/TestFile/inbox/channel_select.py @@ -21,7 +21,7 @@ setattr(channelData, 'channel_open_room_num_add', len(channel_open_room_select_r customer_service_select_sql = f'select * from `rel_customerservice_brand` where brand_id = {channelData.brandId} and is_delete = 0 and is_activation = 1' customer_service_select_result = test_env_conn.select_many_value(sql=customer_service_select_sql) customer_service_id_list = set([i['customer_service_id'] for i in customer_service_select_result]) -customer_service_list_select_sql = f'select * from `customer_service` where id in {tuple(customer_service_id_list)}' +customer_service_list_select_sql = f'select * from `customer_service` where id in {tuple(customer_service_id_list)} and customer_type != 1' customer_service_list_select_result = test_env_conn.select_many_value(sql=customer_service_list_select_sql) end = 0 diff --git a/TestFile/inbox/ticketInfo_select.py b/TestFile/inbox/ticketInfo_select.py index f0d1344ca15bc92c6f82b8659a13a6365c93896a..cefcb650fcabcdcfb38cbfd5eeec98a5dd9ec850 100644 --- a/TestFile/inbox/ticketInfo_select.py +++ b/TestFile/inbox/ticketInfo_select.py @@ -1,11 +1,11 @@ from TestData.inbox.ticketInfo_test_data import ticketInfoData -all_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 1 and `is_ignore` = 0 and (`room_type` in (0,1) or (`room_type` = 3 and `ai_handle_status` = 100))' -wait_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 2 and `is_ignore` = 0 and (`room_type` in (0,1) or (`room_type` = 3 and `ai_handle_status` = 100))' -close_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 3 and `is_ignore` = 0 and (`room_type` in (0,1) or (`room_type` = 3 and `ai_handle_status` = 100))' -your_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 1 and `allocation_uid` = {ticketInfoData.userId} and `is_ignore` = 0 and (`room_type` in (0,1) or (`room_type` = 3 and `ai_handle_status` = 100))' -your_wait_ticket_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 2 and `allocation_uid` = {ticketInfoData.userId} and `is_ignore` = 0 and (`room_type` in (0,1) or (`room_type` = 3 and `ai_handle_status` = 100))' -your_close_ticket_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 3 and `allocation_uid` = {ticketInfoData.userId} and `is_ignore` = 0 and (`room_type` in (0,1) or (`room_type` = 3 and `ai_handle_status` = 100))' +all_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 1 and `is_ignore` = 0 and (`room_type` in (0,1,3) or (`room_type` = 3 and `ai_handle_status` = 100))' +wait_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 2 and `is_ignore` = 0 and (`room_type` in (0,1,3) or (`room_type` = 3 and `ai_handle_status` = 100))' +close_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 3 and `is_ignore` = 0 and (`room_type` in (0,1,3) or (`room_type` = 3 and `ai_handle_status` = 100))' +your_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 1 and `allocation_uid` = {ticketInfoData.userId} and `is_ignore` = 0 and (`room_type` in (0,1,3) or (`room_type` = 3 and `ai_handle_status` = 100))' +your_wait_ticket_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 2 and `allocation_uid` = {ticketInfoData.userId} and `is_ignore` = 0 and (`room_type` in (0,1,3) or (`room_type` = 3 and `ai_handle_status` = 100))' +your_close_ticket_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 3 and `allocation_uid` = {ticketInfoData.userId} and `is_ignore` = 0 and (`room_type` in (0,1,3) or (`room_type` = 3 and `ai_handle_status` = 100))' all_ticket_num = len(ticketInfoData.ticket_info_db.select_many_value(sql=all_ticket_select_sql)) wait_ticket_num = len(ticketInfoData.ticket_info_db.select_many_value(sql=wait_ticket_select_sql)) diff --git a/TestFile/inbox/ticketStatus_selectStatus.py b/TestFile/inbox/ticketStatus_selectStatus.py index 39f804271ccd057d1dc7586a45216ad538232f1e..a3f934ae506fbfb7da191b38c7121142577055d3 100644 --- a/TestFile/inbox/ticketStatus_selectStatus.py +++ b/TestFile/inbox/ticketStatus_selectStatus.py @@ -1,10 +1,10 @@ from Utils.sql_handler import test_env_conn from TestData.inbox.ticketStatus_test_data import ticketStatusData -all_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `is_ignore` = 0 and (`room_type` in (0,1) or (`room_type` = 3 and `ai_handle_status` = 100))' -your_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `allocation_uid` = {ticketStatusData.userId} and `is_ignore` = 0 and (`room_type` in (0,1) or (`room_type` = 3 and `ai_handle_status` = 100))' -unread_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `read_status` = 1 and `is_ignore` = 0 and (`room_type` in (0,1) or (`room_type` = 3 and `ai_handle_status` = 100))' -unassigned_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `allocation_uid` = 0 and `is_ignore` = 0 and (`room_type` in (0,1) or (`room_type` = 3 and `ai_handle_status` = 100))' +all_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `is_ignore` = 0 and (`room_type` in (0,1,3) or (`room_type` = 3 and `ai_handle_status` = 100))' +your_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `allocation_uid` = {ticketStatusData.userId} and `is_ignore` = 0 and (`room_type` in (0,1,3) or (`room_type` = 3 and `ai_handle_status` = 100))' +unread_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `read_status` = 1 and `is_ignore` = 0 and (`room_type` in (0,1,3) or (`room_type` = 3 and `ai_handle_status` = 100))' +unassigned_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `allocation_uid` = 0 and `is_ignore` = 0 and (`room_type` in (0,1,3) or (`room_type` = 3 and `ai_handle_status` = 100))' chatbot_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `is_ignore` = 0 and room_type in (2,3)' diff --git a/YamlCase/inbox/channel.yaml b/YamlCase/inbox/channel.yaml index 68e0e0bcf6a1abe2c39cafdafc88d6e95a2bbad6..ff21991a5b1d3f83d901a89eb974fefd3776201d 100644 --- a/YamlCase/inbox/channel.yaml +++ b/YamlCase/inbox/channel.yaml @@ -9,11 +9,11 @@ api1: - eq: {"$.data.list[?(@.id == '${channel_id}')].name" : "${channel_name}"} - eq: {"$.data.list[?(@.id == '${channel_id}')].openCount" : "${channel_open_room_num}"} - eq: {"$.data.list[?(@.id == '${channel_id}')].resourceId" : "${channel_resource_id}"} - - eq: {"$.data.list[?(@.id == '${channel_id}')].memberCount" : "${customer_service_num}"} - eq: {"$.data.list[?(@.id == '${channel_id}')].members[?(@.id == '${customer_service_id}')].openedRoomCount" : "${customer_channel_open_room_num}"} - eq: {"$.data.list[?(@.id == '${channel_id}')].members[?(@.id == '${customer_service_id}')].profile" : "${customer_service_image}"} - eq: {"$.data.list[?(@.id == '${channel_id}')].members[?(@.id == '${customer_service_id}')].name" : "${customer_service_name}"} - eq: {"$.data.list[?(@.id == '${channel_id}')].members[?(@.id == '${customer_service_id}')].email" : "${customer_service_email}"} + - exec: {"code": "assert len([member for member in res.json()['data']['list'][0]['members'] if member['isActivation'] == 1]) == '${customer_service_num}'"} api2: title: 检查渠道对应客服信息