This commit is contained in:
parent
e55cc532b5
commit
d0cdb98d67
|
@ -2,12 +2,8 @@
|
|||
<project version="4">
|
||||
<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$/index.js" afterPath="$PROJECT_DIR$/index.js" />
|
||||
<change beforePath="$PROJECT_DIR$/pages/Page.js" afterPath="$PROJECT_DIR$/pages/Page.js" />
|
||||
<change beforePath="$PROJECT_DIR$/test/testSuite1.js" afterPath="$PROJECT_DIR$/test/testSuite1.js" />
|
||||
<change beforePath="$PROJECT_DIR$/test/testSuite2.js" afterPath="$PROJECT_DIR$/test/testSuite2.js" />
|
||||
<change beforePath="$PROJECT_DIR$/utils/Utils.js" afterPath="$PROJECT_DIR$/utils/Utils.js" />
|
||||
<change beforePath="$PROJECT_DIR$/entity/User.js" afterPath="$PROJECT_DIR$/entity/User.js" />
|
||||
<change beforePath="$PROJECT_DIR$/pages/MetaMask.js" afterPath="$PROJECT_DIR$/pages/MetaMask.js" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/.tmp/" />
|
||||
<ignored path="$PROJECT_DIR$/temp/" />
|
||||
|
@ -28,7 +24,7 @@
|
|||
<entry file="file://$PROJECT_DIR$/entity/User.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="114">
|
||||
<caret line="202" column="35" lean-forward="false" selection-start-line="202" selection-start-column="35" selection-end-line="202" selection-end-column="35" />
|
||||
<caret line="419" column="36" lean-forward="true" selection-start-line="419" selection-start-column="36" selection-end-line="419" selection-end-column="36" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
@ -37,7 +33,7 @@
|
|||
<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="225">
|
||||
<state relative-caret-position="583">
|
||||
<caret line="167" column="0" lean-forward="true" selection-start-line="167" selection-start-column="0" selection-end-line="167" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
|
@ -64,11 +60,11 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="Page.js" pinned="false" current-in-tab="true">
|
||||
<file leaf-file-name="Page.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/pages/Page.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="90">
|
||||
<caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
|
||||
<state relative-caret-position="-2148">
|
||||
<caret line="146" column="39" lean-forward="true" selection-start-line="146" selection-start-column="39" selection-end-line="146" selection-end-column="39" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
@ -104,11 +100,11 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="MetaMask.js" pinned="false" current-in-tab="false">
|
||||
<file leaf-file-name="MetaMask.js" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/pages/MetaMask.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="304">
|
||||
<caret line="132" column="27" lean-forward="false" selection-start-line="132" selection-start-column="27" selection-end-line="132" selection-end-column="27" />
|
||||
<state relative-caret-position="248">
|
||||
<caret line="220" column="26" lean-forward="false" selection-start-line="220" selection-start-column="25" selection-end-line="220" selection-end-column="26" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
@ -151,10 +147,10 @@
|
|||
<find>switc</find>
|
||||
<find>switch</find>
|
||||
<find>isDisplayed</find>
|
||||
<find>create</find>
|
||||
<find>switch</find>
|
||||
<find>do</find>
|
||||
<find>browser</find>
|
||||
<find>create</find>
|
||||
</findStrings>
|
||||
<dirStrings>
|
||||
<dir>$PROJECT_DIR$/temp</dir>
|
||||
|
@ -211,13 +207,13 @@
|
|||
<option value="$PROJECT_DIR$/pages/InvestPage.js" />
|
||||
<option value="$PROJECT_DIR$/pages/ManagePage.js" />
|
||||
<option value="$PROJECT_DIR$/pages/WizardStep4.js" />
|
||||
<option value="$PROJECT_DIR$/pages/MetaMask.js" />
|
||||
<option value="$PROJECT_DIR$/entity/User.js" />
|
||||
<option value="$PROJECT_DIR$/test/testSuite1.js" />
|
||||
<option value="$PROJECT_DIR$/index.js" />
|
||||
<option value="$PROJECT_DIR$/test/testSuite2.js" />
|
||||
<option value="$PROJECT_DIR$/utils/Utils.js" />
|
||||
<option value="$PROJECT_DIR$/pages/Page.js" />
|
||||
<option value="$PROJECT_DIR$/entity/User.js" />
|
||||
<option value="$PROJECT_DIR$/pages/MetaMask.js" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
@ -380,12 +376,12 @@
|
|||
<workItem from="1519665990860" duration="9095000" />
|
||||
<workItem from="1519788052352" duration="2739000" />
|
||||
<workItem from="1519840457230" duration="27677000" />
|
||||
<workItem from="1520279748388" duration="7260000" />
|
||||
<workItem from="1520279748388" duration="8233000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="414858000" />
|
||||
<option name="totallyTimeSpent" value="415831000" />
|
||||
</component>
|
||||
<component name="TodoView">
|
||||
<todo-panel id="selected-file">
|
||||
|
@ -660,14 +656,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/pages/MetaMask.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="304">
|
||||
<caret line="132" column="27" lean-forward="false" selection-start-line="132" selection-start-column="27" selection-end-line="132" selection-end-column="27" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/index.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="155">
|
||||
|
@ -692,14 +680,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/entity/User.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="114">
|
||||
<caret line="202" column="35" lean-forward="false" selection-start-line="202" selection-start-column="35" selection-end-line="202" selection-end-column="35" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/entity/Logger.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="389">
|
||||
|
@ -708,18 +688,34 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/pages/Page.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-2148">
|
||||
<caret line="146" column="39" lean-forward="true" selection-start-line="146" selection-start-column="39" selection-end-line="146" selection-end-column="39" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/utils/Utils.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="225">
|
||||
<state relative-caret-position="583">
|
||||
<caret line="167" column="0" lean-forward="true" selection-start-line="167" selection-start-column="0" selection-end-line="167" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/pages/Page.js">
|
||||
<entry file="file://$PROJECT_DIR$/entity/User.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="90">
|
||||
<caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
|
||||
<state relative-caret-position="114">
|
||||
<caret line="419" column="36" lean-forward="true" selection-start-line="419" selection-start-column="36" selection-end-line="419" selection-end-column="36" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/pages/MetaMask.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="248">
|
||||
<caret line="220" column="26" lean-forward="false" selection-start-line="220" selection-start-column="25" selection-end-line="220" selection-end-column="26" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
|
@ -417,7 +417,7 @@ catch(err){
|
|||
var timeLimit=timeLimitTransactions*cur.tiers.length;
|
||||
do
|
||||
{
|
||||
z=await metaMask.doTransaction();
|
||||
z=await metaMask.doTransaction(3);
|
||||
trCounter++;
|
||||
if (!z) {
|
||||
|
||||
|
@ -429,7 +429,7 @@ catch(err){
|
|||
logger.info("Transaction# "+trCounter+" is successfull");
|
||||
}
|
||||
|
||||
await this.driver.sleep(5000);//1000
|
||||
await this.driver.sleep(1000);//1000
|
||||
if ((await wizardStep4.isPresentButtonSkipTransaction()))
|
||||
{
|
||||
await Utils.takeScreenshoot(this.driver);
|
||||
|
@ -441,19 +441,19 @@ catch(err){
|
|||
skippedTr++;
|
||||
await this.driver.sleep(5000);//1000
|
||||
}
|
||||
else
|
||||
else {
|
||||
await this.driver.sleep(3000);
|
||||
if (!(await wizardStep4.isPage())) {//if modal NOT present
|
||||
//await this.driver.sleep(10000);
|
||||
|
||||
await wizardStep4.waitUntilLoaderGone();
|
||||
await Utils.takeScreenshoot(this.driver);
|
||||
// await this.driver.sleep(5000);
|
||||
await wizardStep4.clickButtonOk();
|
||||
|
||||
if (!(await wizardStep4.isPage())) {//if modal NOT present
|
||||
//await this.driver.sleep(10000);
|
||||
|
||||
await wizardStep4.waitUntilLoaderGone();
|
||||
await Utils.takeScreenshoot(this.driver);
|
||||
// await this.driver.sleep(5000);
|
||||
await wizardStep4.clickButtonOk();
|
||||
|
||||
b=false;
|
||||
}
|
||||
b = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (skippedTr>5)
|
||||
{
|
||||
|
|
|
@ -199,13 +199,13 @@ async doTransaction(refreshCount){
|
|||
logger.info(this.name+"wait and submit transaction :");
|
||||
await this.switchToNextPage();
|
||||
var counter=0;
|
||||
var timeLimit=20;
|
||||
var timeLimit=5;
|
||||
if (refreshCount!='undefined') timeLimit=refreshCount;
|
||||
do {
|
||||
|
||||
await this.driver.sleep(1000);
|
||||
await this.refresh();
|
||||
await this.driver.sleep(3000);
|
||||
await this.driver.sleep(1000);
|
||||
await super.waitUntilLocated(iconChangeAccount);
|
||||
//await Utils.takeScreenshoot(this.driver);
|
||||
|
||||
|
@ -216,6 +216,7 @@ async doTransaction(refreshCount){
|
|||
return true;
|
||||
}
|
||||
counter++;
|
||||
logger.info("counter #"+ counter);
|
||||
if (counter>=timeLimit) {
|
||||
await this.switchToNextPage();
|
||||
|
||||
|
|
Loading…
Reference in New Issue