This commit is contained in:
person 2018-03-04 12:03:00 -08:00
parent 6e963210d6
commit 3bb98cb630
3 changed files with 39 additions and 52 deletions

View File

@ -2,12 +2,7 @@
<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$/entity/User.js" afterPath="$PROJECT_DIR$/entity/User.js" />
<change beforePath="$PROJECT_DIR$/pages/MetaMask.js" afterPath="$PROJECT_DIR$/pages/MetaMask.js" />
<change beforePath="$PROJECT_DIR$/pages/Page.js" afterPath="$PROJECT_DIR$/pages/Page.js" />
<change beforePath="$PROJECT_DIR$/pages/WizardStep4.js" afterPath="$PROJECT_DIR$/pages/WizardStep4.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/" />
@ -24,11 +19,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.js" pinned="false" current-in-tab="false">
<file leaf-file-name="User.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/entity/User.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="8">
<caret line="418" column="15" lean-forward="false" selection-start-line="418" selection-start-column="15" selection-end-line="418" selection-end-column="15" />
<state relative-caret-position="185">
<caret line="413" column="36" lean-forward="false" selection-start-line="413" selection-start-column="36" selection-end-line="413" selection-end-column="36" />
<folding />
</state>
</provider>
@ -67,18 +62,18 @@
<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="3325">
<caret line="211" column="0" lean-forward="false" selection-start-line="211" selection-start-column="0" selection-end-line="211" selection-end-column="0" />
<state relative-caret-position="19">
<caret line="14" column="18" lean-forward="true" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MetaMask.js" pinned="false" current-in-tab="true">
<file leaf-file-name="MetaMask.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/MetaMask.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="84" column="5" lean-forward="false" selection-start-line="84" selection-start-column="5" selection-end-line="84" selection-end-column="5" />
<state relative-caret-position="183">
<caret line="201" column="20" lean-forward="false" selection-start-line="201" selection-start-column="20" selection-end-line="201" selection-end-column="20" />
<folding />
</state>
</provider>
@ -123,8 +118,8 @@
<find>screen</find>
<find>didn</find>
<find>ref</find>
<find>doTr</find>
<find>doTra</find>
<find>doTr</find>
</findStrings>
<dirStrings>
<dir>$PROJECT_DIR$/temp</dir>
@ -349,7 +344,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="387594000" />
<option name="totallyTimeSpent" value="387985000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -363,6 +358,7 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24453841" sideWeight="0.49213484" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32970452" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@ -372,7 +368,7 @@
<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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20029455" sideWeight="0.5" order="9" 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.24947146" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27860695" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" x="134" y="236" width="1254" height="290" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27860695" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" x="134" y="236" width="1254" height="290" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<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" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@ -664,14 +660,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/Page.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3325">
<caret line="211" column="0" lean-forward="false" selection-start-line="211" selection-start-column="0" selection-end-line="211" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/TierPage.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="337">
@ -688,18 +676,26 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/entity/User.js">
<entry file="file://$PROJECT_DIR$/pages/Page.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="8">
<caret line="418" column="15" lean-forward="false" selection-start-line="418" selection-start-column="15" selection-end-line="418" selection-end-column="15" />
<state relative-caret-position="19">
<caret line="14" column="18" lean-forward="true" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/MetaMask.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="84" column="5" lean-forward="false" selection-start-line="84" selection-start-column="5" selection-end-line="84" selection-end-column="5" />
<state relative-caret-position="183">
<caret line="201" column="20" lean-forward="false" selection-start-line="201" selection-start-column="20" selection-end-line="201" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/entity/User.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="185">
<caret line="413" column="36" lean-forward="false" selection-start-line="413" selection-start-column="36" selection-end-line="413" selection-end-column="36" />
<folding />
</state>
</provider>

View File

@ -407,43 +407,33 @@ catch(err){
}
////////////////////////////////////////////////////////////////////
var trCounter=0;
var skippedTr=0;
var b=true;
var z=false;
var timeLimit=timeLimitTransactions*cur.tiers.length;
do {
z=await metaMask.doTransaction();
trCounter++;
if (!z) {
var s="Deployment failed because transaction didn't appear.Transaction were done:"+ trCounter;
logger.info(s);
logger.info("Transaction #"+trCounter+" didn't appear.");
//b=false;
}
else {
trCounter++;
logger.info("Transaction# "+trCounter);
logger.info("Transaction# "+trCounter+" is successfull");
}
/* await metaMask.switchToNextPage();
await this.driver.sleep(2000);//4000
Utils.takeScreenshoot(this.driver);
await metaMask.refresh();
Utils.takeScreenshoot(this.driver);
await this.driver.sleep(1000);//1000
if ( await metaMask.isPresentButtonSubmit()) {
Utils.takeScreenshoot(this.driver);
await this.driver.sleep(1000);//----
await metaMask.submitTransaction();
Utils.takeScreenshoot(this.driver);
trCounter++;
logger.info("Transaction# "+trCounter);
}
*/
await this.driver.sleep(1000);//1000
if (await wizardStep4.isPresentButtonSkipTransaction())
{
logger.info("Transaction #"+ trCounter+" is skipped.");
await wizardStep4.clickButtonSkipTransaction();
await wizardStep4.clickButtonYes();
console.log("YEAHHHSHSHHSHSHS!!");
logger.info("Transaction #"+ trCounter+" is skipped.");
console.log("Transaction #"+ trCounter+" is skipped.);
skippedTr++;
await this.driver.sleep(5000);//1000
} else
@ -460,7 +450,8 @@ catch(err){
if((timeLimit--)==0)
{ var s="Deployment failed because time expired.Transaction were done:"+ trCounter;
{ var s="Deployment failed because time expired.Transaction were done:"+ (trCounter-skippedTr)+
"\n"+ "Transaction were skipped: "+skippedTr;
logger.info(s);
b=false;}
} while (b);

View File

@ -199,7 +199,7 @@ async doTransaction(){
logger.info(this.name+"wait and submit transaction :");
await this.switchToNextPage();
var counter=0;
var timeLimit=10;//30;
var timeLimit=20;//30;
do {
await this.driver.sleep(1000);