This commit is contained in:
person 2018-03-03 00:28:37 -08:00
parent 4d844b1130
commit d0f7b83cd5
4 changed files with 48 additions and 44 deletions

View File

@ -2,7 +2,9 @@
<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$/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" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
@ -22,8 +24,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="-127">
<caret line="37" column="32" lean-forward="false" selection-start-line="37" selection-start-column="32" selection-end-line="37" selection-end-column="32" />
<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>
@ -32,7 +34,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="164">
<state relative-caret-position="420">
<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>
@ -42,8 +44,8 @@
<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="204">
<caret line="105" column="27" lean-forward="false" selection-start-line="105" selection-start-column="27" selection-end-line="105" selection-end-column="27" />
<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" />
<folding />
</state>
</provider>
@ -52,8 +54,8 @@
<file leaf-file-name="Utils.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/utils/Utils.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="155" column="11" lean-forward="false" selection-start-line="155" selection-start-column="11" selection-end-line="155" selection-end-column="11" />
<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" />
<folding />
</state>
</provider>
@ -62,8 +64,8 @@
<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="183">
<caret line="130" column="25" lean-forward="true" selection-start-line="130" selection-start-column="25" selection-end-line="130" selection-end-column="25" />
<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>
@ -219,10 +221,10 @@
<option value="$PROJECT_DIR$/.circleci/config.yml" />
<option value="$PROJECT_DIR$/test/testSuite1.js" />
<option value="$PROJECT_DIR$/index.js" />
<option value="$PROJECT_DIR$/pages/MetaMask.js" />
<option value="$PROJECT_DIR$/entity/User.js" />
<option value="$PROJECT_DIR$/utils/Utils.js" />
<option value="$PROJECT_DIR$/pages/Page.js" />
<option value="$PROJECT_DIR$/pages/MetaMask.js" />
<option value="$PROJECT_DIR$/utils/Utils.js" />
</list>
</option>
</component>
@ -243,8 +245,8 @@
<component name="NodeModulesDirectoryManager">
<handled-path value="$PROJECT_DIR$/node_modules" />
</component>
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="242" />
<component name="ProjectFrameBounds">
<option name="x" value="115" />
<option name="y" value="23" />
<option name="width" value="1198" />
<option name="height" value="797" />
@ -380,7 +382,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="373420000" />
<option name="totallyTimeSpent" value="373723000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -393,7 +395,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="242" y="23" width="1198" height="797" extended-state="1" />
<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="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" />
@ -403,7 +405,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.20062208" 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.18409425" 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.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" />
<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" />
@ -663,14 +665,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/WizardStep4.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="164">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="707">
@ -687,14 +681,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/entity/User.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-127">
<caret line="37" column="32" lean-forward="false" selection-start-line="37" selection-start-column="32" selection-end-line="37" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/testSuite1.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
@ -703,26 +689,42 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/MetaMask.js">
<entry file="file://$PROJECT_DIR$/pages/WizardStep4.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="105" column="27" lean-forward="false" selection-start-line="105" selection-start-column="27" selection-end-line="105" selection-end-column="27" />
<state relative-caret-position="420">
<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>
</provider>
</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="183">
<caret line="130" column="25" lean-forward="true" selection-start-line="130" selection-start-column="25" selection-end-line="130" selection-end-column="25" />
<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>
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/utils/Utils.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="155" column="11" lean-forward="false" selection-start-line="155" selection-start-column="11" selection-end-line="155" selection-end-column="11" />
<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" />
<folding />
</state>
</provider>

View File

@ -1,7 +1,8 @@
const Logger= require('../entity/Logger.js');
const logger=Logger.logger;
const tempOutputPath=Logger.tempOutputPath;
const utils=require('../utils/Utils.js');
const Utils=utils.Utils;
const key = require('selenium-webdriver').Key;
const page=require('./Page.js');
const webdriver = require('selenium-webdriver'),

View File

@ -1,7 +1,8 @@
const Logger= require('../entity/Logger.js');
const logger=Logger.logger;
const tempOutputPath=Logger.tempOutputPath;
const utils=require('../utils/Utils.js');
const Utils=utils.Utils;
const webdriver = require('selenium-webdriver'),
chrome = require('selenium-webdriver/chrome'),
firefox = require('selenium-webdriver/firefox'),

View File

@ -153,7 +153,7 @@ return q;
return n;
}
static takeScreenshoot(driver) { return;
static takeScreenshoot(driver) {
driver.takeScreenshot()
.then((res) => {
@ -190,7 +190,7 @@ return q;
// options.addArguments('headless');
options.addArguments('start-maximized');
options.addArguments('disable-popup-blocking');
//options.addArguments('test-type');
options.addArguments('test-type');
return new webdriver.Builder().withCapabilities(options.toCapabilities()).build();
}