Skip to content

Commit

Permalink
Updating IEDriverServer prebuilts
Browse files Browse the repository at this point in the history
  • Loading branch information
jimevans authored and detro committed Mar 19, 2013
1 parent aa4d84a commit 493a147
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 65 deletions.
131 changes: 66 additions & 65 deletions cpp/IEDriver/Generated/atoms.h
Original file line number Diff line number Diff line change
Expand Up @@ -8451,71 +8451,72 @@ const wchar_t* const INPUTS[] = {
L");a.shift&&!b&&gh(f,Y)}):0<=wa(Xg,a)?f.d(a)?gh(f,a):ah(f,a):(ah(f,a),g",
L"h(f,a))}rh(a);ce(a)||h(new y(12,\"Element is not currently interactabl",
L"e and may not be manipulated\"));var f=c||new Vf;hh(f,a);if(C&&\"date",
L"\"==a.type&&(c=\n\"array\"==ea(b)?b=b.join(\"\"):b,c.match(/\\d\\d\\d",
L"\\d-\\d\\d-\\d\\d/))){$a&&ac&&(V(a,Pe),V(a,Df));V(a,$e);a.value=c;V(a,",
L"wf);V(a,vf);return}\"array\"==ea(b)?x(b,e):e(b);d||x(Xg,function(a){f.",
L"d(a)&&gh(f,a)})}function th(a){var b=Xd(a);return 0<b.width&&0<b.heigh",
L"t||!a.offsetParent?b:th(a.offsetParent)}function uh(){He.call(this)}v(",
L"uh,He);(function(a){a.ab=function(){return a.va?a.va:a.va=new a}})(uh)",
L";function vh(a,b,c,d){function e(){return{Aa:f,keys:[]}}var f=!!d,g=[]",
L",n=e();g.push(n);x(b,function(a){x(a.split(\"\"),function(a){if(\"\\ue",
L"000\"<=a&&\"\\ue03d\">=a){var b=$[a];b===l?(g.push(n=e()),f&&(n.Aa=m,g",
L".push(n=e()))):t(b)?n.keys.push(b):h(Error(\"Unsupported WebDriver key",
L": \\\\u\"+a.charCodeAt(0).toString(16)))}else switch(a){case \"\\n\":n",
L".keys.push(ag);break;case \"\\t\":n.keys.push($f);break;case \"\\b\":n",
L".keys.push(Zf);break;default:n.keys.push(a)}})});x(g,function(b){sh(a,",
L"b.keys,c,b.Aa)})}var $={\"\\ue000\":l};\n$[\"\\ue003\"]=Zf;$[\"\\ue004",
L"\"]=$f;$[\"\\ue006\"]=ag;$[\"\\ue007\"]=ag;$[\"\\ue008\"]=Y;$[\"\\ue00",
L"9\"]=bg;$[\"\\ue00a\"]=cg;$[\"\\ue00b\"]=dg;$[\"\\ue00c\"]=eg;$[\"\\ue",
L"00d\"]=fg;$[\"\\ue00e\"]=gg;$[\"\\ue00f\"]=hg;$[\"\\ue010\"]=ig;$[\"",
L"\\ue011\"]=jg;$[\"\\ue012\"]=kg;$[\"\\ue013\"]=lg;$[\"\\ue014\"]=mg;$[",
L"\"\\ue015\"]=ng;$[\"\\ue016\"]=og;$[\"\\ue017\"]=pg;$[\"\\ue018\"]=Wg;",
L"$[\"\\ue019\"]=Ug;$[\"\\ue01a\"]=tg;$[\"\\ue01b\"]=ug;$[\"\\ue01c\"]=v",
L"g;$[\"\\ue01d\"]=wg;$[\"\\ue01e\"]=xg;$[\"\\ue01f\"]=yg;$[\"\\ue020\"]",
L"=zg;$[\"\\ue021\"]=Ag;$[\"\\ue022\"]=Bg;$[\"\\ue023\"]=Cg;$[\"\\ue024",
L"\"]=Dg;\n$[\"\\ue025\"]=Eg;$[\"\\ue027\"]=Fg;$[\"\\ue028\"]=Gg;$[\"\\u",
L"e029\"]=Hg;$[\"\\ue026\"]=Vg;$[\"\\ue031\"]=Ig;$[\"\\ue032\"]=Jg;$[\"",
L"\\ue033\"]=Kg;$[\"\\ue034\"]=Lg;$[\"\\ue035\"]=Mg;$[\"\\ue036\"]=Ng;$[",
L"\"\\ue037\"]=Og;$[\"\\ue038\"]=Pg;$[\"\\ue039\"]=Qg;$[\"\\ue03a\"]=Rg;",
L"$[\"\\ue03b\"]=Sg;$[\"\\ue03c\"]=Tg;$[\"\\ue03d\"]=qg;ja(\"webdriver.a",
L"toms.inputs.sendKeys\",function(a,b,c,d){c=new Vf(c);a||(a=be(document",
L"));a||h(Error(\"No element to send keys to\"));vh(a,b,c,d);return c.v(",
L")});\nja(\"webdriver.atoms.inputs.click\",function(a,b){var c=new ih(b",
L");a||(a=c.v().element);a||h(Error(\"No element to send keys to\"));var",
L" d=a,e;rh(d);e=F(d);e=C?e.body:e.documentElement;var f,g=Ud(d),n=Ud(e)",
L",q=ae(e);f=g.x-n.x-q.left;var g=g.y-n.y-q.top,n=e.clientHeight-d.offse",
L"tHeight,q=e.scrollLeft,r=e.scrollTop,q=q+Math.min(f,Math.max(f-(e.clie",
L"ntWidth-d.offsetWidth),0)),r=r+Math.min(g,Math.max(g-n,0));f=new D(q,r",
L");e.scrollLeft=f.x;e.scrollTop=f.y;e=th(d);e=new qh(e.width/2,e.height",
L"/2);f=c||new ih;f.move(d,\ne);kh(f,0);mh(f);return c.v()});\nja(\"webd",
L"river.atoms.inputs.mouseMove\",function(a,b,c,d){d=new ih(d);var e=a||",
L"d.v().element,f=b!=l&&c!=l;b=b||0;c=c||0;a?f||(c=th(a),b=Math.floor(c.",
L"width/2),c=Math.floor(c.height/2)):(a=Vd(e),b+=d.v().ha.x-a.x,c+=d.v()",
L".ha.y-a.y);a=new D(b,c);if(!ze(e,a)&&(e.scrollIntoView(),z&&!Bd(11))){",
L"f=G(F(e));for(f=f.frameElement;f;f=f.frameElement)f.scrollIntoView(),f",
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",
L"dy&&n!=g.documentElement;n=oe(n)){var q=f,r=n,S=Ud(e),T=Ud(r),ca=ae(r)",
L";ye(new Od(S.x+\nq.left-T.x-ca.left,S.y+q.top-T.y-ca.top,r.clientWidth",
L"-q.width,r.clientHeight-q.height),r)}n=Ud(e);q=E(g);q=vb(q.r.parentWin",
L"dow||q.r.defaultView);ye(new Od(n.x+f.left-g.body.scrollLeft,n.y+f.top",
L"-g.body.scrollTop,q.width-f.width,q.height-f.height),g.body||g.documen",
L"tElement)}if(!ze(e,a)&&a){f=Vd(e);a=rb(f,a);try{var Ec=G(F(e))||ka,na=",
L"vb(Ec),Fc=a.x>=na.width?a.x-(na.width-1):0>a.x?a.x:0,Gc=a.y>=na.height",
L"?a.y-(na.height-1):0>a.y?a.y:0,Hc=Kb(E(Ec.document));(0!=Fc||0!=Gc)&&E",
L"c.scrollBy(Fc,Gc);var tf=Kb(E(Ec.document));\n(Hc.x+Fc!=tf.x||Hc.y+Gc!",
L"=tf.y)&&h(new y(34,\"The target location (\"+(a.x+Hc.x)+\", \"+(a.y+Hc",
L".y)+\") is not on the webpage.\"));var Ha=new D(a.x-Fc,a.y-Gc);(0>Ha.x",
L"||Ha.x>=na.width)&&h(new y(34,\"The target location (\"+Ha.x+\", \"+Ha",
L".y+\") should be within the viewport (\"+na.width+\":\"+na.height+\") ",
L"after scrolling.\"));(0>Ha.y||Ha.y>=na.height)&&h(new y(34,\"The targe",
L"t location (\"+Ha.x+\", \"+Ha.y+\") should be within the viewport (\"+",
L"na.width+\":\"+na.height+\") after scrolling.\"))}catch(wh){}}d.move(e",
L",new D(b,c));\nreturn d.v()});ja(\"webdriver.atoms.inputs.mouseButtonD",
L"own\",function(a){a=new ih(a);kh(a,0);return a.v()});ja(\"webdriver.at",
L"oms.inputs.mouseButtonUp\",function(a){a=new ih(a);mh(a);return a.v()}",
L");ja(\"webdriver.atoms.inputs.doubleClick\",function(a){a=new ih(a);kh",
L"(a,0);mh(a);kh(a,0);mh(a);return a.v()});ja(\"webdriver.atoms.inputs.r",
L"ightClick\",function(a){a=new ih(a);kh(a,2);mh(a);return a.v()});",
L"\"==a.type){c=\n\"array\"==ea(b)?b=b.join(\"\"):b;var g=/\\d{4}-\\d{2}",
L"-\\d{2}/;if(c.match(g)){$a&&ac&&(V(a,Pe),V(a,Df));V(a,$e);a.value=c.ma",
L"tch(g)[0];V(a,wf);V(a,vf);return}}\"array\"==ea(b)?x(b,e):e(b);d||x(Xg",
L",function(a){f.d(a)&&gh(f,a)})}function th(a){var b=Xd(a);return 0<b.w",
L"idth&&0<b.height||!a.offsetParent?b:th(a.offsetParent)}function uh(){H",
L"e.call(this)}v(uh,He);(function(a){a.ab=function(){return a.va?a.va:a.",
L"va=new a}})(uh);function vh(a,b,c,d){function e(){return{Aa:f,keys:[]}",
L"}var f=!!d,g=[],n=e();g.push(n);x(b,function(a){x(a.split(\"\"),functi",
L"on(a){if(\"\\ue000\"<=a&&\"\\ue03d\">=a){var b=$[a];b===l?(g.push(n=e(",
L")),f&&(n.Aa=m,g.push(n=e()))):t(b)?n.keys.push(b):h(Error(\"Unsupporte",
L"d WebDriver key: \\\\u\"+a.charCodeAt(0).toString(16)))}else switch(a)",
L"{case \"\\n\":n.keys.push(ag);break;case \"\\t\":n.keys.push($f);break",
L";case \"\\b\":n.keys.push(Zf);break;default:n.keys.push(a)}})});x(g,fu",
L"nction(b){sh(a,b.keys,c,b.Aa)})}var $={\"\\ue000\":l};\n$[\"\\ue003\"]",
L"=Zf;$[\"\\ue004\"]=$f;$[\"\\ue006\"]=ag;$[\"\\ue007\"]=ag;$[\"\\ue008",
L"\"]=Y;$[\"\\ue009\"]=bg;$[\"\\ue00a\"]=cg;$[\"\\ue00b\"]=dg;$[\"\\ue00",
L"c\"]=eg;$[\"\\ue00d\"]=fg;$[\"\\ue00e\"]=gg;$[\"\\ue00f\"]=hg;$[\"\\ue",
L"010\"]=ig;$[\"\\ue011\"]=jg;$[\"\\ue012\"]=kg;$[\"\\ue013\"]=lg;$[\"",
L"\\ue014\"]=mg;$[\"\\ue015\"]=ng;$[\"\\ue016\"]=og;$[\"\\ue017\"]=pg;$[",
L"\"\\ue018\"]=Wg;$[\"\\ue019\"]=Ug;$[\"\\ue01a\"]=tg;$[\"\\ue01b\"]=ug;",
L"$[\"\\ue01c\"]=vg;$[\"\\ue01d\"]=wg;$[\"\\ue01e\"]=xg;$[\"\\ue01f\"]=y",
L"g;$[\"\\ue020\"]=zg;$[\"\\ue021\"]=Ag;$[\"\\ue022\"]=Bg;$[\"\\ue023\"]",
L"=Cg;$[\"\\ue024\"]=Dg;\n$[\"\\ue025\"]=Eg;$[\"\\ue027\"]=Fg;$[\"\\ue02",
L"8\"]=Gg;$[\"\\ue029\"]=Hg;$[\"\\ue026\"]=Vg;$[\"\\ue031\"]=Ig;$[\"\\ue",
L"032\"]=Jg;$[\"\\ue033\"]=Kg;$[\"\\ue034\"]=Lg;$[\"\\ue035\"]=Mg;$[\"",
L"\\ue036\"]=Ng;$[\"\\ue037\"]=Og;$[\"\\ue038\"]=Pg;$[\"\\ue039\"]=Qg;$[",
L"\"\\ue03a\"]=Rg;$[\"\\ue03b\"]=Sg;$[\"\\ue03c\"]=Tg;$[\"\\ue03d\"]=qg;",
L"ja(\"webdriver.atoms.inputs.sendKeys\",function(a,b,c,d){c=new Vf(c);a",
L"||(a=be(document));a||h(Error(\"No element to send keys to\"));vh(a,b,",
L"c,d);return c.v()});\nja(\"webdriver.atoms.inputs.click\",function(a,b",
L"){var c=new ih(b);a||(a=c.v().element);a||h(Error(\"No element to send",
L" keys to\"));var d=a,e;rh(d);e=F(d);e=C?e.body:e.documentElement;var f",
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",
L"ntHeight-d.offsetHeight,q=e.scrollLeft,r=e.scrollTop,q=q+Math.min(f,Ma",
L"th.max(f-(e.clientWidth-d.offsetWidth),0)),r=r+Math.min(g,Math.max(g-n",
L",0));f=new D(q,r);e.scrollLeft=f.x;e.scrollTop=f.y;e=th(d);e=new qh(e.",
L"width/2,e.height/2);f=c||new ih;f.move(d,\ne);kh(f,0);mh(f);return c.v",
L"()});\nja(\"webdriver.atoms.inputs.mouseMove\",function(a,b,c,d){d=new",
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)",
L",b=Math.floor(c.width/2),c=Math.floor(c.height/2)):(a=Vd(e),b+=d.v().h",
L"a.x-a.x,c+=d.v().ha.y-a.y);a=new D(b,c);if(!ze(e,a)&&(e.scrollIntoView",
L"(),z&&!Bd(11))){f=G(F(e));for(f=f.frameElement;f;f=f.frameElement)f.sc",
L"rollIntoView(),f=G(F(f))}if(a){for(var f=new Od(a.x,a.y,1,1),g=F(e),n=",
L"oe(e);n&&n!=g.body&&n!=g.documentElement;n=oe(n)){var q=f,r=n,S=Ud(e),",
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",
L"op,r.clientWidth-q.width,r.clientHeight-q.height),r)}n=Ud(e);q=E(g);q=",
L"vb(q.r.parentWindow||q.r.defaultView);ye(new Od(n.x+f.left-g.body.scro",
L"llLeft,n.y+f.top-g.body.scrollTop,q.width-f.width,q.height-f.height),g",
L".body||g.documentElement)}if(!ze(e,a)&&a){f=Vd(e);a=rb(f,a);try{var Ec",
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",
L"c=a.y>=na.height?a.y-(na.height-1):0>a.y?a.y:0,Hc=Kb(E(Ec.document));(",
L"0!=Fc||0!=Gc)&&Ec.scrollBy(Fc,Gc);var tf=Kb(E(Ec.document));\n(Hc.x+Fc",
L"!=tf.x||Hc.y+Gc!=tf.y)&&h(new y(34,\"The target location (\"+(a.x+Hc.x",
L")+\", \"+(a.y+Hc.y)+\") is not on the webpage.\"));var Ha=new D(a.x-Fc",
L",a.y-Gc);(0>Ha.x||Ha.x>=na.width)&&h(new y(34,\"The target location (",
L"\"+Ha.x+\", \"+Ha.y+\") should be within the viewport (\"+na.width+\":",
L"\"+na.height+\") after scrolling.\"));(0>Ha.y||Ha.y>=na.height)&&h(new",
L" y(34,\"The target location (\"+Ha.x+\", \"+Ha.y+\") should be within ",
L"the viewport (\"+na.width+\":\"+na.height+\") after scrolling.\"))}cat",
L"ch(wh){}}d.move(e,new D(b,c));\nreturn d.v()});ja(\"webdriver.atoms.in",
L"puts.mouseButtonDown\",function(a){a=new ih(a);kh(a,0);return a.v()});",
L"ja(\"webdriver.atoms.inputs.mouseButtonUp\",function(a){a=new ih(a);mh",
L"(a);return a.v()});ja(\"webdriver.atoms.inputs.doubleClick\",function(",
L"a){a=new ih(a);kh(a,0);mh(a);kh(a,0);mh(a);return a.v()});ja(\"webdriv",
L"er.atoms.inputs.rightClick\",function(a){a=new ih(a);kh(a,2);mh(a);ret",
L"urn a.v()});",
NULL
};

Expand Down
20 changes: 20 additions & 0 deletions cpp/IEDriverServer/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,26 @@ available via the project downloads page. Changes in "revision" field indicate
private releases checked into the prebuilts directory of the source tree, but
not made generally available on the downloads page.

v2.31.0.1
=========
* Added ability to get current URL from IWebBrowser2 if IHTMLDocument2 fails.
Under normal circumstances, the IE driver gets the current URL from the
document loaded in the browser. When IE browses to a non-HTML page, such as
a PDF file with the Adobe Reader plugin installed, getting the document
fails, since there is no "document" in the browser. In that case, fall back
to getting the LocationURL property of the IWebBrowser2 interface. It's
arguable that this is the wrong thing to do, since the driver is useless
without an actual document, but we'll let this work anyway. Fixes issue
#5361.
* Updated logic in IE driver to correctly wait for the document. Fixes issue
#5326.
* Submit should throw NoSuchElementException if the target element is not
within a form. Implemented in atoms, Firefox and HtmlUnit.
* Reinstated execution of JavaScript on separate thread for IE10 on Windows 7.
* Removed use of CComQIPtr from IE driver native code. The use of CComQIPtr is
not needed, as we are substituting a call to the QueryInterface method
instead. This is what CComQIPtr does under the covers anyway.

v2.31.0.0
=========
* Release to synchronize with release of Selenium project.
Expand Down
Binary file modified cpp/IEDriverServer/IEDriverServer.rc
Binary file not shown.
Binary file modified cpp/prebuilt/Win32/Release/IEDriverServer.exe
Binary file not shown.
Binary file modified cpp/prebuilt/x64/Release/IEDriverServer.exe
Binary file not shown.

0 comments on commit 493a147

Please sign in to comment.