From 5e1b0284c1a57f30163a361ac1bc79f558d229c2 Mon Sep 17 00:00:00 2001 From: Andrew Ackerman Date: Thu, 6 Feb 2020 13:27:01 -0800 Subject: [PATCH 1/3] testing and random fixes for FE --- auth/auth-router.spec.js | 0 auth/authRouter.spec.js | 88 +++++++++++++++++++++++++++-------- data/auth.db3 | Bin 28672 -> 28672 bytes posts/postsModel.spec.js | 97 ++++++++++++++++++++++++++++----------- 4 files changed, 140 insertions(+), 45 deletions(-) delete mode 100644 auth/auth-router.spec.js diff --git a/auth/auth-router.spec.js b/auth/auth-router.spec.js deleted file mode 100644 index e69de29..0000000 diff --git a/auth/authRouter.spec.js b/auth/authRouter.spec.js index f1ac1a6..ae5b3b0 100644 --- a/auth/authRouter.spec.js +++ b/auth/authRouter.spec.js @@ -1,23 +1,73 @@ -const request = require('supertest'); - -const server = require('../api/server'); +const request = require("supertest"); +const server = require("../api/server"); +const newUser = { + name: "name1", + email: "email@blah.com", + username: "username9", + password: "test1", + bio: "I am a human person" +}; const user = { - name: "name1", - email: "email@blah.com", - username: "username1", - password: "test1", - bio: "I am a human person" -} - -describe('POST /', function (){ - it('it should register a new user', function () { - return request(server).post('/api/auth/register').send(user) - .then(res => { - expect(res.status).toBe(201); - }) -}) - -}); \ No newline at end of file + name: "name1", + email: "email@blah.com", + username: "username4", + password: "test1", + bio: "I am a human person" +}; + +describe("POST /", function() { + it("it should register a new user", function() { + return request(server) + .post("/api/auth/register") + .send(newUser) + .then(res => { + expect(res.status).toBe(201); + }); + }); +}); + +describe("POST /", function() { + it("it display correct error code (500)", function() { + return request(server) + .post("/api/auth/register") + .send(user) + .then(res => { + expect(res.status).toBe(500); + }); + }); +}); + +const loginUser = { + username: "username2", + password: "test1" +}; + +describe("POST /", function() { + it("should login registered user", function() { + return request(server) + .post("/api/auth/login") + .send(loginUser) + .then(res => { + expect(res.status).toBe(200); + }); + }); +}); + +const loginFakeUser = { + username: "username40", + password: "test1" +}; + +describe("POST /", function() { + it("should reject unregistered user", function() { + return request(server) + .post("/api/auth/login") + .send(loginFakeUser) + .then(res => { + expect(res.status).toBe(401); + }); + }); +}); diff --git a/data/auth.db3 b/data/auth.db3 index 94f03173764915ca1a4baf0d3e3ddcf0e6a58d0e..f07f279e1ace1d8bb783c7faca3e341d5b2cacb0 100644 GIT binary patch delta 1134 zcmZwGJ#5-&9LI4CNfTb|hlG2{U6a5mEd-&RITN zWb-%kpXNo=OVhe>VBEZUVm0bj+qIf}xEok?@vD?`HKSzhIq#Mn$+7;ULZR+&%e1J4 za`Dq9SD@Oyu;4F7s7Q53WmvZ_Tki0=LLx@;63LTQP2wA5v!bYH4RsN+zHzn@qP@(q zqi{htoLicGce{~tsG0JCJ=SG9zE-;%aEZHlnvul|aXVHNlLxJBXL*hDH8YWHQZ-HoywO(Q*TQ^);-RitL>9m z&cW|-6{nZWJ6n59CzbJK_BGE*yLrN#be*+ytRn=<_N;d&#l;oX8J%`p{Ck#ljkBVM z$p+F&*dGr>o7u8P$-6RTcNR{&*BMm*tC&5L2f;!az=58#Zic zO^05iSLiGHg8oAPp?By5`WJmdFVGdbL=rkgS;QbOS{p1_zY^D1hn9nY4L97!G_|5M zc&XxBoLuz6T3(g@bDBe@So)G z;!oz6;CsNgjjxl>o%cL%B+oOR!p(vLfjpZFeI_%@@bGss@UP=v!vB;11OE>Gm;7h= zukat{f5<1^f;`gBti0cn|PK^ZeqO$z#ramAjZ*kZV1c zFXwB{PEK`>qa4{Bd>b2YvCAbHGB7a28V71?GZthfmy{NzD&(grlw@S)r7IX(PQI0B zs2t)N9OCKct^lPuB1G636a&q58A4KvOB6yfOL9_y>XaOU67y2>a}`o6k~2#{+KWr_ ziz<^7b5n~F6;caJGYfK4^GXtg*%=H2waqbX16$@M!;v6_OMwN@7LWo#Tnfy=3fL0_ za49f@D&WVZz!a*050?THumZLOUR(-{K? zz&5bPbFwq&V+%-7q`676#B<<~2L~fio*jogI22i# { + expect(res.status).toBe(201); + }); + }); +}); -describe('GET /', function() { - it('should return all posts', function() { - return request(server).get('/api/posts') - .then(res => { - expect(res.status).toBe(201) - }) - }) -}) +const post = { + title: "picture of thing2", + photo: "https://source.unsplash.com/random", + story: "this is a story", + details: "here are some details", + traveler_id: 1 +}; +describe("Post /", function() { + it("should add a new post", function() { + return request(server) + .post("/api/posts") + .send(post) + .then(res => { + expect(res.status).toBe(200); + }); + }); +}); -const post = { - title: "picture of thing2", - photo: "https://source.unsplash.com/random", - story: "this is a story", - details: "here are some details", - traveler_id: 1 -} - -describe('Post /', function() { - it('should add a new post', function() { - return request(server).post('/api/posts').send(post) - .then(res => { - expect(res.status).toBe(200) - }) - }) -}) \ No newline at end of file +describe("DELETE /:id", function() { + it("should delete post", function() { + return request(server) + .delete("/api/posts/2") + .send(post) + .then(res => { + expect(res.status).toBe(200); + }); + }); +}); + +describe("DELETE /:id", function() { + it("Should return 404 while attempting to delete a nonexsistent post", function() { + return request(server) + .delete("/api/posts/1") + .send(post) + .then(res => { + expect(res.status).toBe(404); + }); + }); +}); + +describe("PUT /:id", function() { + it("should update post", function() { + return request(server) + .put("/api/posts/11") + .send(post) + .then(res => { + expect(res.status).toBe(200); + }); + }); +}); + +describe("PUT /:id", function() { + it("should fail to update post and return 200", function() { + return request(server) + .put("/api/posts/100") + .send(post) + .then(res => { + expect(res.status).toBe(200); + }); + }); +}); From 275933f75167e5a1a7f83291d2b4cb9c5c1f227b Mon Sep 17 00:00:00 2001 From: Andrew Ackerman Date: Thu, 6 Feb 2020 13:42:54 -0800 Subject: [PATCH 2/3] fixing merge conflict --- data/auth.db3 | Bin 28672 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 data/auth.db3 diff --git a/data/auth.db3 b/data/auth.db3 deleted file mode 100644 index f07f279e1ace1d8bb783c7faca3e341d5b2cacb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28672 zcmeI4%Wopd9ml(kF~&CTnPDAvGI6FhJKiyx9o{czGm$Z`0gM6T2UyXXqAA=B{eXU8 za4zG`A=>-{dx|uNJ?9cB+T%!jiV`V@ z|LXhe`V_DJRd-j)yS#=#OIAdvfgp8@qG@Uy0E(hA_-Vt>$zsKY`H6vF>6!8u6*H9Q zy}vr})`gWK#pG81w)z9dz(HYyEQA0dKnM^5ga9Ex2oM5<03q;YCvfRmu(@0=`h)j0 z*bq=xRyB3BvL*IY@q-jNi0|yCKz&qK2b*=iSqHqNp);faN!Ea*3j*jWya<&c=%68h zx+e1ys~{0c+Pk2x@tT0@Ktlt=>T;)0vp=zSZV> zvQA&#=cOi=oVe&JQY0v%Q(fYFI-1lkjC*momn|QrKz1*gs^VSxf>w1POP_5udOMM= zyD#Cq&9%Nx|7dLlY9cXtwO++Fss4|M8U3h(K2%r^Dx3a*&yB$$5wm%%cDjF8+@}L$ z0Eeo2E-QG{W(8+G8vJ-b+?RJPHka2+U&2uzn+=gaQ=rDnl6or0Z0EI#`K!HtZTqPE z#yI_(?-~A8JoMRn&0U&Xa6NiN*G7A$_5^$oe5xWm)Dnw6XIif8)#o;D8g$>qE!~$v z+UDBWpg(ZG*4x>R%w18d&u;oJjBX$tHb%DrHI|z~!WC2Ury6g(8=6oyzxT0m{6EjUpqM{1zh{1h3uGY#2mwNX5Fi8y0YZQfAOr{jLVyq; z1PFouI|BB3i;EteO|!XTv8>aR!+a+*XW6jNo?Y+;ZSh{I7@dP*9RJhIKPdbl3n4%V z5CVh%AwUQa0)zk|KnM^5ga9Ex2z>PjSZE8iXdM4L?cb-EUot;oSmw>um#e>6{ctto z_>H5s^2e3l@;{eVP$c0G40la0DR#0Jt!(=PbD1hr7ERZvsx8mgI=Vq?^JS~ZmsGcM3ar! zNy?w%o~nsbFj{7Zuu{!u0TclQoGwBMbdjRsi)ZiLAZTcw$Z3kqAi z-stXeCFzAoZ|?3jizj^HY3Zb<4Y)>I*(v4oT&*SS!sPI}pto)iG&~L(DkSt+q!aO% zjsvyBf|3sEKF-7M36XeGXZZ#xu|_`^FL{MSy^-Ww{od1jw%{3xrFK_L95YE!1*~>dRc$Q^yU02F5|# zp+tFWPf5mdTbXW|)&0Hwp5NoEb}sN8#2Wd*K_w55)b8*krNSKBJ0CW(>a}=RZV=Qz z4k{1D;a*QXMnkC+40ysvna&{X@d>rPY9ZU~owb#I^xPvR#h`pRC>@I(J)6I-r@iGx zYR$bq{+wR_F&&5W7E`=f&A0i1$azFrKI&Y=V!BvKwrif8y2Z)E{iD_(%@_C}w-t=+ z_QR5hu7Rs9;gB1yOKT!0b5c@9)9-~`vRFz@I@rpm`^kfhmKWIFaI=!%7ksFAAU4Cb zX1Wy^Xb2`kX}0SPg&JFFmCeL=I+27d3m~Hp!K=w$UOEFBhXB4Tztgv4xo+Nd{ZsK)=m!?4t+wfMk=onQS_Myru zd{+Z!NaA(%k*Mf1Wsi1Snc91evz?LC! z&F(JYUvMY$kYawue9Ziv`3v(2^C#xl%1jUKIcr7l%vzD#vsU=ltQBHrt>Egc6>!X2 z{*@JcD*q(jvK^n|KS~-c8KqGI$G&8_OTWshEG}BsXd^*lvss)p&VVc!jVGxMt5Jz_ z5%UX{+cXj_hO?1Rm|L(o?Kmx9%>TbbJhyDmy_|bC2e24f{$~W< z-?UNQ@}sD|%d?uUARxDJG7x9v0-UCG)$e+}s;nz4^5~M<6`(qrneZx5YRV$^QvrTJ zFuHLnhm&~#;-`u;d|-U{)b}5ntpAS5`Wq(eKQLMUZIkuCW3v8RChG%}_3xXk|80}? z*G<;{mdX0}OxFLV$@+Iq)_>DveV57l-!NH!&1C&IOxAartbfO3{o5w%-!fUBFzf^&RHw{|jV7 BE=B+V From fd7cfb759b077611bff8bf4428b2948c21e6f680 Mon Sep 17 00:00:00 2001 From: Andrew Ackerman Date: Thu, 6 Feb 2020 13:50:57 -0800 Subject: [PATCH 3/3] hope this works --- data/auth.db3 | Bin 0 -> 28672 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/auth.db3 diff --git a/data/auth.db3 b/data/auth.db3 new file mode 100644 index 0000000000000000000000000000000000000000..411cb066311b560cdce49c30f96f8813a57116f5 GIT binary patch literal 28672 zcmeI4%Wopd9ml(kF~&CT@vsi-Oq{9Bj(3b^hxg0bOk~W%0~iCw53r&&MN_yN`T_mG z;9SO=L$vt^_7rIjd(I_Nw8xS56eUs)$tAbRB~o%qZi$jZsu^JMj#qM`bd=q#7Buy% z{?+%_^(kKctL`qB_IM3}rmToi13~HzMbp$a02D=K@Y9B$#vtt9l(o^LxDrP9p zdw+G{t#eBSipehjZTSa|zJtOBSqK3_fDj-A2mwNX5Fi8y0Yc!*PT;0TD}#yEKpNx)bz*A@>>&XuXHzlVJ*&<2 zWSzdc&r1y~Id;)iq)1RiXS&39bu_M@8};I7KT|qNfy{m~Rl&RT1+8j8mOk5R^mZ&; zb6>$(n`?cY{?Y0X)L3HtYQ2tYT>T#rGx|{jJ*co8R5twqpBsZiB4+bi?PUM1xlabh z01j34LRRpoO$$zY)cMhXxUbeMHka2+U%_D?8+DOCSD?nrl6oe{Z2Pr}+3UT2ZTqnM z#yI_(?-~A8JoMRn&0UqE!|f^ z+UDBWpg(ZG*4ych%v@8eO>g=yjBX$tHb%D&HI|z|!W9$pXBuz38yZkUM#*g)o8yCi ziuvuA{i}!UKOsN}5CVh%AwUQa0)zk|KnM^5ga9G%btCXNZ?^_~0iVww^!ua!a438> zP9dEQvlE_{N_Q;xzxT0m{6EXQpqM{1zh{1h3uGY#2mwNX5Fi8y0YZQfAOr{jLVyq; z1PFouI|BAui;EtfO|!XVv8>bM!+a+*W7)7zpIz_PjSZE71Zyf(S?cb-EUot;oSmw>;m&?Cc{&0EM z@f$~V>5og@#eXjTc=7JSPZu`rKgVulAp{5kLVyq;1PB2_;A>7mb=I&<3EJMN{$n}V*~B4}h3RL<$C%H>H$3kq9% z-ss**Iq8K+Z|v<1?94-(~Hx@ zzErI6v3f5XFM5R|y`JQoz3$UoChr-D#a2g5WkZKjP_7I96L#muo-W@aXmAu%Q~T$c zvKJm!kuO|5@%0W9gM1-cIMPGs{myyf{L;toX9o2x)>8^U%~!LE>f61kr;b|$4UB@e zLW$DWzLJb(w{|-vR`+)gx_*zZ(!RuZ5Uc0zUk5J?$>e zQ>*Uv(dYE$kLf6+w~*q+O0LECMb0D2@^Skz7SqLYvQ_nD)h$jQ92__MX+F;fxvgMi zuNRg?bOT&%0f*dhU0D-ZnUj(-ntU&0lZ9ex+`(op-Af+sYB_=33pdKS1Hp$1hhigK zZKRulzJ_2Tlx92LP^i9@R@vS7PCJs2WdZE!1Mq6HmzU0g#vy<&%WwDWm~Ie9jmGg! z6a;9jn%G^PL{A&mD0ZgRts}$MBHEm@QO*sg>#ZE*+mN65;j-Zt z9=g>Pxs4)L8@0Z%?sDg0qk-=^pk6|D;x3Nrj5eWRn^VYwR8x_q%&d)aJ$AZI;t*SK z00;PG(h!%8Ho;M6roWxR1+Q^{m5o-Q$1A$JVZl;wuek1|L|zymaiW4mLnM#^sL!j~ zlNlSeiUFkJk_78eY)dM=V~x6H57CK*)~!p3fM9P zZrI%g{0r`69#YKDn2(viGk;+|VgAJYn)w~`Df0*BBj!Wqhm6RaF(oF!gs~f02mwNX z5Fi8y0YZQfAOr{jLVyq;1PFnzG69F>K0V3jI;XAZ-DxYbGHr$LOj{vl+6pdDTLH(k z9bKaO?|~HTqRnWq#hWN*f6ho6X{+aRy}0Xgp4BSdB`Y zi+w(8ypUnf?3tP=b%{`ynw!XAJvx3JOOK-V4$o@3f`Ht_$v~Wu3vim&QNQc;sZX2PpLsUeHlPX+h^ z!SKeZ98Tr|h@UFX@PX0YQ{R7Rvi>_J>u;E>|G;GZw@udnj>-COnXC^?*1vDE{%9qn5^$KS^uud`YR^u-!WOAFzf^&RHw{|h5* BE=m9Z literal 0 HcmV?d00001