From 8541a87d1f471530c81553254f58b005da365f90 Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@espocrm.com>
Date: Fri, 2 Mar 2018 11:35:52 +0200
Subject: [PATCH] Integration tests fixes

---
 .../Espo/Extension/GeneralTest.php            |   6 +++---
 .../integration/Espo/Upgrade/GeneralTest.php  |   2 +-
 .../testData/Extension/General.zip            | Bin 5831 -> 5837 bytes
 .../integration/testData/Upgrade/General.zip  | Bin 1206 -> 1213 bytes
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/integration/Espo/Extension/GeneralTest.php b/tests/integration/Espo/Extension/GeneralTest.php
index 40a5ad2d3a..8a98bc6084 100644
--- a/tests/integration/Espo/Extension/GeneralTest.php
+++ b/tests/integration/Espo/Extension/GeneralTest.php
@@ -70,7 +70,7 @@ class GeneralTest extends \tests\integration\Core\BaseTestCase
         $this->assertFileExists('client/modules/test'); //directory
         $this->assertFileExists('client/modules/test/src/views/test-entity/fields/custom-type.js');
 
-        $this->assertFileNotExists('vendor/phpunit'); //directory
+        $this->assertFileNotExists('vendor/zendframework'); //directory
         $this->assertFileNotExists('extension.php');
         $this->assertFileNotExists('upgrade.php');
 
@@ -93,7 +93,7 @@ class GeneralTest extends \tests\integration\Core\BaseTestCase
         $this->assertFileNotExists('client/modules/test'); //directory
         $this->assertFileNotExists('client/modules/test/src/views/test-entity/fields/custom-type.js');
 
-        $this->assertFileExists('vendor/composer'); //directory
+        $this->assertFileExists('vendor/zendframework'); //directory
         $this->assertFileExists('extension.php');
         $this->assertFileExists('upgrade.php');
 
@@ -116,7 +116,7 @@ class GeneralTest extends \tests\integration\Core\BaseTestCase
         $this->assertFileNotExists('client/modules/test'); //directory
         $this->assertFileNotExists('client/modules/test/src/views/test-entity/fields/custom-type.js');
 
-        $this->assertFileExists('vendor/composer'); //directory
+        $this->assertFileExists('vendor/zendframework'); //directory
         $this->assertFileExists('extension.php');
         $this->assertFileExists('upgrade.php');
     }
diff --git a/tests/integration/Espo/Upgrade/GeneralTest.php b/tests/integration/Espo/Upgrade/GeneralTest.php
index 03bd6650ab..bef23ce4f0 100644
--- a/tests/integration/Espo/Upgrade/GeneralTest.php
+++ b/tests/integration/Espo/Upgrade/GeneralTest.php
@@ -66,7 +66,7 @@ class GeneralTest extends \tests\integration\Core\BaseTestCase
         $this->assertFileExists('data/.backup/upgrades/' . $upgradeId);
 
         $this->assertFileExists('custom/Espo/Custom/test.php');
-        $this->assertFileNotExists('vendor/phpunit');
+        $this->assertFileNotExists('vendor/zendframework');
         $this->assertFileNotExists('extension.php');
         $this->assertFileNotExists('upgrade.php');
 
diff --git a/tests/integration/testData/Extension/General.zip b/tests/integration/testData/Extension/General.zip
index 43b88219e2892fc008e52519d7380bb32de287e4..7234352464a528937147c25a35ceaab37e4627c1 100644
GIT binary patch
delta 1098
zcmZuvYe*DP6uvWeXB}r}cV}nERco2HTn$al$3iZYrYRMxu+>VhB{SNxOxM&bic~DK
zABowaCsAN!{faW8P@|W<KuO9rDkaIlAkavPeiU`bZHFbAVJ_#M?>pZ)hxwkQ45S=Q
zWc#f1)>OrwUe}%;3vqg}{X#4&%?zcMXhKjjmBw1td~EwjD%+KqtX6_SgfS{frSGRQ
z*}gEmiO!wIz(jjgQZ{y}@hH8B4TKdmYTT?NY&1c$O67LqA~jCnR<m{LTxK}MRcUsT
zb%59Hg;Xg9j%l3GD(Q8R2<NMMX7I7K)4Ura>~abkwd>g7FqLmwe^8|?q6N&N2$;$H
z+tLhPrYs0PWx5(9gb<7Ft>0AWdSCtcCb`X`5Yi(nswl18w#8Rdo4UQmUs>!S{ZEp)
zPLprf9vz}IpD;qxM?qVTu_;aJ+nvpnS}rDJo%&?U=#ClNWKBAom;bic@-zBw&!xt~
zfu8r@ChoM2b#Hhy`NeYeR?CaZuR{%2JhPMhFS@jwBMz(;w56B7I+}-mdOr;A^zloV
z@at3J${jDCor#RU{oqjfyA0i%;jR5!SDY{Y>~*`u_=4Vdb=BJAD`)R2$vzzK2;64#
zl0TO3sBrt5I{j1Lr^8c1?TrThVbw}ojdS8vbF1lQulW4S0%ys1gxf{YGKP9S6B7%;
zVxyJVM}`TWgEg4f7JC?krS|(02qq2&d6_x_le_~0dKte&2v*=2Fd7)j8lvpe%e0+>
zYhrY;whII*SPTXk*HB7{4TcPM$TY}wzrwVFpD6UHM6XfCHd-OZLx<50KM1j&CPW)#
zk!zYD(*YXXf(ITOWjY%ZBq7)=plX~j$@nZraGlG7NfU#K2d8(NLGpTyqCFoLMX*q9
zvO^~p4Kd`8E02JF<?h!I#SHi^*dc)vjp5KZDZS3+1iRHKJ8!gb@H$GyC5(c&VVT7W
zgL*AEB$+CL`{r~Q<syl51u7rTNeiiGVL2VxqB3EoS;hz1&`9Q>_HanMgP^}v)CQt7
xhd5cLry|LaPS_#l(VICE`po~aFzmL>O;qgqk5%0+MyqTaO<pI5P(82Q{s3A;QHKBk

delta 1064
zcmY+CYe-XJ7{}lD+}h^OHn*d0c{;Nkl~d<s1{D_C9BE=n84c>gR%vFMm1$;-EDF0|
zWlu##K}lM4SCcMuGcl10jMONLM3YSV;)f!kqW2uvurG)6{QtlI^S;k>&a3#&_+v4u
zb}`nIGHUnKC0XiD+3{0I5(KEGRCP;YSyN=JM+*jC5x{{RY*S2}rvV0Z6UfIzHj*I5
zAkv4OY&$`2|3ko!Q}NV*@50Z5x}8eLQHq{MyV+in=?Z!SR5nfs_N-xY@av!#!K}b-
zL9da{Wu0VzjG*#corlL1x<FIJjFZ05qiKc%DlgkluG*!5SiO~zE2vP{z$$Jv>mogp
zmC0Xl70g0XwYaBbVHjgpvE>BJQDQ!J8?#A{y=AL*3kV?<V)mA1Mb~D{xkV}qMu<lu
zD)DXJSdd?~-BDClx_M=u8qt@{WRKtMp7P2NgqaZ<A?4vd+N9f?D7be#uKyaBSv&vq
zNL2Cz^Uzw+zGgqu-x!~<?$?g&!^w|#E&b&8FW#5iX1x%*=xE}p&&xu5yNhB*E^U~0
z$0`<NoxL=D*p2hYTiar`4DD-)K2p+Gmhj-~V16z4!P|MG^h`ss#Tnkxar;{9$({vW
zwa4H2tb@kJ?$&14ctWwasUxRo{qjf8`*igus;=65552GIZ}{n-xz+n{_H~Q(?&!^(
z2cHQ3`h?tUOi8qcjEWE((#GR<vN8!AyoA#rhfje%t%Pgf0w2b$%wrL4f~R~c{f5Bl
z*vt^2iF_Cd_V5xl1H(lUi-c-jDqV&V?9oI{gxVEmo=&1VWyS*DP!&|^Y*46|K-6pC
zfW{10^fvfIkV-0m@Q^{IG=l`A1SvE`<6foDOT9#;&;cj{M1u`#7^B{-%z%&q{Z2ne
z%cm#7_fQ+m3Y9313E(ccYLKXke`N$zo759`bSiTfhDr1nMh?$~wy;IChn3$mVQIJs
z-C7Qo2_(%0npwdS7BZ3UCqI)Jx&<3GHrbsIi6)5}o)WxlwaJ2A<RqEp;2tr3s!65*
zqTmFJQKCf6Bv}oqtXf`ndEgih&J*Uu|I80#irkg|@BamV_$=zO8A5pz+z;1rm0EdC
Fe*xO1O2GgC

diff --git a/tests/integration/testData/Upgrade/General.zip b/tests/integration/testData/Upgrade/General.zip
index c21fc8dadc83d49743935f604979da1f5b77701e..e7660a84c22b00e56633517c6a7984cbc94c8a29 100644
GIT binary patch
delta 343
zcmdnSxtDW-F3V=gnNbrBouRbk#EJTF=3O%wbFu+rZvBPmBp-Im?dp3O7#MUI85npO
zWEgT2^D@&?i%ayfiu3bALpT|jcL2@X3B;up+zgB?FPIq^z=UhRH-D3XK+F3-T!$hz
zUVU-Uh2O3(uIFQtO^C#ijx9IEYL5QT%MA28TW37?W-WW7#MDP^8B%W68Ny$slIES7
z=ry<AbIFGdY%jZYq|ZrqyBmIvQQ@2-xSXl_{e^2q8@jGO+gx~N%|$==bTttHDec6V
zgA+b_&i`yDzdds5NmbKRQQAB2<k|Qw6yBwA`P%;k#%5L{&j_!tZ=$lNtXy*Nw4LP5
z$L}Vsd)I&UgMr3u-Q=mO^YrDfxo(;M-}j*U52gTbMyAbEn2s{?q6EU^G!}IhkcTHv
NWRYi^&IAk?1^{6ciX{L5

delta 351
zcmdnXxs7vzE{pN$hKPxV&Mb~#T5_@zv(UuFvM}z%yJj%vWCO<B`sq!^UR<iOt=kwF
z7}OXU7<d_E7;+QyGSgCvOZ2je^YcPOI2o92fo6elX$3a}Bg+eB1_m(U+HcE$NI}H)
z`@gPbn_WL-8(cj2>P1pdcj19=S+heF9He_c?&n^5Yhp3~`+eX09$5(fX-tt+cbAym
zW3y5J>O{A@ruF&)3Ea6_nl|ZECTT8g{A|;{=}**S5uV3WHhafxi#y9vx~MwVDsnNK
z`HiC6qCOhYOL~^(+&iC@qq)_;%<bfx4g5PAPL?jsiT~ehs$;gpv)5<U^$WM0M1uN5
zS4su8PL?@(+3CmM4(_(zLo*&0*ME-hvb!iA;LXS+$IJ!vF~j7U%z~RYGp%LhMG1(>
Uxh(1|AP-NT!6MH#feEA(08n;`X#fBK