Skip to content

Commit 493a147

Browse files
jimevansdetro
authored andcommitted
Updating IEDriverServer prebuilts
1 parent aa4d84a commit 493a147

File tree

5 files changed

+86
-65
lines changed

5 files changed

+86
-65
lines changed

cpp/IEDriver/Generated/atoms.h

Lines changed: 66 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -8451,71 +8451,72 @@ const wchar_t* const INPUTS[] = {
84518451
L");a.shift&&!b&&gh(f,Y)}):0<=wa(Xg,a)?f.d(a)?gh(f,a):ah(f,a):(ah(f,a),g",
84528452
L"h(f,a))}rh(a);ce(a)||h(new y(12,\"Element is not currently interactabl",
84538453
L"e and may not be manipulated\"));var f=c||new Vf;hh(f,a);if(C&&\"date",
8454-
L"\"==a.type&&(c=\n\"array\"==ea(b)?b=b.join(\"\"):b,c.match(/\\d\\d\\d",
8455-
L"\\d-\\d\\d-\\d\\d/))){$a&&ac&&(V(a,Pe),V(a,Df));V(a,$e);a.value=c;V(a,",
8456-
L"wf);V(a,vf);return}\"array\"==ea(b)?x(b,e):e(b);d||x(Xg,function(a){f.",
8457-
L"d(a)&&gh(f,a)})}function th(a){var b=Xd(a);return 0<b.width&&0<b.heigh",
8458-
L"t||!a.offsetParent?b:th(a.offsetParent)}function uh(){He.call(this)}v(",
8459-
L"uh,He);(function(a){a.ab=function(){return a.va?a.va:a.va=new a}})(uh)",
8460-
L";function vh(a,b,c,d){function e(){return{Aa:f,keys:[]}}var f=!!d,g=[]",
8461-
L",n=e();g.push(n);x(b,function(a){x(a.split(\"\"),function(a){if(\"\\ue",
8462-
L"000\"<=a&&\"\\ue03d\">=a){var b=$[a];b===l?(g.push(n=e()),f&&(n.Aa=m,g",
8463-
L".push(n=e()))):t(b)?n.keys.push(b):h(Error(\"Unsupported WebDriver key",
8464-
L": \\\\u\"+a.charCodeAt(0).toString(16)))}else switch(a){case \"\\n\":n",
8465-
L".keys.push(ag);break;case \"\\t\":n.keys.push($f);break;case \"\\b\":n",
8466-
L".keys.push(Zf);break;default:n.keys.push(a)}})});x(g,function(b){sh(a,",
8467-
L"b.keys,c,b.Aa)})}var $={\"\\ue000\":l};\n$[\"\\ue003\"]=Zf;$[\"\\ue004",
8468-
L"\"]=$f;$[\"\\ue006\"]=ag;$[\"\\ue007\"]=ag;$[\"\\ue008\"]=Y;$[\"\\ue00",
8469-
L"9\"]=bg;$[\"\\ue00a\"]=cg;$[\"\\ue00b\"]=dg;$[\"\\ue00c\"]=eg;$[\"\\ue",
8470-
L"00d\"]=fg;$[\"\\ue00e\"]=gg;$[\"\\ue00f\"]=hg;$[\"\\ue010\"]=ig;$[\"",
8471-
L"\\ue011\"]=jg;$[\"\\ue012\"]=kg;$[\"\\ue013\"]=lg;$[\"\\ue014\"]=mg;$[",
8472-
L"\"\\ue015\"]=ng;$[\"\\ue016\"]=og;$[\"\\ue017\"]=pg;$[\"\\ue018\"]=Wg;",
8473-
L"$[\"\\ue019\"]=Ug;$[\"\\ue01a\"]=tg;$[\"\\ue01b\"]=ug;$[\"\\ue01c\"]=v",
8474-
L"g;$[\"\\ue01d\"]=wg;$[\"\\ue01e\"]=xg;$[\"\\ue01f\"]=yg;$[\"\\ue020\"]",
8475-
L"=zg;$[\"\\ue021\"]=Ag;$[\"\\ue022\"]=Bg;$[\"\\ue023\"]=Cg;$[\"\\ue024",
8476-
L"\"]=Dg;\n$[\"\\ue025\"]=Eg;$[\"\\ue027\"]=Fg;$[\"\\ue028\"]=Gg;$[\"\\u",
8477-
L"e029\"]=Hg;$[\"\\ue026\"]=Vg;$[\"\\ue031\"]=Ig;$[\"\\ue032\"]=Jg;$[\"",
8478-
L"\\ue033\"]=Kg;$[\"\\ue034\"]=Lg;$[\"\\ue035\"]=Mg;$[\"\\ue036\"]=Ng;$[",
8479-
L"\"\\ue037\"]=Og;$[\"\\ue038\"]=Pg;$[\"\\ue039\"]=Qg;$[\"\\ue03a\"]=Rg;",
8480-
L"$[\"\\ue03b\"]=Sg;$[\"\\ue03c\"]=Tg;$[\"\\ue03d\"]=qg;ja(\"webdriver.a",
8481-
L"toms.inputs.sendKeys\",function(a,b,c,d){c=new Vf(c);a||(a=be(document",
8482-
L"));a||h(Error(\"No element to send keys to\"));vh(a,b,c,d);return c.v(",
8483-
L")});\nja(\"webdriver.atoms.inputs.click\",function(a,b){var c=new ih(b",
8484-
L");a||(a=c.v().element);a||h(Error(\"No element to send keys to\"));var",
8485-
L" d=a,e;rh(d);e=F(d);e=C?e.body:e.documentElement;var f,g=Ud(d),n=Ud(e)",
8486-
L",q=ae(e);f=g.x-n.x-q.left;var g=g.y-n.y-q.top,n=e.clientHeight-d.offse",
8487-
L"tHeight,q=e.scrollLeft,r=e.scrollTop,q=q+Math.min(f,Math.max(f-(e.clie",
8488-
L"ntWidth-d.offsetWidth),0)),r=r+Math.min(g,Math.max(g-n,0));f=new D(q,r",
8489-
L");e.scrollLeft=f.x;e.scrollTop=f.y;e=th(d);e=new qh(e.width/2,e.height",
8490-
L"/2);f=c||new ih;f.move(d,\ne);kh(f,0);mh(f);return c.v()});\nja(\"webd",
8491-
L"river.atoms.inputs.mouseMove\",function(a,b,c,d){d=new ih(d);var e=a||",
8492-
L"d.v().element,f=b!=l&&c!=l;b=b||0;c=c||0;a?f||(c=th(a),b=Math.floor(c.",
8493-
L"width/2),c=Math.floor(c.height/2)):(a=Vd(e),b+=d.v().ha.x-a.x,c+=d.v()",
8494-
L".ha.y-a.y);a=new D(b,c);if(!ze(e,a)&&(e.scrollIntoView(),z&&!Bd(11))){",
8495-
L"f=G(F(e));for(f=f.frameElement;f;f=f.frameElement)f.scrollIntoView(),f",
8496-
L"=G(F(f))}if(a){for(var f=new Od(a.x,a.y,1,1),g=F(e),n=oe(e);n&&n!=g.bo",
8497-
L"dy&&n!=g.documentElement;n=oe(n)){var q=f,r=n,S=Ud(e),T=Ud(r),ca=ae(r)",
8498-
L";ye(new Od(S.x+\nq.left-T.x-ca.left,S.y+q.top-T.y-ca.top,r.clientWidth",
8499-
L"-q.width,r.clientHeight-q.height),r)}n=Ud(e);q=E(g);q=vb(q.r.parentWin",
8500-
L"dow||q.r.defaultView);ye(new Od(n.x+f.left-g.body.scrollLeft,n.y+f.top",
8501-
L"-g.body.scrollTop,q.width-f.width,q.height-f.height),g.body||g.documen",
8502-
L"tElement)}if(!ze(e,a)&&a){f=Vd(e);a=rb(f,a);try{var Ec=G(F(e))||ka,na=",
8503-
L"vb(Ec),Fc=a.x>=na.width?a.x-(na.width-1):0>a.x?a.x:0,Gc=a.y>=na.height",
8504-
L"?a.y-(na.height-1):0>a.y?a.y:0,Hc=Kb(E(Ec.document));(0!=Fc||0!=Gc)&&E",
8505-
L"c.scrollBy(Fc,Gc);var tf=Kb(E(Ec.document));\n(Hc.x+Fc!=tf.x||Hc.y+Gc!",
8506-
L"=tf.y)&&h(new y(34,\"The target location (\"+(a.x+Hc.x)+\", \"+(a.y+Hc",
8507-
L".y)+\") is not on the webpage.\"));var Ha=new D(a.x-Fc,a.y-Gc);(0>Ha.x",
8508-
L"||Ha.x>=na.width)&&h(new y(34,\"The target location (\"+Ha.x+\", \"+Ha",
8509-
L".y+\") should be within the viewport (\"+na.width+\":\"+na.height+\") ",
8510-
L"after scrolling.\"));(0>Ha.y||Ha.y>=na.height)&&h(new y(34,\"The targe",
8511-
L"t location (\"+Ha.x+\", \"+Ha.y+\") should be within the viewport (\"+",
8512-
L"na.width+\":\"+na.height+\") after scrolling.\"))}catch(wh){}}d.move(e",
8513-
L",new D(b,c));\nreturn d.v()});ja(\"webdriver.atoms.inputs.mouseButtonD",
8514-
L"own\",function(a){a=new ih(a);kh(a,0);return a.v()});ja(\"webdriver.at",
8515-
L"oms.inputs.mouseButtonUp\",function(a){a=new ih(a);mh(a);return a.v()}",
8516-
L");ja(\"webdriver.atoms.inputs.doubleClick\",function(a){a=new ih(a);kh",
8517-
L"(a,0);mh(a);kh(a,0);mh(a);return a.v()});ja(\"webdriver.atoms.inputs.r",
8518-
L"ightClick\",function(a){a=new ih(a);kh(a,2);mh(a);return a.v()});",
8454+
L"\"==a.type){c=\n\"array\"==ea(b)?b=b.join(\"\"):b;var g=/\\d{4}-\\d{2}",
8455+
L"-\\d{2}/;if(c.match(g)){$a&&ac&&(V(a,Pe),V(a,Df));V(a,$e);a.value=c.ma",
8456+
L"tch(g)[0];V(a,wf);V(a,vf);return}}\"array\"==ea(b)?x(b,e):e(b);d||x(Xg",
8457+
L",function(a){f.d(a)&&gh(f,a)})}function th(a){var b=Xd(a);return 0<b.w",
8458+
L"idth&&0<b.height||!a.offsetParent?b:th(a.offsetParent)}function uh(){H",
8459+
L"e.call(this)}v(uh,He);(function(a){a.ab=function(){return a.va?a.va:a.",
8460+
L"va=new a}})(uh);function vh(a,b,c,d){function e(){return{Aa:f,keys:[]}",
8461+
L"}var f=!!d,g=[],n=e();g.push(n);x(b,function(a){x(a.split(\"\"),functi",
8462+
L"on(a){if(\"\\ue000\"<=a&&\"\\ue03d\">=a){var b=$[a];b===l?(g.push(n=e(",
8463+
L")),f&&(n.Aa=m,g.push(n=e()))):t(b)?n.keys.push(b):h(Error(\"Unsupporte",
8464+
L"d WebDriver key: \\\\u\"+a.charCodeAt(0).toString(16)))}else switch(a)",
8465+
L"{case \"\\n\":n.keys.push(ag);break;case \"\\t\":n.keys.push($f);break",
8466+
L";case \"\\b\":n.keys.push(Zf);break;default:n.keys.push(a)}})});x(g,fu",
8467+
L"nction(b){sh(a,b.keys,c,b.Aa)})}var $={\"\\ue000\":l};\n$[\"\\ue003\"]",
8468+
L"=Zf;$[\"\\ue004\"]=$f;$[\"\\ue006\"]=ag;$[\"\\ue007\"]=ag;$[\"\\ue008",
8469+
L"\"]=Y;$[\"\\ue009\"]=bg;$[\"\\ue00a\"]=cg;$[\"\\ue00b\"]=dg;$[\"\\ue00",
8470+
L"c\"]=eg;$[\"\\ue00d\"]=fg;$[\"\\ue00e\"]=gg;$[\"\\ue00f\"]=hg;$[\"\\ue",
8471+
L"010\"]=ig;$[\"\\ue011\"]=jg;$[\"\\ue012\"]=kg;$[\"\\ue013\"]=lg;$[\"",
8472+
L"\\ue014\"]=mg;$[\"\\ue015\"]=ng;$[\"\\ue016\"]=og;$[\"\\ue017\"]=pg;$[",
8473+
L"\"\\ue018\"]=Wg;$[\"\\ue019\"]=Ug;$[\"\\ue01a\"]=tg;$[\"\\ue01b\"]=ug;",
8474+
L"$[\"\\ue01c\"]=vg;$[\"\\ue01d\"]=wg;$[\"\\ue01e\"]=xg;$[\"\\ue01f\"]=y",
8475+
L"g;$[\"\\ue020\"]=zg;$[\"\\ue021\"]=Ag;$[\"\\ue022\"]=Bg;$[\"\\ue023\"]",
8476+
L"=Cg;$[\"\\ue024\"]=Dg;\n$[\"\\ue025\"]=Eg;$[\"\\ue027\"]=Fg;$[\"\\ue02",
8477+
L"8\"]=Gg;$[\"\\ue029\"]=Hg;$[\"\\ue026\"]=Vg;$[\"\\ue031\"]=Ig;$[\"\\ue",
8478+
L"032\"]=Jg;$[\"\\ue033\"]=Kg;$[\"\\ue034\"]=Lg;$[\"\\ue035\"]=Mg;$[\"",
8479+
L"\\ue036\"]=Ng;$[\"\\ue037\"]=Og;$[\"\\ue038\"]=Pg;$[\"\\ue039\"]=Qg;$[",
8480+
L"\"\\ue03a\"]=Rg;$[\"\\ue03b\"]=Sg;$[\"\\ue03c\"]=Tg;$[\"\\ue03d\"]=qg;",
8481+
L"ja(\"webdriver.atoms.inputs.sendKeys\",function(a,b,c,d){c=new Vf(c);a",
8482+
L"||(a=be(document));a||h(Error(\"No element to send keys to\"));vh(a,b,",
8483+
L"c,d);return c.v()});\nja(\"webdriver.atoms.inputs.click\",function(a,b",
8484+
L"){var c=new ih(b);a||(a=c.v().element);a||h(Error(\"No element to send",
8485+
L" keys to\"));var d=a,e;rh(d);e=F(d);e=C?e.body:e.documentElement;var f",
8486+
L",g=Ud(d),n=Ud(e),q=ae(e);f=g.x-n.x-q.left;var g=g.y-n.y-q.top,n=e.clie",
8487+
L"ntHeight-d.offsetHeight,q=e.scrollLeft,r=e.scrollTop,q=q+Math.min(f,Ma",
8488+
L"th.max(f-(e.clientWidth-d.offsetWidth),0)),r=r+Math.min(g,Math.max(g-n",
8489+
L",0));f=new D(q,r);e.scrollLeft=f.x;e.scrollTop=f.y;e=th(d);e=new qh(e.",
8490+
L"width/2,e.height/2);f=c||new ih;f.move(d,\ne);kh(f,0);mh(f);return c.v",
8491+
L"()});\nja(\"webdriver.atoms.inputs.mouseMove\",function(a,b,c,d){d=new",
8492+
L" ih(d);var e=a||d.v().element,f=b!=l&&c!=l;b=b||0;c=c||0;a?f||(c=th(a)",
8493+
L",b=Math.floor(c.width/2),c=Math.floor(c.height/2)):(a=Vd(e),b+=d.v().h",
8494+
L"a.x-a.x,c+=d.v().ha.y-a.y);a=new D(b,c);if(!ze(e,a)&&(e.scrollIntoView",
8495+
L"(),z&&!Bd(11))){f=G(F(e));for(f=f.frameElement;f;f=f.frameElement)f.sc",
8496+
L"rollIntoView(),f=G(F(f))}if(a){for(var f=new Od(a.x,a.y,1,1),g=F(e),n=",
8497+
L"oe(e);n&&n!=g.body&&n!=g.documentElement;n=oe(n)){var q=f,r=n,S=Ud(e),",
8498+
L"T=Ud(r),ca=ae(r);ye(new Od(S.x+\nq.left-T.x-ca.left,S.y+q.top-T.y-ca.t",
8499+
L"op,r.clientWidth-q.width,r.clientHeight-q.height),r)}n=Ud(e);q=E(g);q=",
8500+
L"vb(q.r.parentWindow||q.r.defaultView);ye(new Od(n.x+f.left-g.body.scro",
8501+
L"llLeft,n.y+f.top-g.body.scrollTop,q.width-f.width,q.height-f.height),g",
8502+
L".body||g.documentElement)}if(!ze(e,a)&&a){f=Vd(e);a=rb(f,a);try{var Ec",
8503+
L"=G(F(e))||ka,na=vb(Ec),Fc=a.x>=na.width?a.x-(na.width-1):0>a.x?a.x:0,G",
8504+
L"c=a.y>=na.height?a.y-(na.height-1):0>a.y?a.y:0,Hc=Kb(E(Ec.document));(",
8505+
L"0!=Fc||0!=Gc)&&Ec.scrollBy(Fc,Gc);var tf=Kb(E(Ec.document));\n(Hc.x+Fc",
8506+
L"!=tf.x||Hc.y+Gc!=tf.y)&&h(new y(34,\"The target location (\"+(a.x+Hc.x",
8507+
L")+\", \"+(a.y+Hc.y)+\") is not on the webpage.\"));var Ha=new D(a.x-Fc",
8508+
L",a.y-Gc);(0>Ha.x||Ha.x>=na.width)&&h(new y(34,\"The target location (",
8509+
L"\"+Ha.x+\", \"+Ha.y+\") should be within the viewport (\"+na.width+\":",
8510+
L"\"+na.height+\") after scrolling.\"));(0>Ha.y||Ha.y>=na.height)&&h(new",
8511+
L" y(34,\"The target location (\"+Ha.x+\", \"+Ha.y+\") should be within ",
8512+
L"the viewport (\"+na.width+\":\"+na.height+\") after scrolling.\"))}cat",
8513+
L"ch(wh){}}d.move(e,new D(b,c));\nreturn d.v()});ja(\"webdriver.atoms.in",
8514+
L"puts.mouseButtonDown\",function(a){a=new ih(a);kh(a,0);return a.v()});",
8515+
L"ja(\"webdriver.atoms.inputs.mouseButtonUp\",function(a){a=new ih(a);mh",
8516+
L"(a);return a.v()});ja(\"webdriver.atoms.inputs.doubleClick\",function(",
8517+
L"a){a=new ih(a);kh(a,0);mh(a);kh(a,0);mh(a);return a.v()});ja(\"webdriv",
8518+
L"er.atoms.inputs.rightClick\",function(a){a=new ih(a);kh(a,2);mh(a);ret",
8519+
L"urn a.v()});",
85198520
NULL
85208521
};
85218522

cpp/IEDriverServer/CHANGELOG

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,26 @@ available via the project downloads page. Changes in "revision" field indicate
99
private releases checked into the prebuilts directory of the source tree, but
1010
not made generally available on the downloads page.
1111

12+
v2.31.0.1
13+
=========
14+
* Added ability to get current URL from IWebBrowser2 if IHTMLDocument2 fails.
15+
Under normal circumstances, the IE driver gets the current URL from the
16+
document loaded in the browser. When IE browses to a non-HTML page, such as
17+
a PDF file with the Adobe Reader plugin installed, getting the document
18+
fails, since there is no "document" in the browser. In that case, fall back
19+
to getting the LocationURL property of the IWebBrowser2 interface. It's
20+
arguable that this is the wrong thing to do, since the driver is useless
21+
without an actual document, but we'll let this work anyway. Fixes issue
22+
#5361.
23+
* Updated logic in IE driver to correctly wait for the document. Fixes issue
24+
#5326.
25+
* Submit should throw NoSuchElementException if the target element is not
26+
within a form. Implemented in atoms, Firefox and HtmlUnit.
27+
* Reinstated execution of JavaScript on separate thread for IE10 on Windows 7.
28+
* Removed use of CComQIPtr from IE driver native code. The use of CComQIPtr is
29+
not needed, as we are substituting a call to the QueryInterface method
30+
instead. This is what CComQIPtr does under the covers anyway.
31+
1232
v2.31.0.0
1333
=========
1434
* Release to synchronize with release of Selenium project.
0 Bytes
Binary file not shown.
34.5 KB
Binary file not shown.
38 KB
Binary file not shown.

0 commit comments

Comments
 (0)