This commit is contained in:
person 2018-03-04 14:30:02 -08:00
parent afcab77d6c
commit df73ff7392
3 changed files with 59 additions and 79 deletions

View File

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="40b9626d-5f4f-46c4-8096-7de331aaa15a" name="Default" comment="" />
<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" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
@ -20,8 +22,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="295">
<caret line="430" column="37" lean-forward="false" selection-start-line="430" selection-start-column="37" selection-end-line="430" selection-end-column="37" />
<state relative-caret-position="115">
<caret line="418" column="34" lean-forward="true" selection-start-line="418" selection-start-column="34" selection-end-line="418" selection-end-column="34" />
<folding />
</state>
</provider>
@ -37,11 +39,11 @@
</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="247">
<caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
<state relative-caret-position="-662">
<caret line="38" column="0" lean-forward="false" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
<folding />
</state>
</provider>
@ -77,6 +79,16 @@
</provider>
</entry>
</file>
<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="245">
<caret line="205" column="29" lean-forward="true" selection-start-line="205" selection-start-column="29" selection-end-line="205" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@ -116,8 +128,8 @@
<find>ref</find>
<find>doTra</find>
<find>doTr</find>
<find>screenSh</find>
<find>scree</find>
<find>screenSh</find>
</findStrings>
<dirStrings>
<dir>$PROJECT_DIR$/temp</dir>
@ -176,11 +188,11 @@
<option value="$PROJECT_DIR$/tests/Test1.js" />
<option value="$PROJECT_DIR$/pages/TierPage.js" />
<option value="$PROJECT_DIR$/pages/WizardStep4.js" />
<option value="$PROJECT_DIR$/pages/MetaMask.js" />
<option value="$PROJECT_DIR$/pages/Page.js" />
<option value="$PROJECT_DIR$/utils/Utils.js" />
<option value="$PROJECT_DIR$/entity/User.js" />
<option value="$PROJECT_DIR$/test/testSuite1.js" />
<option value="$PROJECT_DIR$/pages/MetaMask.js" />
</list>
</option>
</component>
@ -347,7 +359,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="392990000" />
<option name="totallyTimeSpent" value="393200000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -361,7 +373,6 @@
</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" />
@ -371,7 +382,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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.39427862" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" x="134" y="236" width="1254" height="290" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.39427862" 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" />
@ -639,14 +650,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/MetaMask.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="202">
<caret line="208" column="49" lean-forward="false" selection-start-line="208" selection-start-column="49" selection-end-line="208" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/temp/screenshoot_3_4_2018_12_30_26.png">
<provider selected="true" editor-type-id="images">
<state />
@ -709,14 +712,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/entity/User.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295">
<caret line="430" column="37" lean-forward="false" selection-start-line="430" selection-start-column="37" selection-end-line="430" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/Page.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3118">
@ -735,8 +730,24 @@
</entry>
<entry file="file://$PROJECT_DIR$/test/testSuite1.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
<state relative-caret-position="-662">
<caret line="38" column="0" lean-forward="false" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/entity/User.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="418" column="34" lean-forward="true" selection-start-line="418" selection-start-column="34" selection-end-line="418" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/MetaMask.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="245">
<caret line="205" column="29" lean-forward="true" selection-start-line="205" selection-start-column="29" selection-end-line="205" selection-end-column="29" />
<folding />
</state>
</provider>

View File

@ -13,7 +13,7 @@ const loader=By.className("loading-container");
const key = require('selenium-webdriver').Key;
const Twait=20000;
const TTT=10;
const TTT=100;
class Page {
@ -245,18 +245,22 @@ async switchToNextPage(){
logger.info("switch to next tab");
let dr=this.driver;
let allHandles=await dr.getAllWindowHandles();
let curHandle=await dr.getWindowHandle();
let handle;
for (let i=0;i<allHandles.length;i++)
{
if (curHandle!=allHandles[i]) handle=allHandles[i];
}
await dr.switchTo().window(handle);
await this.driver.sleep(500);
await this.driver.sleep(TTT);
try {
let allHandles = await dr.getAllWindowHandles();
let curHandle = await dr.getWindowHandle();
let handle;
for (let i = 0; i < allHandles.length; i++) {
if (curHandle != allHandles[i]) handle = allHandles[i];
}
await dr.switchTo().window(handle);
await this.driver.sleep(1000);
await this.driver.sleep(TTT);
await Utils.takeScreenshoot(this.driver);
await Utils.takeScreenshoot(this.driver);
}
catch (err){
logger.info("Can't switch to next tab "+err);
}

View File

@ -119,14 +119,7 @@ return q;
return date;
}
openAnotherTab(driver, URL) {
driver.executeScript('window.open("' + URL + '");');
}
focusOn(driver) {
driver.executeScript('alert("Focus window")');
driver.switchTo().alert().accept();
}
static getStartURL() {
var obj = JSON.parse(fs.readFileSync(configFile, "utf8"));
@ -134,20 +127,7 @@ return q;
}
getInstallMetamask(fileName) {
var obj = JSON.parse(fs.readFileSync(fileName, "utf8"));
return obj.installMetaMask;
}
print(arr) {
for (var i = 0; i < arr.length; i++) {
logger.info(arr[i]);
}
}
getTransactionCount(address) {
@ -163,31 +143,16 @@ return q;
var buf = new Buffer(res, 'base64');
await fs.writeFileSync(tempOutputPath + "screenshoot" + Utils.getDate() + '.png', buf);
/*driver.takeScreenshot()
.then((res) => {
var buf = new Buffer(res, 'base64');
fs.writeFileSync(tempOutputPath + "screenshoot" + Utils.getDate() + '.png', buf);
});*/
}
startBrowser() {
var options = new chrome.Options();
//options.addArguments("user-data-dir=/home/d/GoogleProfile");
//options.addArguments('start-maximized');
options.addArguments('disable-popup-blocking');
//options.addArguments('test-type');
return new webdriver.Builder().withCapabilities(options.toCapabilities()).build();
}
static startBrowserWithMetamask() {
static async startBrowserWithMetamask() {
var source = 'MetaMask.crx';
if (!fs.existsSync(source)) source = './node_modules/create-poa-crowdsale/MetaMask.crx';
logger.info("Metamask source:"+source);
@ -199,8 +164,8 @@ return q;
// options.addArguments('headless');
//options.addArguments('start-maximized');
options.addArguments('disable-popup-blocking');
options.addArguments('test-type');
return new webdriver.Builder().withCapabilities(options.toCapabilities()).build();
//options.addArguments('test-type');
return await new webdriver.Builder().withCapabilities(options.toCapabilities()).build();
}