This commit is contained in:
person 2018-03-03 16:32:11 -08:00
parent d0f7b83cd5
commit 036f7fab04
5 changed files with 117 additions and 143 deletions

View File

@ -2,6 +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$/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$/utils/Utils.js" afterPath="$PROJECT_DIR$/utils/Utils.js" />
@ -24,8 +26,8 @@
<file leaf-file-name="User.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/entity/User.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="31" column="24" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="31" selection-end-column="24" />
<state relative-caret-position="170">
<caret line="421" column="41" lean-forward="true" selection-start-line="421" selection-start-column="41" selection-end-line="421" selection-end-column="41" />
<folding />
</state>
</provider>
@ -34,7 +36,7 @@
<file leaf-file-name="WizardStep4.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/WizardStep4.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<state relative-caret-position="200">
<caret line="28" column="35" lean-forward="false" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
<folding />
</state>
@ -44,78 +46,28 @@
<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="405">
<caret line="27" column="11" lean-forward="false" selection-start-line="27" selection-start-column="11" selection-end-line="27" selection-end-column="11" />
<state relative-caret-position="120">
<caret line="79" column="30" lean-forward="true" selection-start-line="79" selection-start-column="30" selection-end-line="79" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Utils.js" pinned="false" current-in-tab="true">
<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="207">
<caret line="155" column="36" lean-forward="false" selection-start-line="155" selection-start-column="36" selection-end-line="155" selection-end-column="36" />
<state relative-caret-position="144">
<caret line="153" column="5" lean-forward="true" selection-start-line="153" selection-start-column="5" selection-end-line="153" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Page.js" pinned="false" current-in-tab="false">
<file leaf-file-name="Page.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/Page.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="24" lean-forward="false" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="config.yml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.circleci/config.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="token.txt" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/token.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="44" lean-forward="false" selection-start-line="4" selection-start-column="44" selection-end-line="4" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
</file>
<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="165">
<caret line="61" column="24" lean-forward="false" selection-start-line="61" selection-start-column="24" selection-end-line="61" selection-end-column="24" />
<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="707">
<caret line="60" column="45" lean-forward="false" selection-start-line="60" selection-start-column="45" selection-end-line="60" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Logger.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/entity/Logger.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="281">
<caret line="28" column="7" lean-forward="false" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="7" />
<state relative-caret-position="185">
<caret line="94" column="15" lean-forward="true" selection-start-line="94" selection-start-column="15" selection-end-line="94" selection-end-column="15" />
<folding />
</state>
</provider>
@ -132,9 +84,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>strong</find>
<find>private</find>
<find>wallet</find>
<find>balance</find>
<find>After fi</find>
<find>Max</find>
@ -161,6 +110,9 @@
<find>select</find>
<find>minCap</find>
<find>create</find>
<find>click</find>
<find>doTr</find>
<find>submi</find>
<find>add network</find>
</findStrings>
<dirStrings>
@ -222,9 +174,9 @@
<option value="$PROJECT_DIR$/test/testSuite1.js" />
<option value="$PROJECT_DIR$/index.js" />
<option value="$PROJECT_DIR$/entity/User.js" />
<option value="$PROJECT_DIR$/pages/Page.js" />
<option value="$PROJECT_DIR$/pages/MetaMask.js" />
<option value="$PROJECT_DIR$/utils/Utils.js" />
<option value="$PROJECT_DIR$/pages/MetaMask.js" />
<option value="$PROJECT_DIR$/pages/Page.js" />
</list>
</option>
</component>
@ -297,6 +249,11 @@
<item name="token-wizard-test-automation" type="462c0819:PsiDirectoryNode" />
<item name="scenarios" 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="temp" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="token-wizard-test-automation" type="b2602c69:ProjectViewProjectNode" />
<item name="token-wizard-test-automation" type="462c0819:PsiDirectoryNode" />
@ -382,7 +339,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="373723000" />
<option name="totallyTimeSpent" value="376465000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -397,13 +354,13 @@
<component name="ToolWindowManager">
<frame x="115" y="23" width="1198" height="797" extended-state="0" />
<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.20985557" sideWeight="0.49213484" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.07136788" 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" />
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17231223" 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="false" show_stripe_button="true" weight="0.52724594" sideWeight="0.5" order="2" 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="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="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.3298969" 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" />
@ -464,38 +421,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<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$/entity/Owner.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="43" column="11" lean-forward="false" selection-start-line="43" selection-start-column="11" selection-end-line="43" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scenarios/T1RyWn_0008.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="11" column="60" lean-forward="false" selection-start-line="11" selection-start-column="18" selection-end-line="11" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/WizardStep2.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/WizardStep3.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-36">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/temp/screenshoot_2_26_2018_11_24_55.png" />
<entry file="file://$PROJECT_DIR$/temp/screenshoot_2_26_2018_11_24_56.png" />
<entry file="file://$PROJECT_DIR$/temp/screenshoot_2_26_2018_11_21_37.png" />
<entry file="file://$PROJECT_DIR$/results/result_2_26_2018_11_49_31/screenshoot_2_26_2018_11_49_18.png" />
@ -649,14 +574,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/entity/Logger.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="281">
<caret line="28" column="7" lean-forward="false" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.circleci/config.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
@ -683,15 +600,64 @@
</entry>
<entry file="file://$PROJECT_DIR$/test/testSuite1.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="61" column="24" lean-forward="false" selection-start-line="61" selection-start-column="24" selection-end-line="61" selection-end-column="24" />
<state relative-caret-position="264">
<caret line="95" column="38" lean-forward="false" selection-start-line="95" selection-start-column="38" selection-end-line="95" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/entity/Logger.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="22" column="19" lean-forward="false" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/selenium-webdriver/lib/webdriver.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="142">
<caret line="2360" column="2" lean-forward="false" selection-start-line="2360" selection-start-column="2" selection-end-line="2360" selection-end-column="2" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/temp/screenshoot_3_3_2018_16_24_30.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/temp/screenshoot_3_3_2018_16_24_32.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/temp/screenshoot_3_3_2018_16_24_33.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/temp/screenshoot_3_3_2018_16_24_34.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/temp/screenshoot_3_3_2018_16_24_35.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/utils/Utils.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="153" column="5" lean-forward="true" selection-start-line="153" selection-start-column="5" selection-end-line="153" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/WizardStep4.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<state relative-caret-position="200">
<caret line="28" column="35" lean-forward="false" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
<folding />
</state>
@ -699,32 +665,24 @@
</entry>
<entry file="file://$PROJECT_DIR$/entity/User.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="31" column="24" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="31" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/Page.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="24" lean-forward="false" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
<state relative-caret-position="170">
<caret line="421" column="41" lean-forward="true" selection-start-line="421" selection-start-column="41" selection-end-line="421" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/MetaMask.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="27" column="11" lean-forward="false" selection-start-line="27" selection-start-column="11" selection-end-line="27" selection-end-column="11" />
<state relative-caret-position="120">
<caret line="79" column="30" lean-forward="true" selection-start-line="79" selection-start-column="30" selection-end-line="79" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/utils/Utils.js">
<entry file="file://$PROJECT_DIR$/pages/Page.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="155" column="36" lean-forward="false" selection-start-line="155" selection-start-column="36" selection-end-line="155" selection-end-column="36" />
<state relative-caret-position="185">
<caret line="94" column="15" lean-forward="true" selection-start-line="94" selection-start-column="15" selection-end-line="94" selection-end-column="15" />
<folding />
</state>
</provider>

View File

@ -411,13 +411,14 @@ catch(err){
var timeLimit=timeLimitTransactions*cur.tiers.length;
do {
await metaMask.switchToNextPage();
//await this.driver.sleep(2000);//4000
await this.driver.sleep(2000);//4000
Utils.takeScreenshoot(this.driver);
await metaMask.refresh();
await this.driver.sleep(7000);//1000
Utils.takeScreenshoot(this.driver);
await this.driver.sleep(1000);//1000
if ( await metaMask.isPresentButtonSubmit()) {
Utils.takeScreenshoot(this.driver);
await this.driver.sleep(5000);//----
await this.driver.sleep(1000);//----
await metaMask.submitTransaction();
Utils.takeScreenshoot(this.driver);
trCounter++;

View File

@ -79,7 +79,8 @@ class MetaMask extends page.Page{
async clickButtonSubmit(){
logger.info(this.name+"button Submit :");
await super.clickWithWait(buttonSubmit);
// await super.clickWithWaitIsElementEnabled(buttonSubmit);
await super.clickWithWait(buttonSubmit);
}
async clickPopupNetwork(){
@ -250,12 +251,12 @@ async isPresentButtonSubmit()
await this.driver.executeScript("" +
"document.getElementsByClassName('dropdown-menu-item')["+(networks.length-1)+"].click();");
logger.info(this.name+"select network from menu :");
await this.driver.sleep(5000);////////!!!!!!!!!!!!
await this.driver.sleep(1000);////////!!!!!!!!!!!!
await super.fillWithWait(fieldNewRPCURL,url);
await this.driver.sleep(5000);////////!!!!!!!!!!!!
await this.driver.sleep(1000);////////!!!!!!!!!!!!
await super.clickWithWait(buttonSave);
await this.driver.sleep(1000);
// await this.driver.sleep(1000);
await super.clickWithWait(arrowBackRPCURL);
//lengthNetworkMenu++;
return;

View File

@ -13,7 +13,7 @@ const loader=By.className("loading-container");
const key = require('selenium-webdriver').Key;
const Twait=20000;
const TTT=1500;
const TTT=10;
class Page {
@ -44,12 +44,12 @@ class Page {
await this.driver.sleep(TTT);
try {
//q = await this.driver.findElement(element).isDisplayed();
var s=await this.driver.findElements(element);
q = await this.driver.findElement(element).isDisplayed();
logger.info(" element present");
// var s=await this.driver.findElements(element);
// console.log("lengfth"+s.length);
if (s.length>0){q=true;logger.info(" element present");}
else {q=false;logger.info(" element NOT present");}
// if (s.length>0){q=true;logger.info(" element present");}
//else {q=false;logger.info(" element NOT present");}
} catch (err) {
q = false;
logger.info(" element NOT present");
@ -89,7 +89,7 @@ async open (url){
await this.driver.get(url);
}
async clearField(element,n){
await this.driver.sleep(1000);
await this.driver.sleep(2000);
logger.info("clear");
let field;
if (n!=1) {
@ -126,6 +126,19 @@ async clickElement(element){
await field.sendKeys(address);
}
async clickWithWaitIsElementEnabled(element) {
Utils.takeScreenshoot(this.driver);
await this.driver.sleep(TTT);
logger.info("click");
try{
//let button = await this.driver.wait(webdriver.until.elementLocated(element), Twait);
let button = await this.driver.wait(webdriver.until.elementIsEnabled(element), Twait);
Utils.takeScreenshoot(this.driver);
await button.click();}
catch(err){logger.info("Can not click element"+ button);
Utils.takeScreenshoot(this.driver); }
}
async clickWithWait(element) {
@ -135,6 +148,7 @@ async clickElement(element){
try{
let button = await this.driver.wait(webdriver.until.elementLocated(element), Twait);
Utils.takeScreenshoot(this.driver);
await button.click();}
catch(err){logger.info("Can not click element"+ button);

View File

@ -153,7 +153,7 @@ return q;
return n;
}
static takeScreenshoot(driver) {
static takeScreenshoot(driver) {return;
driver.takeScreenshot()
.then((res) => {