Multiple Attributes

From a987fc88e23f74f299d7bf2711b6412da8474ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albrecht=20K=C3=B6hnlein?= Date: Mon, 25 Apr 2022 10:31:59 +0200 Subject: [PATCH 1/3] Escape double quotes to not break JavaScript commands (#71) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Escape double quotes to not break JavaScript commands * Add test for usage with different selectors, including single and double quotes Co-authored-by: Albrecht Köhnlein --- module/VisualCeption.php | 3 +++ test/integration/html/multipleAttributes.html | 18 +++++++++++++++ ...orMultipleSelectors.multipleAttributes.png | Bin 0 -> 2801 bytes .../acceptance/MultipleAttributesCest.php | 21 ++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 test/integration/html/multipleAttributes.html create mode 100644 test/integration/tests/_data/VisualCeption/MultipleAttributesCest.seeSameDivForMultipleSelectors.multipleAttributes.png create mode 100755 test/integration/tests/acceptance/MultipleAttributesCest.php diff --git a/module/VisualCeption.php b/module/VisualCeption.php index 37ab601..56909cd 100755 --- a/module/VisualCeption.php +++ b/module/VisualCeption.php @@ -325,6 +325,9 @@ private function getCoordinates($elementId) { if (is_null($elementId)) { $elementId = 'body'; + } else { + // escape double quotes to not break JavaScript commands + $elementId = str_replace('"', '\\"', $elementId); } $elementExists = (bool)$this->webDriver->executeScript('return document.querySelectorAll( "' . $elementId . '" ).length > 0;'); diff --git a/test/integration/html/multipleAttributes.html b/test/integration/html/multipleAttributes.html new file mode 100644 index 0000000..7a8fd96 --- /dev/null +++ b/test/integration/html/multipleAttributes.html @@ -0,0 +1,18 @@ + + + + + Multiple Attributes + + + +Testing a div with multiple attribute selectors +

My div with multiple attributes

+ + diff --git a/test/integration/tests/_data/VisualCeption/MultipleAttributesCest.seeSameDivForMultipleSelectors.multipleAttributes.png b/test/integration/tests/_data/VisualCeption/MultipleAttributesCest.seeSameDivForMultipleSelectors.multipleAttributes.png new file mode 100644 index 0000000000000000000000000000000000000000..7235f0f45186496cadfd68ba111141a4967fc2e1 GIT binary patch literal 2801 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 literal 0 HcmV?d00001 diff --git a/test/integration/tests/acceptance/MultipleAttributesCest.php b/test/integration/tests/acceptance/MultipleAttributesCest.php new file mode 100755 index 0000000..0a0a61b --- /dev/null +++ b/test/integration/tests/acceptance/MultipleAttributesCest.php @@ -0,0 +1,21 @@ +amOnPage("/multipleAttributes.html"); + // class selector + $I->dontSeeVisualChanges("multipleAttributes", ".block"); + // attribute selector without value + $I->dontSeeVisualChanges("multipleAttributes", "[data-element]"); + // attribute selector with single quotes + $I->dontSeeVisualChanges("multipleAttributes", "[data-element='myElement']"); + // attribute selector with double quotes + $I->dontSeeVisualChanges("multipleAttributes", '[data-element="myElement"]'); + } +} From e883b6dfc5dea3897742ceea36479ba69dc41687 Mon Sep 17 00:00:00 2001 From: al-zakharov <104079778+al-zakharov@users.noreply.github.com> Date: Thu, 28 Apr 2022 14:36:16 +0300 Subject: [PATCH 2/3] Added support for multi session testing (#73) * Added support for multi session testing * Added MultiSessionCest * Fix MultiSessionCest --- module/VisualCeption.php | 39 +++++++++++++++++- test/integration/html/multiSession.html | 10 +++++ .../integration/html/multiSessionChanged.html | 10 +++++ ...tSeeVisualChangesInMultiSessions.block.png | Bin 0 -> 1658 bytes ...sInMultiSessions.blockInAnotherSession.png | Bin 0 -> 2506 bytes .../tests/acceptance/MultiSessionCest.php | 23 +++++++++++ 6 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 test/integration/html/multiSession.html create mode 100644 test/integration/html/multiSessionChanged.html create mode 100644 test/integration/tests/_data/VisualCeption/MultiSessionCest.dontSeeVisualChangesInMultiSessions.block.png create mode 100644 test/integration/tests/_data/VisualCeption/MultiSessionCest.dontSeeVisualChangesInMultiSessions.blockInAnotherSession.png create mode 100644 test/integration/tests/acceptance/MultiSessionCest.php diff --git a/module/VisualCeption.php b/module/VisualCeption.php index 56909cd..0c7e2f4 100755 --- a/module/VisualCeption.php +++ b/module/VisualCeption.php @@ -1,6 +1,7 @@ 0, @@ -568,4 +569,40 @@ protected function _initVisualReport() } $this->debug( "VisualCeptionReporter: templateFile = " . $this->templateFile ); } + + /** + * Get a new loaded module + */ + public function _initializeSession() + { + $browserModule = $this->getBrowserModule(); + + $this->webDriverModule = $browserModule; + $this->webDriver = $this->webDriverModule->webDriver; + } + + /** + * Loads current RemoteWebDriver instance as a session + * + * @param $session + */ + public function _loadSession($session) + { + $this->webDriver = $session; + } + + /** + * Returns current WebDriver session for saving + * + * @return RemoteWebDriver + */ + public function _backupSession() + { + return $this->webDriver; + } + + public function _closeSession($session = null) + { + // this method will never be needed + } } \ No newline at end of file diff --git a/test/integration/html/multiSession.html b/test/integration/html/multiSession.html new file mode 100644 index 0000000..41109a8 --- /dev/null +++ b/test/integration/html/multiSession.html @@ -0,0 +1,10 @@ + + + + + Multi Session + + +

Text in the first session.

+ + \ No newline at end of file diff --git a/test/integration/html/multiSessionChanged.html b/test/integration/html/multiSessionChanged.html new file mode 100644 index 0000000..0e484ca --- /dev/null +++ b/test/integration/html/multiSessionChanged.html @@ -0,0 +1,10 @@ + + + + + Multi Session + + +

And this is another text from another session.

+ + \ No newline at end of file diff --git a/test/integration/tests/_data/VisualCeption/MultiSessionCest.dontSeeVisualChangesInMultiSessions.block.png b/test/integration/tests/_data/VisualCeption/MultiSessionCest.dontSeeVisualChangesInMultiSessions.block.png new file mode 100644 index 0000000000000000000000000000000000000000..52ed8499e560072559d97d1e0ada0be9e902fe86 GIT binary patch literal 1658 zcmZ`(dpOgJ8~+lUYjs*gS5Amy%QUs@Ooc7C7;>4}GBy*TEee!o9{@AG`#_x*g{=kq-8^ZxN>Iy>2@tL#?+06^W& z7UK#4aw)PNqNE_p2!}m1Sy2eIbhHG3CZ_5)Uqu<$q1d`Q0szAR08*|2z?Mu(Sp`6Twk-j#%)5 z!a=aX&#SS#Qkk@y;_DP6TP0TpsEjN9K-iZO**1zUb{I>y%hM~9i6MD`+OOAe-fz-}}eS)x((0XfPbEca&tHR2wIaxnBQ^85H+4)i!88&l$TG&LX;g4B4Ix<;ewAV4tn zsBQw;z0u@cPMSGx)(w>nTOlhteEtGP2F`EpwGX^+(Es^c#7AjT{rgYrb3~kk{&_d# zN6?oHS>Z!ls%{#_V~Z()Ced4_+x=qt8>2^?H(V=5cDPOld8Ln_`#Q~(68jX9e|i)< z&!o80LbY-q;)|5GH?GF9`;sg$Wt8-rAs0@*Q1Y?M=|rESEr1qdoTY++U3Z~$x7jM~ zTUUlo>bN&)SdRjIJ9n{!g}Rh$p8p)9)xG1j&8}5W?9<=qA%0X?9Gc-~@7b7A6H6}j z!sjhn!55p2l1yfgydg1r^sr9&?1IvDTr+KG$PJp)=uuF;Jzs4ox^hG zF;$*7aLcA=9TVff417M!JcX?sRpHk)4aU9hvuU-V$+czmitlt=tr+Ow^8Ek7Ow%;J z#EpkoRNEi7Z(%EXWPo@s{%!IJ&IRDy8a%0d%P(D{8;3Z2Eh$l> z_U#x@t62o>Kx&^@l;cjx5om+=tRG~M9=w{Q8&+#f zEN!TScovyPw(VzL?Uk-MI?wY@6`G9o^FQ)dDqHc%`I3h%Tep8)`P>3XOB9s3$~HV( z8`{*ZCpgYawuzJIqA6g%VhCpjr<;vMffE=TquOpY#qPh{S^dkLX=j`;?jm}+P*5*E zwl0tRT@WfwRDrg2?VTso+SY`GG#s3Kfxeh%`ZA?gJseZ<*XsUYdwl6-PGumKR5^8v ze4gi*Dh~$DQl7oywvSOYglNI!!cNH=DfX+^S=O&mWVigG(c(-V0Wno&RV0DPZ162HhS5iE#d9M+ zSe-b(T!n$J_G^^n7VmEHiC(Zc$BOOS>96G$HI-g4Lfk z&MtJ2T?PN3C&;{TS-SjO*zz^4uB_Ew`SNX{3cr?*s2UgYx8G)a7-4=pf-<|I1WD{` zXH^XMup@S3&rfP~&XotS{m<*ZzmTVWl-V*&gpVnk%;vA^#5F`*IY#WS@p!nK4qcB9 z+bn+X@I9X~&_#3&dXlMUad<&LNt8<%IV0aHiX4ZXnQ63b&(rd6_7u|tP0l__9-$Mh zZmAq%=-tIXcAp#Y%J2Ae-SUZQ-lZ|veWm!a+(w(ajG%W4i@Ljc+wv6=odZ0k|Wc8!4_$aDxls}3R=`Sn53HXT* literal 0 HcmV?d00001 diff --git a/test/integration/tests/_data/VisualCeption/MultiSessionCest.dontSeeVisualChangesInMultiSessions.blockInAnotherSession.png b/test/integration/tests/_data/VisualCeption/MultiSessionCest.dontSeeVisualChangesInMultiSessions.blockInAnotherSession.png new file mode 100644 index 0000000000000000000000000000000000000000..41f5752e4595c17f39edab021cf5a4e76a8cf261 GIT binary patch literal 2506 zcmZ`*XH=7k68%7>8mg24%F-lDGlU{w08wh_hy)O%28j?_XbIAhDnU?s2k8kIDbi6u zRwO|Y1PMi>OE2yMBAv~i^WKm50>bV0AmL%0C4jE3nrkTNSGnA2Ah~0ur8hzV^tQM zxZd8&ka#@YEJ7KhJZ3t8O+OxF6g3WJHt zaj9Lk%gLO!uefT9?fwA$BGXnU97!Pt@*8g}K0ESMJGO?3y$p;cq#~Gvc!H(ftS91_ zh1hsNEd7$MY%j%wwiY)#YQgy{$I-(P?=|1=Mwe{sENPd=Fmpi4Vwgi&xN8N&JP88W ziMo^WIbYtctlW$6^;@OkmM_I=*{bUZcq?D$^yXNxy)I;c1#%TGfvZ%p3Qc?8>Z6A> zYB=f?kitxl_%|tv9}RAR|44E`a~pVRvKc9z>@zS#Su zE$CN^)p-{OHzQ8RRnqg#Ll9QB$JZG%t^NuvhY<`*G$08dkA5vl06mv46OgOKojD&; zXfcXj;5k9ZY$y_^tDBbYOlLUr7Gpqv{}Jtt47F}?M~VHwZG76ZRJBoTq$$h!!p2{_ zwe$q`zL*~$HNVC@S7A6SR8P_K7&pr)Ei;6x?lF1g`@|xPi=S21$j!i6wS?ECwkg=Y z$Sk|okS0X7U^uKhx=BDNtk`hW1+QA@7u87PDL*7<`hMk99j_=nR zN~@}q#@N*l>e^WHOX;FtWxwH#`V8+q78g^$jw}Qjl3BYm7paF56jq8=T*-Z#fV&C#BGi z@;8vD9U+|tG~KP_d8Ib$Tv<9;E_evtwugC~-lZ&Sc@G^Ru&X*__9oNi2`J!2!Lx%} zsN5b|h7-A>mMJ$*vBuw3S<e8z@zUk!v)?hCJ(b3kiSBNN+y1_J zJyU|k@s?_#XL9eQ0L53wX6#C_&&+DN7?O2F0e*FN}TJGP?%Ww z#5Yxvc12BgV@3;7o~bEG5uM2VzI_Qs1Jnf=c58yjV={dq|>g|Ru*mTR3G8xr7YfYHsG;Szl>yZDsWBk5^ zrStes%Qn#{Uj3^0*&vbE2A>j7!O0PWV+6G~0evO~;QH64k>eHFt?Za^@t?eU9jNxpe_2;I%We_S zq>Ol{4ki4oi$becc)45*2)_s$xbXe9gIf9Q@Xm9bDYR-WNKuKVu9mLu zdMI*DDAI9K{sy^u`+;eXM?|o+W^D1Q3>DrwjDzF}24AIp<{|LS3|#!|21eB@nk~-{ z6ldOymi_+WD@aH#=q$J$K}reE*N-0GE&!u4vmZf*7VcUI;~ehwy?uetHgZOlxgR@a zxka6O*Rt(CndNt*?%GC%x&`@dy+Xr5QiUcZYK(eQ>aMkWo@9h@$@nNF#87_795I)l zoBL@K+aonL$u>tEMN3%EK<+%6WJx+O)yQ?Jp7gw>?e(<8wS%x5^h{RuEvwI?z-$kz z)lh!wJJWhz|LJwRF8QFaV0u3L6N>8WyvC>f&8?8XTFy&>-b#ivpU?w>2o2Pc^1kA= zoioS2KQH}fk69cw0cL7OF}J30k(ZD0&1&CP;iyzCkUL(a+;A4LRNh0rPx_TAKS)BT zX!i$+i<%hjCq0nx%P!0Y`wjtPcZH5GJ(ytrzVWa}sx;Bl^|^znc8_OOhnE(A zw@;ed!J0>Udx&9KJTlVH?fFxYpXp%I@o2Q-iwVev$=0Ff+6E7{y@uF)Q(>V$ybRI0 z*!~G7+IS8&v#(?}8}aMs!h+NP7%={xXfNFVH|&o)e`Oc| N69WtV#v872{{Z(Gqfh_< literal 0 HcmV?d00001 diff --git a/test/integration/tests/acceptance/MultiSessionCest.php b/test/integration/tests/acceptance/MultiSessionCest.php new file mode 100644 index 0000000..ca61b45 --- /dev/null +++ b/test/integration/tests/acceptance/MultiSessionCest.php @@ -0,0 +1,23 @@ +amOnPage("/multiSession.html"); + $I->dontSeeVisualChanges("block", ".block"); + + $friend = $I->haveFriend('friend'); + $friend->does(function (WebGuy $I) { + $I->amOnPage("/multiSessionChanged.html"); + $I->dontSeeVisualChanges("blockInAnotherSession", ".block"); + }); + + $I->amOnPage("/multiSession.html"); + $I->dontSeeVisualChanges("block", ".block"); + } +} From 92ca816010b0a59ecae4904ee1d195fadb117af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Bure=C5=A1?= Date: Thu, 19 May 2022 07:57:13 +0200 Subject: [PATCH 3/3] New version 1.0.4 --- CHANGELOG.md | 4 ++++ composer.json | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3745542..7b05875 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.0.4 +* Added support for multi session testing - #73 +* Fixed double quotes to not break JavaScript commands - #71 + # 1.0.3 * Fix incorrectly cropped full page screenshots * Remove test dependency from www.thewebhatesme.com to local http server diff --git a/composer.json b/composer.json index 12a8a89..c3f7039 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,7 @@ { "name": "codeception/visualception", "description": "Visual regression tests for Codeception", + "version": "1.0.4", "homepage": "https://github.com/Codeception/VisualCeption", "license": "Apache-2.0", "require": {