From 64ca47ee8eeb6ec2a8504ef8ccebbd2ff816fa44 Mon Sep 17 00:00:00 2001 From: Lachlan Kermode Date: Sat, 15 Dec 2018 10:58:28 +0000 Subject: [PATCH] amend serverProcess test to update first --- .env.enc | Bin 1888 -> 1936 bytes .travis.yml | 3 +-- test/serverProcess.js | 31 ++++++++++++++++--------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.env.enc b/.env.enc index bf4ebdd7e6383bbb03d182a7ded8bd938ab0fb10..15d3065e31bb5ce0acd50bbe6926863bf250665c 100644 GIT binary patch literal 1936 zcmV;B2XFXBYqv}be_UWw5s)=i#=`Mu$JX&#z7Z#;0714baFY zYFNU;2UL81Kdw$UIJZ5}F-?|+c3L1nH5i_MW>hS6DNO|6Lvqp-zM7$u=wC{yaKAN3$PZB{iyL8A_M9g?hU13 z06*f4NB6@+?@0IR$G$fc1-UT35A1pbF!nENmaudl7T8RIG&tL?W(IwDVz=(PXQM0# zd40H05K7!=6&sY*r9Gi*WI-CqE ze`7m38N^u}LEoSh7JPfO)HBHhE0w~I*hX-;rdX0vnuK5^)9t6XP!PaO$w;vyyV|Fz zY#{F|F35=9i(njmzjBLu+C(auRzEB9A$9}2B6c5e%d+zwDFokcYqKRD^+`; z1MBLuCaJjO-WJ#f>RPUPPk)njNDg{}5>na;Cd7{t5pc~N6!bUC3Zg_BsaIrn(H!}` z=_G6etYacZbp$$uk^J*`3Tjim;(2c*9iEKhM8p+kxPl^0&szbVpIj*8*`Z{2fIWlc zOE;Z06(x?Cjkk#u@k~>7RnD2y$~U3o3eb@uE+5rU-wB_?3KnW=;`o+WPXG(E`TwYF z&Ur`h{Yen7uq}p^0ezOIUyj38iZB&3`7)wgf~8d17S@(ul|1XwBJDQdZ~+b@*8U48 zBhCS|O41So`AN7Ic=1dhbpNyS>kb}#{Q4mNb&1>YDFLdt#KvUlEE+=-DY(G}Cv!SGDjE?W z(c#1ol#~QWs7~H?+(`Gan&Gy94INUFq%Z<3tdofCsQD{1Br|8mV2)B|<$J;KN*do{ zKGQibGa{s}BpUWZ;<*6wVl_X<@qx6PoR#8hh;u}(tmsZ=J>;0hnrpkz5NbWsBTmFf zDQ$P+pH{c%d!s#^~iSb}xQJy|E z{~*p$^nFiuG<$I+0e%4dXZk43x~UljNVY#a9W6i8eIsFdkjuDa-r}MrQ||L)P+E7c z#ctHWVEoU+Zr@~QvQ-rN%d{qigN#wj1T0NTvPdR|IIb6eg?YEpvHQh~_k6Cw9Qap* z0SnL>G9E;1bzz%3b$*f!s*Q9JAPF}>?kvY7sC4I?qcInj$EXX!6afF}#!Y)P1>kf@ zB?BbnwRQ$Cdw8k)%wKlU%m%do1m3(*9S%$Q_QS4mt}Ch%u~OL%n79;uaMSSsn zK84Pw?&HAV%S{;o;dYL(w?jg8z1jHyc5SU^m{5U$TK`HfScnj*k9*81@Rla@X0);d)DF7BgKeUZ*_P4(M0 z#A5{AkTWkE6ZG?Sk@vL#L$EjpZ;!rh{s`~~472$UgW*%yk|$J&g8#=rf_04`4CH1O zw>Ch4_8^k1+#_<2ia%81Hw;-FJm!afMCX#i5d?9R-O3o1hH?ce*^FATfuinZHD(4v zhRKg9Uw{cG^IlT{=3@LCNq@Y)knL??aA(liz~J-ZO7b?Y{mCp_rG84H@6>E7weGPU zTvr3@GoruxgJY z;qA)7-E?U}eQ2+KIX;J-d7810S$%@I+d0jh%jnl%RNfcYCA5=U7_i-)^GmYJ0`<$J WxR^&m3uVb7Q}fFx?vVjCsdbuP=D literal 1888 zcmV-m2cP&Qg#%NIObkf7QadW;wR@8v75!mqy3y;HPyIKnzHWv)rc-7X54g7M+9kh| zcR-l4(_|)W)T2FHBEV)+McPj>7*lacJf5MIjFi8kiWr9fxMPz}+x?K`=J=a!!CdU4 zm=?o-g+_ra$ucnL#8v)su`3#bb8F-=UwWxn5p?;(H50fuSv!FQ?CeKT^Z(Pl68EA| z?O%#Vl9A{z<&Aoa5AuLF(k{J160un-9^NH(x~LG`@ii5eJRNO_U;(LZ9ov``mtRYb z$cu_Zw%HjCV{X`>y%Al^tN?^C5(MVT#4+VIdUfO)LYutb%kZCsA)rboWIT`J=l+2E zY?C858BJ`oX=cImt5u9^t(c2AQ)*Xyq;VUDGDh7mcDl&3u2durwo3hO!nC}!bIQ=r zp9eHtH{~AW3?e*p;4WBU37U&rq-R(x9D3Rr2Wde*7Du~=d1?eZc%b$7wHC#T;n#DG z`4B)<#?|#qFRalPEtPq0wIPgtkA|l?kQx@u`bv9N5$^wow6q{i^4Xz&h2_bNTn@GN zzXZHjo(QN+*tRLLg_6?I)$Hg42XY{=AbXw7?~}#~U=&eOIkr!Z%D+)_o5T)}*6~}p zzc5h`#@s=_!x-Qtm4sVu7KZ0XSNm1T+W8chm1&CU&A<#~gPK=CO=!D{!4m}dF}8yh z#B3b3z8G-Eo62CePmQ=2KQm+Q5YXQqC|=_)u$zY~+feBL^-Ck&BRKPyM*mY)?9XsTng}{N+fygMaei1IH0njdQ4*NPF&3u1}01231c!tip)HkHSu&iE~ro*57wNJCz_RnoH6!h{24hwCD zKgw1&>Je1kbe*xFp17SEwk@kCz5cHc*kqp&bRgqMZpE)i&Y2gAt5gm>9|>$RBnWd# zb54Ttu_}GU%~N0V#tBSmP3p$m>77$o%37t<3H$|I{p9Gmif(T@`|t7aFP@Bs^6b;m zH3Z@?_+F@*ZAQUYwiQ|XxkeByj3~lP5a`RGL-dE^Z^mDC zbssd?T^N(BYoQ+a+KuW+Hw@(EEKRIs`fKt1wna=B^+)1DbzS{J3VyCd9=rx?yxTU? z7B=ry`<5r@9aor8fUn#{hin5Ke%Px2tF@&GM#s$l^j8lvQugXEPw8ubZ}I=T55J3U zPJ_Vd+nWyhQ{8cv&(me#bbai%dLZ2l`OGk(w>lLJETUFcb;W8Ld-Kr$qEZfoYk_}) z@3*CX1J?4>grS_JWq;bS&tm}EEXG}t`3w8H!X;m!w6@qDH{Sub8V3XlAw_?acNSy+ zxh!YJM^GEZWbc_mQW<;VFWjw|HzG+$Mf->?`wpaBv(nbQ%XTBh0P5w2v{F(%zHK@g z%$)CZ)V*l)?1qZtY}XeG$B|;`0M{qibdy4T#Am5`T}LEmFhUWhUfRd1^3eO%r)9zT z{t3;da^7>O3oQG2z2wW755vs>G?F03G^H@JW4v_2Db8EGcLw>^(^hK;VnC27@WOfD zj=)Cv#nqslAW~Wc%y;2-3n5fx{xlEF-!_H3>%xAs3bPJ7NO}@svxyRpK{bQF241K} z`RM!*&4u#Ov486>3JR>GYZ5FOdKPv=UQ_oqL{5zzzg%1X17@h&e{g!ZqU~e1SxvY@ zjO?~qM#a`jSKMgUqRzVUxxO znrnH% zbZ;G&K;{dIQHvIR89{7hDmC{q{E1kMwCJ5AyHiOMYMe%@@XIcFNFJpb?Wn+Pn1_N6 zyYY4pSA~kUFO7qI8_FKgagy9vzt|mdmWv{+$QlJ1yvwn6LlTnkp_r^!DP?vn^7 a{6={EStFjQ8>63B41b$lBs$8=TQeTB@vbER diff --git a/.travis.yml b/.travis.yml index 0f43430..4517fe9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,9 @@ before_script: install: - yarn script: -- if [ "TRAVIS_PULL_REQUEST" = "false" ]; then bash ./scripts/decrypt.sh; fi - yarn build - yarn lint - yarn test before_install: -- openssl aes-256-cbc -K $encrypted_eeb74e8d35d1_key -iv $encrypted_eeb74e8d35d1_iv +- openssl aes-256-cbc -K $encrypted_fb307c69bf51_key -iv $encrypted_fb307c69bf51_iv -in .env.enc -out .env -d diff --git a/test/serverProcess.js b/test/serverProcess.js index ae705d8..b6ff5a4 100644 --- a/test/serverProcess.js +++ b/test/serverProcess.js @@ -16,7 +16,7 @@ function checkStatus (res) { /* SETUP: launch a development server with a wait time */ test.before.cb(t => { - console.log('launching server...') + console.log('SETUP: launching server and updating...') serverProc = childProcess.spawn('yarn', ['dev'], { cwd: '.', stdio: 'ignore' @@ -26,7 +26,21 @@ test.before.cb(t => { serverExited = true }) - setTimeout(t.end, SERVER_LAUNCH_WAIT_TIME) + function pingUpdate () { + const expected = { + success: 'All sheets updated' + } + + return fetch(`${SERVER_ROOT}/api/update`) + .then(checkStatus) + .then(res => res.json()) + .then(json => { + t.deepEqual(json, expected) + t.end() + }) + } + + setTimeout(pingUpdate, SERVER_LAUNCH_WAIT_TIME) }) /* CLEANUP: kill the server */ @@ -39,19 +53,6 @@ test('should launch', t => { t.false(serverExited) }) -test('should update', t => { - const expected = { - success: 'All sheets updated' - } - - return fetch(`${SERVER_ROOT}/api/update`) - .then(checkStatus) - .then(res => res.json()) - .then(json => { - t.deepEqual(json, expected) - }) -}) - const passUrls = [ // / '/api/',