Skip to content

X
xm-uitest-sow
Commit a5ffd83f by linguangwei
Options

review

parent 5c0d56fd
Showing with 31 additions and 16 deletions
.idea/workspace.xml
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="00f4febb-36b6-426d-bfe6-b023876a617e" name="Default Changelist" comment="添加时间轴case"> <list default="true" id="00f4febb-36b6-426d-bfe6-b023876a617e" name="Default Changelist" comment="添加时间轴case">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pageobject/mainbarpage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pageobject/mainbarpage.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/testcase/test_MainBarPage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/testcase/test_MainBarPage.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/testcase/test_MainBarPage.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/testcase/test_MainBarPage.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -35,8 +34,17 @@ ...@@ -35,8 +34,17 @@
</component> </component>
<component name="HighlightingSettingsPerFile"> <component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/main.py" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/main.py" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/pageobject/basepage.py" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/testcase/test_MainBarPage.py" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/pageobject/loginpage.py" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/framework/dingTalk.py" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/src/framework/dingTalk.py" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/testcase/test_WhiteBoardPage.py" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/src/testcase/test_WhiteBoardPage.py" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/demo.py" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/framework/appDriver.py" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/pageobject/mainpage.py" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/framework/common.py" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/pageobject/mainbarpage.py" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/config/config.ini" root0="FORCE_HIGHLIGHTING" />
</component> </component>
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
...@@ -165,7 +173,7 @@ ...@@ -165,7 +173,7 @@
<recent name="C:\Users\Administrator\PycharmProjects\xm-uitest-live" /> <recent name="C:\Users\Administrator\PycharmProjects\xm-uitest-live" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Python tests.pytest for test_MainBarPage.TestMainPage.test_SelectLastMonth"> <component name="RunManager" selected="Python tests.pytest for test_MainBarPage.TestMainPage.test_SelectToday">
<configuration name="demo" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true"> <configuration name="demo" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
<module name="xm-uitest-live" /> <module name="xm-uitest-live" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
...@@ -187,7 +195,7 @@ ...@@ -187,7 +195,7 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="pytest for test_MainBarPage.TestMainPage" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true"> <configuration name="pytest for test_MainBarPage.TestMainPage.test_IfTrueSelectedDay" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
<module name="xm-uitest-live" /> <module name="xm-uitest-live" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
...@@ -199,11 +207,11 @@ ...@@ -199,11 +207,11 @@
<option name="_new_keywords" value="&quot;&quot;" /> <option name="_new_keywords" value="&quot;&quot;" />
<option name="_new_parameters" 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;test_MainBarPage.TestMainPage&quot;" /> <option name="_new_target" value="&quot;test_MainBarPage.TestMainPage.test_IfTrueSelectedDay&quot;" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" /> <option name="_new_targetType" value="&quot;PYTHON&quot;" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="pytest for test_MainBarPage.TestMainPage.test_IfTrueSelectedDay" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true"> <configuration name="pytest for test_MainBarPage.TestMainPage.test_SelectLastMonth" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
<module name="xm-uitest-live" /> <module name="xm-uitest-live" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
...@@ -215,11 +223,11 @@ ...@@ -215,11 +223,11 @@
<option name="_new_keywords" value="&quot;&quot;" /> <option name="_new_keywords" value="&quot;&quot;" />
<option name="_new_parameters" 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;test_MainBarPage.TestMainPage.test_IfTrueSelectedDay&quot;" /> <option name="_new_target" value="&quot;test_MainBarPage.TestMainPage.test_SelectLastMonth&quot;" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" /> <option name="_new_targetType" value="&quot;PYTHON&quot;" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="pytest for test_MainBarPage.TestMainPage.test_SelectLastMonth" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true"> <configuration name="pytest for test_MainBarPage.TestMainPage.test_SelectOtherDay" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
<module name="xm-uitest-live" /> <module name="xm-uitest-live" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
...@@ -231,11 +239,11 @@ ...@@ -231,11 +239,11 @@
<option name="_new_keywords" value="&quot;&quot;" /> <option name="_new_keywords" value="&quot;&quot;" />
<option name="_new_parameters" 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;test_MainBarPage.TestMainPage.test_SelectLastMonth&quot;" /> <option name="_new_target" value="&quot;test_MainBarPage.TestMainPage.test_SelectOtherDay&quot;" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" /> <option name="_new_targetType" value="&quot;PYTHON&quot;" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="pytest for test_MainBarPage.TestMainPage.test_SelectOtherDay" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true"> <configuration name="pytest for test_MainBarPage.TestMainPage.test_SelectToday" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
<module name="xm-uitest-live" /> <module name="xm-uitest-live" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
...@@ -247,17 +255,17 @@ ...@@ -247,17 +255,17 @@
<option name="_new_keywords" value="&quot;&quot;" /> <option name="_new_keywords" value="&quot;&quot;" />
<option name="_new_parameters" 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;test_MainBarPage.TestMainPage.test_SelectOtherDay&quot;" /> <option name="_new_target" value="&quot;test_MainBarPage.TestMainPage.test_SelectToday&quot;" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" /> <option name="_new_targetType" value="&quot;PYTHON&quot;" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Python tests.pytest for test_MainBarPage.TestMainPage.test_SelectLastMonth" /> <item itemvalue="Python tests.pytest for test_MainBarPage.TestMainPage.test_SelectToday" />
<item itemvalue="Python tests.pytest for test_MainBarPage.TestMainPage.test_SelectOtherDay" /> <item itemvalue="Python tests.pytest for test_MainBarPage.TestMainPage.test_SelectOtherDay" />
<item itemvalue="Python tests.pytest for test_MainBarPage.TestMainPage.test_SelectLastMonth" />
<item itemvalue="Python tests.pytest for test_MainBarPage.TestMainPage.test_IfTrueSelectedDay" /> <item itemvalue="Python tests.pytest for test_MainBarPage.TestMainPage.test_IfTrueSelectedDay" />
<item itemvalue="Python.demo" /> <item itemvalue="Python.demo" />
<item itemvalue="Python tests.pytest for test_MainBarPage.TestMainPage" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -518,7 +526,14 @@ ...@@ -518,7 +526,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1626675947132</updated> <updated>1626675947132</updated>
</task> </task>
<option name="localTasksCounter" value="35" /> <task id="LOCAL-00035" summary="添加时间轴case">
<created>1626676712122</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1626676712122</updated>
</task>
<option name="localTasksCounter" value="36" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
......
src/testcase/test_MainBarPage.py
...@@ -46,9 +46,6 @@ class TestMainPage(object): ...@@ -46,9 +46,6 @@ class TestMainPage(object):
first_day = month_not_today(1).strftime("%d") first_day = month_not_today(1).strftime("%d")
self.main_bar_page.click_other_day() self.main_bar_page.click_other_day()
assert self.main_bar_page.month_day_text() == first_day assert self.main_bar_page.month_day_text() == first_day
self.main_bar_page.click_today()
today = month_not_today().strftime("%d")
assert self.main_bar_page.month_day_text() == today
@allure.title("切换到其他日期再切回今日") @allure.title("切换到其他日期再切回今日")
def test_SelectToday(self): def test_SelectToday(self):
...@@ -58,6 +55,9 @@ class TestMainPage(object): ...@@ -58,6 +55,9 @@ class TestMainPage(object):
first_day = month_not_today(1).strftime("%d") first_day = month_not_today(1).strftime("%d")
self.main_bar_page.click_other_day() self.main_bar_page.click_other_day()
assert self.main_bar_page.month_day_text() == first_day assert self.main_bar_page.month_day_text() == first_day
self.main_bar_page.click_today()
today = month_not_today(0).strftime("%d")
assert self.main_bar_page.month_day_text() == today
@allure.title("点击上周") @allure.title("点击上周")
def test_SelectLastWeek(self): def test_SelectLastWeek(self):
......
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