local data format
This commit is contained in:
person
parent
d5a5fb59fa
commit
18108a9221
|
|
@ -3,22 +3,8 @@
|
|||
<component name="ChangeListManager">
|
||||
<list default="true" id="40b9626d-5f4f-46c4-8096-7de331aaa15a" name="Default" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||
<change beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
|
||||
<change beforePath="$PROJECT_DIR$/entity/Owner.js" afterPath="$PROJECT_DIR$/entity/Owner.js" />
|
||||
<change beforePath="$PROJECT_DIR$/entity/User.js" afterPath="$PROJECT_DIR$/entity/User.js" />
|
||||
<change beforePath="$PROJECT_DIR$/index.js" afterPath="$PROJECT_DIR$/index.js" />
|
||||
<change beforePath="$PROJECT_DIR$/package-lock.json" afterPath="$PROJECT_DIR$/package-lock.json" />
|
||||
<change beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
|
||||
<change beforePath="$PROJECT_DIR$/pages/ManagePage.js" afterPath="$PROJECT_DIR$/pages/ManagePage.js" />
|
||||
<change beforePath="$PROJECT_DIR$/pages/Page.js" afterPath="$PROJECT_DIR$/pages/Page.js" />
|
||||
<change beforePath="$PROJECT_DIR$/pages/TierPage.js" afterPath="$PROJECT_DIR$/pages/TierPage.js" />
|
||||
<change beforePath="$PROJECT_DIR$/pages/WizardStep3.js" afterPath="$PROJECT_DIR$/pages/WizardStep3.js" />
|
||||
<change beforePath="$PROJECT_DIR$/scenarios/simple.json" afterPath="$PROJECT_DIR$/scenarios/simple.json" />
|
||||
<change beforePath="$PROJECT_DIR$/test/testSuite1.js" afterPath="$PROJECT_DIR$/test/testSuite1.js" />
|
||||
<change beforePath="$PROJECT_DIR$/testSuite2.js" afterPath="" />
|
||||
<change beforePath="$PROJECT_DIR$/tests/Test1.js" afterPath="$PROJECT_DIR$/tests/Test1.js" />
|
||||
<change beforePath="$PROJECT_DIR$/tests/Test4.js" afterPath="$PROJECT_DIR$/tests/Test4.js" />
|
||||
<change beforePath="$PROJECT_DIR$/utils/Utils.js" afterPath="$PROJECT_DIR$/utils/Utils.js" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/.tmp/" />
|
||||
<ignored path="$PROJECT_DIR$/temp/" />
|
||||
|
|
@ -58,18 +44,28 @@
|
|||
<file leaf-file-name="Utils.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/utils/Utils.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="251">
|
||||
<caret line="42" column="11" lean-forward="false" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" />
|
||||
<state relative-caret-position="202">
|
||||
<caret line="26" column="11" lean-forward="false" selection-start-line="26" selection-start-column="11" selection-end-line="26" selection-end-column="11" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="testSuite1.js" pinned="false" current-in-tab="true">
|
||||
<file leaf-file-name="testSuite1.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/test/testSuite1.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="238">
|
||||
<caret line="48" column="21" lean-forward="false" selection-start-line="48" selection-start-column="21" selection-end-line="48" selection-end-column="21" />
|
||||
<state relative-caret-position="144">
|
||||
<caret line="54" column="39" lean-forward="false" selection-start-line="54" selection-start-column="39" selection-end-line="54" selection-end-column="39" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/.gitignore">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="90">
|
||||
<caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -85,11 +81,21 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="TierPage.js" pinned="false" current-in-tab="false">
|
||||
<file leaf-file-name="TierPage.js" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/pages/TierPage.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="320">
|
||||
<caret line="146" column="0" lean-forward="false" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
|
||||
<state relative-caret-position="297">
|
||||
<caret line="178" column="58" lean-forward="true" selection-start-line="178" selection-start-column="58" selection-end-line="178" selection-end-column="58" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="79">
|
||||
<caret line="39" column="38" lean-forward="false" selection-start-line="39" selection-start-column="38" selection-end-line="39" selection-end-column="38" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -180,7 +186,6 @@
|
|||
<option value="$PROJECT_DIR$/WhatToDo.txt" />
|
||||
<option value="$PROJECT_DIR$/pages/WizardStep4.js" />
|
||||
<option value="$PROJECT_DIR$/entity/Owner.js" />
|
||||
<option value="$PROJECT_DIR$/pages/TierPage.js" />
|
||||
<option value="$PROJECT_DIR$/entity/MetaMaskWallet.js" />
|
||||
<option value="$PROJECT_DIR$/pages/ReservedTokensPage.js" />
|
||||
<option value="$PROJECT_DIR$/entity/Investor.js" />
|
||||
|
|
@ -200,7 +205,6 @@
|
|||
<option value="$PROJECT_DIR$/pages/Page.js" />
|
||||
<option value="$PROJECT_DIR$/README.md" />
|
||||
<option value="$PROJECT_DIR$/scenarios/T1RyWn_0008.json" />
|
||||
<option value="$PROJECT_DIR$/index.js" />
|
||||
<option value="$PROJECT_DIR$/pages/WizardStep2.js" />
|
||||
<option value="$PROJECT_DIR$/pages/WizardStep3.js" />
|
||||
<option value="$PROJECT_DIR$/tests/Test1.js" />
|
||||
|
|
@ -209,6 +213,8 @@
|
|||
<option value="$PROJECT_DIR$/scenarios/simple.json" />
|
||||
<option value="$PROJECT_DIR$/test/testSuite1.js" />
|
||||
<option value="$PROJECT_DIR$/scenarios/testSuite1.json" />
|
||||
<option value="$PROJECT_DIR$/index.js" />
|
||||
<option value="$PROJECT_DIR$/pages/TierPage.js" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
|
@ -257,6 +263,11 @@
|
|||
<item name="token-wizard-test-automation" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="token-wizard-test-automation" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="token-wizard-test-automation" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="token-wizard-test-automation" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="pages" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="token-wizard-test-automation" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="token-wizard-test-automation" type="462c0819:PsiDirectoryNode" />
|
||||
|
|
@ -342,12 +353,12 @@
|
|||
<workItem from="1519512666348" duration="8409000" />
|
||||
<workItem from="1519543118708" duration="3486000" />
|
||||
<workItem from="1519665990860" duration="9095000" />
|
||||
<workItem from="1519788052352" duration="581000" />
|
||||
<workItem from="1519788052352" duration="2405000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="333531000" />
|
||||
<option name="totallyTimeSpent" value="335355000" />
|
||||
</component>
|
||||
<component name="TodoView">
|
||||
<todo-panel id="selected-file">
|
||||
|
|
@ -368,7 +379,7 @@
|
|||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20062208" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18506998" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1840796" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="true" internal_type="SLIDING" type="FLOATING" visible="true" show_stripe_button="true" weight="0.8009331" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" x="380" y="559" width="1345" height="307" />
|
||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27391976" sideWeight="0.5078652" order="2" side_tool="true" content_ui="tabs" />
|
||||
|
|
@ -512,13 +523,6 @@
|
|||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/results/result_2_24_2018_16_45_26/screenshoot_2_24_2018_16_36_22.png" />
|
||||
<entry file="file://$PROJECT_DIR$/.gitignore">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="108">
|
||||
<caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/pages/Page.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1440">
|
||||
|
|
@ -541,13 +545,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="468">
|
||||
<caret line="62" column="4" lean-forward="false" selection-start-line="62" selection-start-column="4" selection-end-line="62" selection-end-column="4" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/pages/WizardStep2.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="54">
|
||||
|
|
@ -595,14 +592,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/utils/Utils.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="251">
|
||||
<caret line="42" column="11" lean-forward="false" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/temp/screenshoot_2_27_2018_19_24_5.png">
|
||||
<provider selected="true" editor-type-id="images">
|
||||
<state />
|
||||
|
|
@ -623,14 +612,6 @@
|
|||
<state />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/package.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="153">
|
||||
<caret line="9" column="19" lean-forward="false" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/testSuite2.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
|
|
@ -655,14 +636,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/pages/TierPage.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="320">
|
||||
<caret line="146" column="0" lean-forward="false" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/scenarios/simple.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="255">
|
||||
|
|
@ -679,10 +652,50 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.gitignore">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="90">
|
||||
<caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/test/testSuite1.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="238">
|
||||
<caret line="48" column="21" lean-forward="false" selection-start-line="48" selection-start-column="21" selection-end-line="48" selection-end-column="21" />
|
||||
<state relative-caret-position="144">
|
||||
<caret line="54" column="39" lean-forward="false" selection-start-line="54" selection-start-column="39" selection-end-line="54" selection-end-column="39" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/package.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="153">
|
||||
<caret line="9" column="19" lean-forward="false" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/utils/Utils.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="202">
|
||||
<caret line="26" column="11" lean-forward="false" selection-start-line="26" selection-start-column="11" selection-end-line="26" selection-end-column="11" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="79">
|
||||
<caret line="39" column="38" lean-forward="false" selection-start-line="39" selection-start-column="38" selection-end-line="39" selection-end-column="38" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/pages/TierPage.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="297">
|
||||
<caret line="178" column="58" lean-forward="true" selection-start-line="178" selection-start-column="58" selection-end-line="178" selection-end-column="58" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
|
|||
6
index.js
6
index.js
|
|
@ -35,12 +35,12 @@ const logger=Logger.logger;
|
|||
const tempOutputPath=Logger.tempOutputPath;
|
||||
///////////////////////////////////////
|
||||
|
||||
//var d=Utils.getTimeNear(12135230,"utc");
|
||||
//var d=Utils.getTimeNear(1213000,"utc");
|
||||
//console.log(d);
|
||||
//console.log(Utils.convertTimeToMdy("00:34"));
|
||||
console.log(Utils.convertTimeToMdy("01:10"));
|
||||
|
||||
|
||||
run();
|
||||
//run();
|
||||
|
||||
async function run() {
|
||||
|
||||
|
|
|
|||
|
|
@ -150,10 +150,10 @@ class TierPage extends page.Page{
|
|||
this.tier.startDate=Utils.getDateNear(120000,format);
|
||||
this.tier.startTime=Utils.getTimeNear(120000,format);
|
||||
|
||||
}
|
||||
} else
|
||||
if (format=="mdy") {
|
||||
this.tier.startDate=Utils.convertDateToUtc(this.tier.startDate);
|
||||
this.tier.startTime=Utils.convertDateToUtc(this.tier.startTime);
|
||||
this.tier.startDate=Utils.convertDateToMdy(this.tier.startDate);
|
||||
this.tier.startTime=Utils.convertTimeToMdy(this.tier.startTime);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -172,10 +172,19 @@ class TierPage extends page.Page{
|
|||
|
||||
let locator;
|
||||
|
||||
|
||||
if (this.number==0) {locator=fieldEndTimeTier1;}
|
||||
else {locator=by.By.xpath(fieldEndTime1+this.number+fieldEndTime2);}
|
||||
|
||||
var format=await Utils.getDateFormat(this.driver);
|
||||
|
||||
if((this.tier.endDate=="")) return;
|
||||
else
|
||||
if (format=="mdy") {
|
||||
this.tier.endDate=Utils.convertDateToMdy(this.tier.endDate);
|
||||
this.tier.endTime=Utils.convertTimeToMdy(this.tier.endTime);
|
||||
|
||||
}
|
||||
|
||||
await super.fillWithWait(locator,this.tier.endDate);
|
||||
const action=this.driver.actions();
|
||||
|
|
|
|||
Loading…
Reference in New Issue