修改店铺验证元素

f87b2d62 · linguangwei · 4d51708b · f87b2d62 · f87b2d62
Commit f87b2d62 authored Jun 18, 2021 by linguangwei
Hide whitespace changes
Inline Side-by-side

Showing with 44 additions and 30 deletions

.idea/workspace.xml
+43 -29

src/pageobject/loginpage.py
+1 -1

No files found.
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,15 +4,9 @@
    <option name="autoReloadType" value="SELECTIVE" />
  </component>
  <component name="ChangeListManager">
-    <list default="true" id="f091fe1a-072c-4ac2-a8ca-080be739597a" name="Default Changelist" comment="同步">
+    <list default="true" id="f091fe1a-072c-4ac2-a8ca-080be739597a" name="Default Changelist" comment="登录-开课-结束课程-关闭客户端">
-      <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pageobject/loginpage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pageobject/loginpage.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/requirements.txt" beforeDir="false" afterPath="$PROJECT_DIR$/requirements.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/framework/common.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/framework/common.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pageobject/basepage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pageobject/basepage.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pageobject/mainpage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pageobject/mainpage.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/testcase/testLoginPage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/testcase/testLoginPage.py" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -106,7 +100,7 @@
    <property name="node.js.selected.package.tslint" value="(autodetect)" />
    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
+    <property name="settings.editor.selected.configurable" value="vcs.Git" />
  </component>
  <component name="RecentsManager">
    <key name="CopyFile.RECENT_KEYS">
@@ -117,24 +111,29 @@
      <recent name="C:\Users\Administrator\PycharmProjects\xm-uitest-live" />
    </key>
  </component>
-  <component name="RunManager" selected="Python tests.pytest for testMainPage.TestMainPage.test_2_StartLive">
+  <component name="RunManager" selected="Python.main">
-    <configuration name="pytest for testMainPage.TestMainPage" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+    <configuration name="main" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
      <module name="xm-uitest-live" />
      <option name="INTERPRETER_OPTIONS" value="" />
      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src/testcase" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
      <option name="IS_MODULE_SDK" value="true" />
      <option name="ADD_CONTENT_ROOTS" value="true" />
      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" />
-      <option name="_new_parameters" value="&quot;&quot;" />
+      <option name="PARAMETERS" value="" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="_new_target" value="&quot;testMainPage.TestMainPage&quot;" />
+      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
      <method v="2" />
    </configuration>
-    <configuration name="pytest for testMainPage.TestMainPage.test_1_UnStartLive" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+    <configuration name="pytest for testMainPage.TestMainPage" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
      <module name="xm-uitest-live" />
      <option name="INTERPRETER_OPTIONS" value="" />
      <option name="PARENT_ENVS" value="true" />
@@ -146,11 +145,11 @@
      <option name="_new_keywords" value="&quot;&quot;" />
      <option name="_new_parameters" value="&quot;&quot;" />
      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;testMainPage.TestMainPage.test_1_UnStartLive&quot;" />
+      <option name="_new_target" value="&quot;testMainPage.TestMainPage&quot;" />
      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
      <method v="2" />
    </configuration>
-    <configuration name="pytest for testMainPage.TestMainPage.test_2_StartLive" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+    <configuration name="pytest for testMainPage.TestMainPage.test_1_UnStartLive" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
      <module name="xm-uitest-live" />
      <option name="INTERPRETER_OPTIONS" value="" />
      <option name="PARENT_ENVS" value="true" />
@@ -162,11 +161,11 @@
      <option name="_new_keywords" value="&quot;&quot;" />
      <option name="_new_parameters" value="&quot;&quot;" />
      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;testMainPage.TestMainPage.test_2_StartLive&quot;" />
+      <option name="_new_target" value="&quot;testMainPage.TestMainPage.test_1_UnStartLive&quot;" />
      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
      <method v="2" />
    </configuration>
-    <configuration name="pytest for testMainPage.TestMainPage.test_4_StartLive" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+    <configuration name="pytest for testMainPage.TestMainPage.test_2_StartLive" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
      <module name="xm-uitest-live" />
      <option name="INTERPRETER_OPTIONS" value="" />
      <option name="PARENT_ENVS" value="true" />
@@ -178,11 +177,11 @@
      <option name="_new_keywords" value="&quot;&quot;" />
      <option name="_new_parameters" value="&quot;&quot;" />
      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;testMainPage.TestMainPage.test_4_StartLive&quot;" />
+      <option name="_new_target" value="&quot;testMainPage.TestMainPage.test_2_StartLive&quot;" />
      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
      <method v="2" />
    </configuration>
-    <configuration name="pytest in testMainPage.py" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+    <configuration name="pytest for testMainPage.TestMainPage.test_4_StartLive" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
      <module name="xm-uitest-live" />
      <option name="INTERPRETER_OPTIONS" value="" />
      <option name="PARENT_ENVS" value="true" />
@@ -194,17 +193,17 @@
      <option name="_new_keywords" value="&quot;&quot;" />
      <option name="_new_parameters" value="&quot;&quot;" />
      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;$PROJECT_DIR$/src/testcase/testMainPage.py&quot;" />
+      <option name="_new_target" value="&quot;testMainPage.TestMainPage.test_4_StartLive&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
      <method v="2" />
    </configuration>
    <recent_temporary>
      <list>
+        <item itemvalue="Python.main" />
        <item itemvalue="Python tests.pytest for testMainPage.TestMainPage.test_2_StartLive" />
        <item itemvalue="Python tests.pytest for testMainPage.TestMainPage.test_4_StartLive" />
        <item itemvalue="Python tests.pytest for testMainPage.TestMainPage" />
        <item itemvalue="Python tests.pytest for testMainPage.TestMainPage.test_1_UnStartLive" />
-        <item itemvalue="Python tests.pytest in testMainPage.py" />
      </list>
    </recent_temporary>
  </component>
@@ -269,7 +268,21 @@
      <option name="project" value="LOCAL" />
      <updated>1622638018445</updated>
    </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="登录-开课-结束课程-关闭客户端">
+      <created>1624007574648</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1624007574649</updated>
+    </task>
+    <task id="LOCAL-00008" summary="登录-开课-结束课程-关闭客户端">
+      <created>1624007701385</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1624007701385</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
    <servers />
  </component>
  <component name="TestHistory">
@@ -338,7 +351,8 @@
    <MESSAGE value="just just test" />
    <MESSAGE value="rename" />
    <MESSAGE value="同步" />
-    <option name="LAST_COMMIT_MESSAGE" value="同步" />
+    <MESSAGE value="登录-开课-结束课程-关闭客户端" />
+    <option name="LAST_COMMIT_MESSAGE" value="登录-开课-结束课程-关闭客户端" />
  </component>
  <component name="editorHistoryManager">
    <entry file="file://$PROJECT_DIR$/server.log" />

--- a/src/pageobject/loginpage.py
+++ b/src/pageobject/loginpage.py
@@ -18,7 +18,7 @@ class LoginPage(Page):
    # 验证元素
    # 店铺名称
-    store_name = (By.CLASS_NAME, "inst")
+    store_name = (By.XPATH, """//div[@class="inst"]""")
    def __init__(self, driver):
        Page.__init__(self, driver)