Commit a311308c by zhangying

Merge branch 'master' of D:\pycharm projects\xm-uitest-sow with conflicts.

parent e1649949
...@@ -4,15 +4,97 @@ ...@@ -4,15 +4,97 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f091fe1a-072c-4ac2-a8ca-080be739597a" name="Default Changelist" comment="修改店铺验证元素"> <list default="true" id="00f4febb-36b6-426d-bfe6-b023876a617e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/commom/__init__.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/testcase/testMainPage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/testcase/testMainPage.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/commom/alertAccept.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/commom/appDriver.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/commom/login.py" beforeDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/framework/appDriver.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#9#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/framework/common.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-120">
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pageobject/mainpage.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/testcase/testLoginPage.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/testcase/testMainPage.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/config.ini">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="17" column="49" lean-forward="true" selection-start-line="17" selection-start-column="49" selection-end-line="17" selection-end-column="49" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/readConfig.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="12" column="19" lean-forward="true" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
<folding>
<element signature="e#0#19#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
<list> <list>
...@@ -52,10 +134,10 @@ ...@@ -52,10 +134,10 @@
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="416" /> <option name="x" value="333" />
<option name="y" value="116" /> <option name="y" value="44" />
<option name="width" value="1874" /> <option name="width" value="2089" />
<option name="height" value="1189" /> <option name="height" value="1307" />
</component> </component>
<component name="ProjectId" id="1tNJXUBIdF7Iljvh6v3JNiXndy2" /> <component name="ProjectId" id="1tNJXUBIdF7Iljvh6v3JNiXndy2" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
...@@ -74,7 +156,44 @@ ...@@ -74,7 +156,44 @@
<path> <path>
<item name="xm-uitest-sow" type="b2602c69:ProjectViewProjectNode" /> <item name="xm-uitest-sow" type="b2602c69:ProjectViewProjectNode" />
<item name="xm-uitest-sow" type="462c0819:PsiDirectoryNode" /> <item name="xm-uitest-sow" type="462c0819:PsiDirectoryNode" />
<item name="case" type="462c0819:PsiDirectoryNode" /> <item name="assets" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="xm-uitest-sow" type="b2602c69:ProjectViewProjectNode" />
<item name="xm-uitest-sow" type="462c0819:PsiDirectoryNode" />
<item name="config" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="xm-uitest-sow" type="b2602c69:ProjectViewProjectNode" />
<item name="xm-uitest-sow" type="462c0819:PsiDirectoryNode" />
<item name="liveCourseTable" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="xm-uitest-sow" type="b2602c69:ProjectViewProjectNode" />
<item name="xm-uitest-sow" type="462c0819:PsiDirectoryNode" />
<item name="liveRoom" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="xm-uitest-sow" type="b2602c69:ProjectViewProjectNode" />
<item name="xm-uitest-sow" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="xm-uitest-sow" type="b2602c69:ProjectViewProjectNode" />
<item name="xm-uitest-sow" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="framework" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="xm-uitest-sow" type="b2602c69:ProjectViewProjectNode" />
<item name="xm-uitest-sow" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="testcase" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="xm-uitest-sow" type="b2602c69:ProjectViewProjectNode" />
<item name="xm-uitest-sow" type="462c0819:PsiDirectoryNode" />
<item name="tools" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
...@@ -111,6 +230,18 @@ ...@@ -111,6 +230,18 @@
<recent name="C:\Users\Administrator\PycharmProjects\xm-uitest-live" /> <recent name="C:\Users\Administrator\PycharmProjects\xm-uitest-live" />
</key> </key>
</component> </component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager" selected="Python.main"> <component name="RunManager" selected="Python.main">
<configuration name="main" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true"> <configuration name="main" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
<module name="xm-uitest-live" /> <module name="xm-uitest-live" />
...@@ -124,6 +255,7 @@ ...@@ -124,6 +255,7 @@
<option name="IS_MODULE_SDK" value="true" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" /> <option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" />
<option name="PARAMETERS" value="" /> <option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" /> <option name="SHOW_COMMAND_LINE" value="false" />
...@@ -142,8 +274,8 @@ ...@@ -142,8 +274,8 @@
<option name="IS_MODULE_SDK" value="true" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="_new_keywords" value="&quot;&quot;" /> <option name="_new_keywords" value="&quot;&quot;" />
<option name="_new_parameters" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" /> <option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;testMainPage.TestMainPage&quot;" /> <option name="_new_target" value="&quot;testMainPage.TestMainPage&quot;" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" /> <option name="_new_targetType" value="&quot;PYTHON&quot;" />
...@@ -158,8 +290,8 @@ ...@@ -158,8 +290,8 @@
<option name="IS_MODULE_SDK" value="true" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="_new_keywords" value="&quot;&quot;" /> <option name="_new_keywords" value="&quot;&quot;" />
<option name="_new_parameters" value="&quot;&quot;" />
<option name="_new_additionalArguments" 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.test_1_UnStartLive&quot;" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" /> <option name="_new_targetType" value="&quot;PYTHON&quot;" />
...@@ -174,8 +306,8 @@ ...@@ -174,8 +306,8 @@
<option name="IS_MODULE_SDK" value="true" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="_new_keywords" value="&quot;&quot;" /> <option name="_new_keywords" value="&quot;&quot;" />
<option name="_new_parameters" value="&quot;&quot;" />
<option name="_new_additionalArguments" 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_2_StartLive&quot;" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" /> <option name="_new_targetType" value="&quot;PYTHON&quot;" />
...@@ -190,8 +322,8 @@ ...@@ -190,8 +322,8 @@
<option name="IS_MODULE_SDK" value="true" /> <option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="_new_keywords" value="&quot;&quot;" /> <option name="_new_keywords" value="&quot;&quot;" />
<option name="_new_parameters" value="&quot;&quot;" />
<option name="_new_additionalArguments" 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_4_StartLive&quot;" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" /> <option name="_new_targetType" value="&quot;PYTHON&quot;" />
...@@ -207,7 +339,7 @@ ...@@ -207,7 +339,7 @@
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> <component name="SpellCheckerSettings" BundledDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="application-level" UseSingleDictionary="true" />
<component name="SvnConfiguration"> <component name="SvnConfiguration">
<configuration>C:\Users\Administrator\AppData\Roaming\Subversion</configuration> <configuration>C:\Users\Administrator\AppData\Roaming\Subversion</configuration>
</component> </component>
...@@ -282,14 +414,7 @@ ...@@ -282,14 +414,7 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1624007701385</updated> <updated>1624007701385</updated>
</task> </task>
<task id="LOCAL-00009" summary="修改店铺验证元素"> <option name="localTasksCounter" value="9" />
<created>1624009258689</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1624009258689</updated>
</task>
<option name="localTasksCounter" value="10" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
...@@ -298,12 +423,12 @@ ...@@ -298,12 +423,12 @@
</history-entry> </history-entry>
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="15067000" /> <option name="totallyTimeSpent" value="15519000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="416" y="116" width="1874" height="1189" extended-state="0" /> <frame x="333" y="44" width="2089" height="1307" extended-state="0" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22657111" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21833415" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
...@@ -317,7 +442,7 @@ ...@@ -317,7 +442,7 @@
<window_info anchor="bottom" id="Version Control" order="8" weight="0.2736954" /> <window_info anchor="bottom" id="Version Control" order="8" weight="0.2736954" />
<window_info anchor="bottom" id="Database Changes" order="9" /> <window_info anchor="bottom" id="Database Changes" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50054526" side_tool="true" weight="0.39504844" /> <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50054526" side_tool="true" weight="0.39504844" />
<window_info anchor="bottom" id="Terminal" order="11" visible="true" weight="0.28530806" /> <window_info anchor="bottom" id="Terminal" order="11" visible="true" weight="0.21568628" />
<window_info anchor="bottom" id="Python Console" order="12" weight="0.3290653" /> <window_info anchor="bottom" id="Python Console" order="12" weight="0.3290653" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
...@@ -335,6 +460,12 @@ ...@@ -335,6 +460,12 @@
<entry key="MAIN"> <entry key="MAIN">
<value> <value>
<State> <State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="FILTERS"> <option name="FILTERS">
<map> <map>
<entry key="branch"> <entry key="branch">
...@@ -351,7 +482,20 @@ ...@@ -351,7 +482,20 @@
</entry> </entry>
</map> </map>
</option> </option>
<option name="oldMeFiltersMigrated" value="true" /> <option name="RECENT_FILTERS">
<map>
<entry key="Branch">
<value>
<list />
</value>
</entry>
<entry key="User">
<value>
<list />
</value>
</entry>
</map>
</option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="test test" /> <MESSAGE value="test test" />
...@@ -359,133 +503,198 @@ ...@@ -359,133 +503,198 @@
<MESSAGE value="rename" /> <MESSAGE value="rename" />
<MESSAGE value="同步" /> <MESSAGE value="同步" />
<MESSAGE value="登录-开课-结束课程-关闭客户端" /> <MESSAGE value="登录-开课-结束课程-关闭客户端" />
<MESSAGE value="修改店铺验证元素" /> <option name="LAST_COMMIT_MESSAGE" value="登录-开课-结束课程-关闭客户端" />
<option name="LAST_COMMIT_MESSAGE" value="修改店铺验证元素" /> </component>
<component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/xm_uitest_sow$enterClass.coverage" NAME="enterClass Coverage Results" MODIFIED="1621568267725" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/liveCourseTable" />
<SUITE FILE_PATH="coverage/xm_uitest_live$wyfTest.coverage" NAME="wyfTest Coverage Results" MODIFIED="1620809942975" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/xm_uitest_sow$classStatus.coverage" NAME="classStatus Coverage Results" MODIFIED="1620974730032" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/liveCourseTable" />
<SUITE FILE_PATH="coverage/xm_uitest_sow$roomName.coverage" NAME="roomName Coverage Results" MODIFIED="1621567390821" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/liveRoom" />
<SUITE FILE_PATH="coverage/xm_uitest_sow$login.coverage" NAME="login Coverage Results" MODIFIED="1620884769813" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/xm_uitest_sow$pytest_for_test_enter_test_answer.coverage" NAME="pytest for test_enter.test_answer Coverage Results" MODIFIED="1621586260062" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/case" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/server.log" /> <entry file="file://$PROJECT_DIR$/server.log" />
<entry file="file://$PROJECT_DIR$/wyfTest.py" /> <entry file="file://$PROJECT_DIR$/wyfTest.py" />
<entry file="file://$PROJECT_DIR$/commom/alertAccept.py"> <entry file="file://$PROJECT_DIR$/liveCourseTable/weekName.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="40"> <state>
<caret line="2" column="34" selection-start-line="2" selection-start-column="34" selection-end-line="2" selection-end-column="34" /> <folding>
<element signature="e#0#36#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/today.py"> <entry file="file://$PROJECT_DIR$/liveCourseTable/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/classStatus.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320"> <state relative-caret-position="200">
<caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" /> <caret line="11" column="54" selection-start-line="11" selection-start-column="54" selection-end-line="11" selection-end-column="54" />
<folding>
<element signature="e#0#36#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/weekName.py"> <entry file="file://$PROJECT_DIR$/liveRoom/startPrompt.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="120">
<folding> <caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
<element signature="e#0#36#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/__init__.py"> <entry file="file://$PROJECT_DIR$/liveRoom/coursewareTab.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common.py" />
<entry file="file://$PROJECT_DIR$/commom/__init__.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/case/test_enter.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/liveRoom/roomName.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="20" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/weekDay.py"> <entry file="file://$PROJECT_DIR$/liveCourseTable/weekDay.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360"> <state relative-caret-position="340">
<caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" /> <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/today.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/startClass.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="24" selection-start-line="24" selection-end-line="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/enterClass.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="12" column="60" selection-start-line="12" selection-start-column="60" selection-end-line="12" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pageobject/basepage.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-540">
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#22#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/classStatus.py"> <entry file="file://$PROJECT_DIR$/src/pageobject/loginpage.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220"> <state>
<caret line="11" column="54" selection-start-line="11" selection-start-column="54" selection-end-line="11" selection-end-column="54" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#40#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveRoom/startPrompt.py"> <entry file="file://$PROJECT_DIR$/src/pageobject/mainpage.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140"> <state>
<caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#46#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveRoom/roomName.py"> <entry file="file://$PROJECT_DIR$/src/testcase/testLoginPage.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
<caret selection-end-line="20" selection-end-column="20" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#46#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveRoom/coursewareTab.py"> <entry file="file://$PROJECT_DIR$/src/testcase/testMainPage.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400"> <state>
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/commom/login.py"> <entry file="file://$PROJECT_DIR$/config/readConfig.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140"> <state relative-caret-position="240">
<caret line="7" column="56" selection-start-line="7" selection-start-column="56" selection-end-line="7" selection-end-column="56" /> <caret line="12" column="19" lean-forward="true" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
<folding>
<element signature="e#0#19#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/commom/appDriver.py"> <entry file="file://$PROJECT_DIR$/config/config.ini">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="340">
<caret line="5" column="9" selection-start-line="5" selection-start-column="9" selection-end-line="5" selection-end-column="9" /> <caret line="17" column="49" lean-forward="true" selection-start-line="17" selection-start-column="49" selection-end-line="17" selection-end-column="49" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/common.py"> <entry file="file://$PROJECT_DIR$/src/framework/appDriver.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#9#0" expanded="true" />
</folding>
</state>
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/enterClass.py"> <entry file="file://$PROJECT_DIR$/commom/appDriver.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240"> <state relative-caret-position="220">
<caret line="12" column="60" selection-start-line="12" selection-start-column="60" selection-end-line="12" selection-end-column="60" /> <caret line="11" column="86" lean-forward="true" selection-start-line="11" selection-start-column="86" selection-end-line="11" selection-end-column="86" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#9#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/commom/__init__.py"> <entry file="file://$PROJECT_DIR$/commom/alertAccept.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<state>
<caret line="2" column="34" selection-start-line="2" selection-start-column="34" selection-end-line="2" selection-end-column="34" />
</state>
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/case/test_enter.py"> <entry file="file://$PROJECT_DIR$/commom/login.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="40">
<caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" /> <caret line="2" column="89" lean-forward="true" selection-start-line="2" selection-start-column="89" selection-end-line="2" selection-end-column="89" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/startClass.py"> <entry file="file://$PROJECT_DIR$/src/framework/common.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="-120">
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#11#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
from commom.appDriver import get_app_driver
from commom.login import app_login
from startClass import start_class
driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe')
app_login(driver)
start_class(driver)
# 进入直播间
def alert_accept(driver):
# sleep(3)
driver.find_element_by_class_name("ant-btn").click()
return alert_accept
if __name__ == '__main__':
alert_accept(driver)
\ No newline at end of file
import os
from time import sleep, time
from src.framework.common import file_abspath
from selenium import webdriver
from selenium.webdriver.chrome import service
from selenium.webdriver.chrome.webdriver import WebDriver
# web_driver_path = os.path.join(
# "./chromedriver")
service = webdriver.chrome.service.Service(file_abspath() + "/tools/chromedriver.exe")
service.start()
def get_app_driver(PATH_TO_BINARY_APP):
driver: WebDriver = webdriver.remote.webdriver.WebDriver(
command_executor=service.service_url,
desired_capabilities={
'browserName': 'chrome',
'goog:chromeOptions': {
'args': [],
'binary': PATH_TO_BINARY_APP,
'extensions': [],
'windowTypes': ['webview']},
'platform': 'ANY',
'version': ''},
browser_profile=None,
proxy=None,
keep_alive=False)
sleep(5)
return driver
if __name__ == '__main__':
get_app_driver()
# driver = get_app_driver(PATH_TO_BINARY_APP)
# driver.find_element_by_id("rc-tabs-0-tab-2").click()
from commom.appDriver import get_app_driver
driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe')
# 手机号登录
def app_login(driver):
driver.find_element_by_id("rc-tabs-0-tab-2").click()
driver.find_element_by_id("xmphone").click()
driver.find_element_by_id("xmphone").send_keys("15068165765")
driver.find_element_by_id("xmpwd").click()
driver.find_element_by_id("xmpwd").send_keys("0000")
driver.find_element_by_class_name("submit").click()
return app_login
if __name__ == '__main__':
app_login(driver)
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment