@winning-test/component 0.0.9 → 0.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@winning-test/component",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "",
   "main": "",
   "scripts": {

package/rhm5.6/page/Page.js

@@ -152,6 +152,34 @@ class Page extends require("@winning-test/autotest-webui").Page {
         }
     }
 
+    /**
+     * 获取菜单组件
+     * @returns 顶部菜单组件
+     */
+    menuComponent() {
+        let that = this;
+        class MenuComponent extends require("../component/Component") {
+
+            /**
+             * 选择菜单项
+             * @param {String} firstItem 一级菜单项
+             * @param {String} secondItem 二级菜单项
+             */
+            async select(firstItem, secondItem) {
+                let xpath = "//*[@id='menuconfig']"
+                if (!(await this.browser.isDisplayed(xpath, MenuComponent.delayTime))) {
+                    xpath = "//*[@id='menuconfig123']";
+                    await that.blockComponent(xpath).click();
+                }
+                xpath = `//*[@id='menuconfig']//*[text()='${firstItem}']/ancestor::ul/li[2]//*[text()='${secondItem}']`;
+                await that.blockComponent(xpath).click();
+                await that.switchToActiveFrame();
+            }
+
+        }
+        return new MenuComponent(this.browser);
+    }
+
 }
 
 module.exports = Page;

package/rhm5.6/test/component.test.js

@@ -13,15 +13,7 @@ test("健康知识库表格", async () => {
     await page.inputComponent(null, "username").input(config.nation.admin.账号);
     await page.inputComponent(null, "password").input(config.nation.admin.密码);
     await page.blockComponent("//*[@class='signIn']").click();
-    await page.blockComponent("//*[@id='menuconfig123']").click();
-    await page.textComponent("健康知识库").click();
-    await page.switchToActiveFrame();
-    await page.buttonComponent("查询").click();
-    await page.loading();
-    await page.buttonComponent("查询").click();
-    await page.loading();
-    await page.buttonComponent("查询").click();
-    await page.loading();
+    await page.menuComponent().select("健康教育","健康知识库");
     await page.buttonComponent("查询").click();
     await page.loading();
 })