From 62deca4796ecf68612eb69c45be3bd7594acb9a5 Mon Sep 17 00:00:00 2001 From: Tammy Date: Mon, 28 Mar 2016 21:37:50 -0700 Subject: [PATCH 01/19] trying to write cucuember test... --- Gemfile.lock | 5 ++- db/db_development | Bin 0 -> 159744 bytes db/db_test | Bin 0 -> 143360 bytes features/create_category.feature | 19 +++++++++++ features/support/paths.rb | 2 ++ public/javascripts/ckeditor/config.bak | 2 +- public/javascripts/ckeditor/config.js | 2 +- .../controllers/categories_controller_spec.rb | 30 +++++++++++++++--- 8 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 db/db_development create mode 100644 db/db_test create mode 100644 features/create_category.feature mode change 100644 => 100755 public/javascripts/ckeditor/config.bak mode change 100644 => 100755 public/javascripts/ckeditor/config.js diff --git a/Gemfile.lock b/Gemfile.lock index 64eb36cc1c..637cf5f00d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: RedCloth (4.2.9) abstract (1.0.0) @@ -205,3 +205,6 @@ DEPENDENCIES thin uuidtools (~> 2.1.1) webrat + +BUNDLED WITH + 1.11.2 diff --git a/db/db_development b/db/db_development new file mode 100644 index 0000000000000000000000000000000000000000..bc7802c16085fbb5cadc3431bf9eead043ed76d7 GIT binary patch literal 159744 zcmeI53ve6Bd7v>s4?uvNX;KmeaVai`;BqNgOA!x(53RH^SIgCES8tJCDJvTu0z+a} z00x>FNTOY~57fqI=aTc~Rjwp;Dd(Yu1OhL@?=<|z;Fkmf!h0PJ()kg*gV)e624?UuD4_qOZz{z&HEj4{Nr%Ue;98 z)(d6L@^tw0m6hey6=ik#$#W}8!gEe2M-qB5p`5+2x^iaaigM}7+4IX+t}D;2TvwLY zRxh5t0N0&gxv;8SxCp;%=gvK*By8O-YYFAHY8FbWc_fp|CBap#+a<&7a9%fxTM5P1 z?%EKBo#ab)rQCD@cdc5~zyvplcDJCJHM@C!Q`@>@m_@52Vzpd0?&J$brJ_}B@Ybug zwyBxS67EyetD8ROT7A8&TP2p38&-L0<>}?MbE`_4&!&K)Kpt5=2ft( z2uHSF(cqGLjh%EjdwKHbw5CB_EbG;q9XY96nwe*%;F^_eOot-zcwE??;bqDEEiQ<^ z6uDbZMOZdA^=gM9HPx~h><$mDqUxs&eMjiJ38Z(p>9r202dI+C#?&D18@9(d zAxpDu);K&p}Ju|s=EYs8noL#``dEk;Q^=T8|4^z7%n6~ zzUIXbJa~0)yxkgIx8hH3^+)0>V?txBjfXb|`H^_81Kp^2p8iW5FrFW)8Ew`kx3e+c zI$m1hY`kEe?)MY&oO`NYZOOLPvhMxZF5|vCWbEk3x^eE(xxLO!L${LIWjIbY4n-sJ zt7)OJ)K+5aWf+~{X28zZR2v5TDj%ub<4(_5w<7Ee#tPGo!zszmAgnaJAjw9$FA`6u zg>8u!XlLk7m#DvxI|KAo-1b(jvzPG9^o>Qy#&CoWwvD<|3E}={(=c_-Dm0J!{5G~c zda|u+x7Imy+zvrNhTm0`M=x3pVztqP;I|5Wtlc!%c^RzV+wE0b&<$nM%3cX*s_ zckR|N45Co3zCpBAx~#UbSlY_+V7J=Y=I>qN4yCQQSTXP>lWatSk@(43p)t#wM7^p* z=JFO)r;3`d=$od>ZoaGzhmf1}+J&>1*H&O=$ZyeiyWBCLBNArDZJ4#N+q>i~ArhYj zLxvpIuWLcj$2;+wk^6clK1qdQIFyn=mZTpE&{yfV=s(kcpnpUEl75x`Dg7h*Mf!RA zIrF)nzChRLMS7N=rYGqFP1B=vijLC} zx}QokLIwF%`4#ya^54lX%U_lMME*nh3-a&C|4sg{@-NAsl7B}2DfuVlAC*5Qe^kCF ze?Yz?-;!_2nw*!f%U9*|@)>zqeq7GUvvN|Nl*i<_JS6waqV%uQx21oP{!#iH>1)zg zq(7FvB>lehTheExUz2`8`lR%qq@REc;SUl(0!RP}AOR$R1dsp{Kmtf$4-gPb!Tssf zoVdwUR@`7JBWg^g#UfKFQV0$$Es=GQi$n#vK;8>-p5#I1$a_G}k#~d4k{cj1EV%+QLoS0%lS?2|tN&iaZ`1$}N%OAQ#CJ$OW`AYBUe1?gfa5~K^EaFEW2#30RuNRZBjLP44h1%osb5`r|%9`2W<88-j_ zZRxzUBAt|S(hU79{Z*Lt|1A9}`s4J6>G#8&{}uW{dWY7iPS;`1ze>;3r|BvB4Y~+( z{&&zxdYBGV8D{(e`P=mGip`t%FZk4QfteOUUCbXU41y(kr=8`9byXy#}l5xja{M@8K%@ zZmu#nxJtjkRqA_~T3ou$)#5d-7M|y7{#{(<*0`Ems%I3Jr%yE^@a+S(3HMf-JYB9yt z!Yo(w$GFPPa5eWBSJ|UnW!}M6I>}Y)2vgamX|5I@S3lbOJiIu9_DIcl&krNxXO)iHFt=sY@DmiL9WunT%`^$m0sG<)#5&`7KXT* zALJ@Wxtf!?%1T^i2DnQ1bCrsTAu23InOy8+av{Rxe3;3c$mAShG8UwieV~6t*pWK%ysyPwq4Sy z3VhMdv=uffg6}wQPGnN)`I%I9CbOud7mv?nj%QNGa=E$mQo6%uE^{oiFt<3LE-}+) z;B(LA;=;P7s#>-%Ge5sRH#1kr%+D;%Z4_n->r3#>zr{joBUKb_+wO=AlG(l$JQNs? z2ku?v5a5&OfjEW3@xakb@L4)_-Kg7M4%Mon-Bl~KvZfdtipuk^u&>%3Q?46zrNI1I zhHXX!_}nqsN8I(Q^BH&emYl+)*cngKsA}w(T~yX@!g008f`Newd{dm+%u{oxs$dwKembSt z4b9?QZhm30!-ti?Vm3FQ5_xXAQgtqEezAOJW+vu+ocp*E+a4DVb+35;|I|CDdhbT4 zZU6rPXy!xk8+L!=pz#L@AOR$R1dsp{Kmter2_OL^fCP{L64;9b z0Q|=vB!C2v01`j~NB{{S0VIF~kN^@u0!U!*6WA|^fzjyb8Lg_BYI)O9?EC*g`U?C0 z|0{bxifCP{L5F4OD=`Yhy(VwB8pg&H3nEn9$F#R`li<-1dHToWU zjb5hD(x>Q2I!{wHNfY!iJxB*>lm;O}{6PXp00|%gB!C2v01`j~NB{{S0VMDiAwZ6V zqQZW08s3Hv?Gqmb72HRrz-=FS1mqBz1UV=sm_HRKm_H>7xKVMOxyjqibnDI|68Ooq8Ug42_OL^fCP{L5+4&yCDke&UoP1CZS88kRx?cd`0;1J?RniUovjx2jSbDzs`hfBpjlR|qTbaj^-8{` zZfe$XWjdXjj$MM|t9nseSIui;Bp@_~g-OzD0=90Kwd2Zp%~oTCNjK*2r39k>=!b;q zP_I$18^x{T%7l_QQ7=DnqpBz;%K8&0RHbBU8z*lhO151)K0ABo&YffSR?V<#CCK*Y-}nkcWb|O?>9eb>RPp+DRo;f>y~P3brTGH+GJiu$G`CUiLgvp zR9k=1Vrk9#5`=NFBtWzeO$54x)yVfd8-O8n}rfIO3O`dGZ+a( z8?(`)y{4vBYBtpW4Yh1FQ{t(fhFY^}m|Jc_?-3$SC(&y{uhU21^Zz%#W5*bg01`j~ zNB{{S0VIF~kN^@u0!RP}ywwQAm_dVYHLK7bB!C2v01`j~NB{{S0VIF~kN^@u0!ZME zB*32k3-qf2_>VtG00|%gB!C2v01`j~NB{{S0VIF~kicFfFd>k@842DTh!xbT0dIY% z<-Dbtw>2|gH_PzC&~!{9mjgq=gMr||;73FILz?)B@N)PUqNk$28+$zVnf|-|e@#9s zeM!Df)84luK96o?pIlU3qThy0W~sdhzT9xbpnUg;nLkMfhDickVGIQB^Bi zLbcL1n9vALC&MoFI zQgIRY+sWPDI1}qo3VD{>mWAwnD0oRnyK95F>?B{ZE9IsO^T==LWm_}-S%A<5Qv=e) zylN+uA{^OzMFZ!0jh*&w6`PeNX5}%!g zP@IYdJ{2`z(Kk(a#ezRTqa<>Cb;(Gf|zeaTBC96x$gxbEcrR#~^f4h^h< zH@htVsp!l14$mX3c0LAICL6lbF7A!(k#+&K=ccxG$1salvj!HS8Jl{|X<2SPt*Pv7 z#P*t;?0YFtj;GVYw#4(gURDb?;axZzYMBj{w`z5|M12$!odI@hc#Zc?MB?M)!ad5< zGPR;^Y6aVB9`yTTZo2Ol;cIp_8>YctwX{ne4bV2ayBnsysY5^1UgICIy*3^m;2qTV zD9>UI-kr0!ko;NWZarm7HQ_C~vesURtn)CT@3{}VlNAX%l=zMgg;~kEl2+W@KH0U| zZKQ7R(;3)lrOhn0Vo4s zjyVoO->C@YD*}Sw;QO(w%>GKxURducDGj63p$KdZdQ^5zZv*U zd~8hEKF!P2f>)dQDC6oue~EhDy%i{n6UN;gra5TcPVGU4(*`*ZiBH0KdeLc~@ba}g zlCnDn_i)&sfi|C>^3YiU?`u?t!Kf|egI$|q%VvHf!0)cufZ28-GnreE{9rs1KQkdT zCfaT#TK97-g63UU%Xy?*x-DfUQWH0}L) zvT=Ph5}%q9w(Ab6*3G2Vc4KLc`4emRdgBoK?jv@zL+EdA)@vQj)4A_$-HO0%hgxw@ zlkogfVmATXBF|fMjBg%%H*W&Kx`1(VOlU}Ljl}E0SY_wOMbBlRTkG&VTfyDCShs&< zMdL&RZ6fk0zg=ilI1KjUKHPAD*fF2sZatN$rP($cv77gW>#C)(>7>8Zl8v>a5#FhP zz^QU@D+E(9%Xam{JF1%N+>=Q)4Ze&~g&J>bmG){6Ezsu$Uw-Huq>C`i*fDW(ZDfOP z$=ESiBpc^ayyd#RPSvpW4VYN-d6DlV;?JSaucvGl44BUP@3tX_U8a%`&`BlP{(phK z5`h2sg9MNO5~eBsT{{7cu~#g~gd8sf`E?plZC>9Bt>#dGdy z9i{6sQ1^!;gM~L<;i_Uqdc|p^zz!dRb_f(8Um>0GJGu4 zeL&ZGBIP(2j7kO8sbGb$<SNN7(3L=Q~TYWh?B9C{8CE z;8-s`PCnhtlGAM`Mb_!V|>+l94PSe^`4ZmhwkmiL;lik_v)$8-L9(xr?YFP-8pGr zjj%mfjd7>xIOSmF;VDtcwrc*<9s2`z_%cgfr}h*87>}&o4MvLRI!B5PO)IX$CZ^6V z-}9MpIr;i&&$II~r?d9_nSDDdLvricNPGoGim|ql!VAyhYd!S!T$R@|p>;`T@@;;} zmz1;oKI|j=Ie9OBPmlYngy-B-b?6+qp-{e)`>;3ow(C2;xoQL3wx!4Irgl8~?s$R< zF!Z)Z;d3drx0OA&?XsN!d|Cs(ciYwKB=|jBGr-QSs7wC>@iEuB#X6J?-K@0T3ML!x ze8zdQdzDua*iXa$*Z|vC!}S4w74e*Vsv=JBmWOe%V@EGHY_oYE3+8UZUe|6RJL_4p zG4y04J~ARSoQKm+x8letzxj@1PsVp0j&~n)8&k^;R%er_*Nu7l5x-rYb5E9))pc#h z^Li+8*dM;j<~E~PFKg}-|KxUTiQm@TgUu?i$s0;WgPqmyW4n93qe;K5Esvh8?YiZ% zy=l1nzTpo?z~6}I+zD4!tDAMG9UXTS{LwjhRAH{Rqc!gG2;FmLo6Fhonru9g<^$Ds zmc#J&D!tFy53u8OpC8K(-=5fX?_u1Sx7r6cC}7>n*G%2n)92nKCGq?JZ~oc_rho*H z01`j~NB{{S0VIF~kN^@u0!ZMyO#tWr-|Z5>^pOA(Kmter2_OL^fCP{L5ZUF|4)C8-l8LLh(AaG2_OL^fCP{L5iY2_OL^fCP{L55VM2?kN^@u0!RP}AOR$R z1dsp{Kmu z#}%!ptL&hrZaOX-npRv_3pcr=X>7n>42(4n2;o3H-FUxRtmxI%t(u|mBi*u1)i%u6 zOQjikGr9Iu?2=Y-(zf)Xwyv5i>AIzv+(JvUZN0k5k87?y;BRS0Y#}7VUlm*_7**TU z*Xv-&>DFO4o4o7U{C~e>2IybV-=LqMAEejlJROw(N&X-5&&l5}ugj<8A?fd>FG{~G zeGG!(4-!BENB{{S0VIF~kN^@u0!RP}+&6*I{Uk6s#U^$6qE^;y?I|u5KFyolM*_)N z?rCY|jXcar?G^Y{*qNdh3P!zZ$A?H@e1ZpR`tz$t2b)nBOii`5(_A`HPf-#$n)YU! z{2}GM7n#xz z7EU)KbF#2pEGnvJoDzc!&ayf54*Qh?1$r^0|W`U*FO>g z8)m(;-BMA)knN+*P+d}bMD)e8OKJ*%;!d(zJCNUzn6or-I79+dQ(lNxLXNKzY`@;0 zh!f&rfdt|Ue2L;r*;rT0?aLLqQT6u!)BjEXg?^p>75y{%$MlQzcVRW)*XYmFpM^Dn zAEQ4=zmIOy_fw0OX_4NbYxF!_p-;d{!7(~b$7!4n(mooHzb$`L{<{3K{1y4j_uU*Y zAQC_VNB{{S0VIF~kN^@u0!RP}Ab}nUh(|~uD(nwWlYk(E_Jtp1I=D}qV$S=-N0=HC zCz%=yCwL$lp5TF~s4!<59_P+-_+joWi(|}L4j<;uQh1a*OX5S!SqhJE=YjAc?mQsI zne#ySAb0K$4|C^!@c?t~55ocw*b@_BttTqP!myeHr%@3WZ=ymp49hfd+9$#~OjPI# z!vYJOMnqUei3*W0ERn!zScHX;s1OdrY6qN(BCKmf1u+bZ7jQ~MSe}RqBn)d1a2gU} zl_4sG!myM8r$Ko0A5Mb=RtBO`@B4o}qQ=XR01`j~NB{{S0VIF~kN^@u0!RP}Ab~wV G;Qs;DbrMYg literal 0 HcmV?d00001 diff --git a/db/db_test b/db/db_test new file mode 100644 index 0000000000000000000000000000000000000000..d06a171416c0e99b07f62a036abd8ece5567aa82 GIT binary patch literal 143360 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 "General", + :permalink => "general", + :position => 1 + } + end + it "should create new category" do + post :create, params + expect(subject).to change(Category, :count).by(1) + end +end + +describe CategoriesController, "/edit" do + category = Factory(:category) + it "assigns the requested category as @category" do + get :edit, :id => category.id + expect(assigns(:category)).to eq(category) + end +end + describe CategoriesController, "/index" do before do Factory(:blog) @@ -73,14 +95,14 @@ def do_get do_get response.should render_template('articles/index') end - + it 'should render personal when template exists' do pending "Stubbing #template_exists is not enough to fool Rails" controller.stub!(:template_exists?) \ .and_return(true) do_get response.should render_template('personal') - end + end it 'should show only published articles' do do_get @@ -94,7 +116,7 @@ def do_get describe "when rendered" do render_views - + it 'should have a canonical URL' do do_get response.should have_selector('head>link[href="http://myblog.net/category/personal/"]') @@ -154,7 +176,7 @@ def do_get assert_tag :tag => "input", :attributes => { :id => "article_password" } - end + end end describe CategoriesController, "SEO Options" do From e3f9458c0aa4bd534286c9fe4eb2b4934757c258 Mon Sep 17 00:00:00 2001 From: Tammy Date: Mon, 28 Mar 2016 21:45:26 -0700 Subject: [PATCH 02/19] added new rspec test --- spec/controllers/admin/categories_controller_spec.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/spec/controllers/admin/categories_controller_spec.rb b/spec/controllers/admin/categories_controller_spec.rb index bb290f4a0d..21febf80fe 100644 --- a/spec/controllers/admin/categories_controller_spec.rb +++ b/spec/controllers/admin/categories_controller_spec.rb @@ -39,6 +39,13 @@ assert_response :redirect, :action => 'index' end + describe "new category" do + it "should render :new" do + get :new + response.should render_template(:new) + end + end + describe "test_destroy with GET" do before(:each) do test_id = Factory(:category).id @@ -48,7 +55,7 @@ it 'should render destroy template' do assert_response :success - assert_template 'destroy' + assert_template 'destroy' end end @@ -62,5 +69,5 @@ assert_raise(ActiveRecord::RecordNotFound) { Category.find(test_id) } end - + end From fc57f63244e460bb50db26a269d24ff2a42ca8f5 Mon Sep 17 00:00:00 2001 From: Tammy Date: Tue, 29 Mar 2016 09:33:18 -0700 Subject: [PATCH 03/19] chaned the cucuember file name and some context --- .../{create_category.feature => add_category.feature} | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) rename features/{create_category.feature => add_category.feature} (65%) diff --git a/features/create_category.feature b/features/add_category.feature similarity index 65% rename from features/create_category.feature rename to features/add_category.feature index 50ca865231..67cc70fc8b 100644 --- a/features/create_category.feature +++ b/features/add_category.feature @@ -10,10 +10,8 @@ Feature: Create Category Scenario: Successfully add category Given I am on the admin content page When I follow "Categories" - Then I should see "Categories" And I should be on the new category page - When I fill in "category_name" with "Baby Stuff" + When I fill in "Name" with "Baby Stuff" And I press "Save" - Then I should be on the admin content page - When I follow "Categories" - Then I should see "Baby Stuff" + Then I should be on the new category page + And I should see "Baby Stuff" From a6b3df098f82f4b5262e1462dfc3d50904ca6028 Mon Sep 17 00:00:00 2001 From: Tammy Date: Tue, 29 Mar 2016 10:03:15 -0700 Subject: [PATCH 04/19] so I ran cucuember and it showes me Couldn't find Category without an ID --- db/db_test | Bin 143360 -> 143360 bytes ...gory.feature => add_edit_category.feature} | 10 +++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) rename features/{add_category.feature => add_edit_category.feature} (65%) diff --git a/db/db_test b/db/db_test index d06a171416c0e99b07f62a036abd8ece5567aa82..f941107295c789beb0965729cfa66ec92cbfb72c 100644 GIT binary patch delta 3546 zcma)9TWlj&89rl=lh}!Uylm4nc-uW8O~Y>L*dE7;9kgn*&aUGn7jHHjCsCzv<`R37 zxwtdqI8GO4x2R84q6mq;p=wp0Dk`xcctBj9TUFu-gb-+-pn%GXO637w_|N!~OA|q4 zd(O=N{r~r$|8^$#ANSpV-1k`1|-xu)2xefnNW!oMak~VmP)BA=DqV6j`;DXwW~#wU&~jnuhHQ_xUe(pV+== z4*(qHz}enWHAk`Rz(4?O*{ZCF6z)R2f0(n>O4YG14){S*vrIrLwm8S= zOI7SX&Oa0sHM3%e!2u3`jPS?c-JkH6p62>cEEt2Q1;tP-s#RK-kcayW;m-i~cibQH z$AWFqBNB-AhF?LE--TZRVJYmse&8EMgG1<>cMzJJ3jzZg!mzxI5`!gLQK)FvowcfJ z6ZlYrw8KZt9YV=kvu2VSpeD(tStk&B0^xCp!|;wt8kXuPL^XCyOQ$SO#4|^lX5F$C zZHJhy<=qgQ0d1353Y8&RWX~`gq)|1Qlu+v!fdml1Qk&@1XnO467|=0J)9@rrNmKV= zZO9A;9ulf)%xOkV+9?IkT$T}UACp2dH62f;<3f(4W@eMg*{PYyY-T!{7S5Lhy!|); z5aLPD&JiIsn}JVeGU@%*>Y}FFRYhi{S);byFfG|DN4C?~UvRl$6dQ{@$av8oy~`nl zG4`TAXE~~*DGQ3GnWSu5nmn>(d9Icf4XRgR5oQ^fB%S+ku#Q+LPo4ONeO^ zSLsdP3g2vRoSIHyDP|Hq0|wGTs8|HrHAzv7{QA9Ie6_v4`RIbnam z&v5||a>2mE+RG0~^x^$z>-Q1iqalCfLxfe#M?Qo$_(jB>@dwc8=nYmFmMYdA)5;$$ zS?=OwR;G4UG^r)Cn|8m3Bwr7@eC5G#C(+h*2q@{^ou%4Njm^yH&@VI;cflYOsrP6{ zQDl)yd&gNGJjL~(q11!dsI04o*LL1YwH=Fsv;T{xYrM@zW{@_hjG64Yn(+GStisDq&!jWy^Cf#65KthPD`e-ZwNnHuZ0aXK zTSz3Q6UkiSSOuSDb0(Ebrp{z*Nq$=6_~g}#VGH5M_?P${{0+Q;r*Sm$kH~K#??>K@ zh>@2f7s7uFe-!>n_}gI%f-oO;V;6ZeI>zF=-RjEuR&RO{AN>N4t|UAm8=pn5&* z4NNLYX5DaxF7W8`hzIJ*J?&VuYq~Wk^R02|3CA#xCQ>_YyTDG8vtbI+(c!3jF~Xxv zrc)tsj)EH}9Q9mjgYA(pkH+I&bl0C_2ERPOqg1K`aa$Io4IUo9I5mkd)O>!?DBBZpiZkH-%r8s|J)3vGW=AG-Nq_69xJGV@E zVYRWMX7}Z^oL)3mGg2XUC>5%jq~EQJ>01V<7uD-Ymu{@uTWd*meL-u8&EkZ2O)ocS zVZFJv*4W?KBVQe~yZo5ag<)uWF*2*_U)lEomOLvAJ<;Z>!8q-Iyrlb2g}h z$6qbF`MIoE*qbO7ZdB;PEp2NzsnUhjq%?2tFQ#uFE;lpvt&Q7iabdM47Y;PoT3#&V zJoj&`Pf1HFHA&YrQD4@I3+qW*KB!5;&E(d`db7BjDMSFmO*sL8c>KRSWXS;5IK6tXcxv^TK z#*$jvOI789_NsJvB4Fq44Ad8ebz2fNS6|e(nk*BYM3l=n>!PmhQb-g+o48 z{dU!CYQ9`q@hXye={`kD@$@1R|dx{73vgeiaW#K7k(nL&SGA@b+(?a97=RXvoY<&!%HK zwf1DQ0q=OQa+**Bj=j`*)=-@)x#I~+Owa){=h&%!q!NNh Date: Tue, 29 Mar 2016 10:08:19 -0700 Subject: [PATCH 05/19] i have 2 failing tests wohhoo... now time to fix the bug --- db/db_test | Bin 143360 -> 143360 bytes .../admin/categories_controller_spec.rb | 2 +- .../controllers/categories_controller_spec.rb | 42 +++++++++--------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/db/db_test b/db/db_test index f941107295c789beb0965729cfa66ec92cbfb72c..d06a171416c0e99b07f62a036abd8ece5567aa82 100644 GIT binary patch delta 193 zcmZp8z|ru4V}dke*F+g-#;%PCOXRn+I508^u-#|if5(4+v!K9ber;YRW<}2A#FEtX z{G!a%VgW{GRmPIkijw%W%$$L*dE7;9kgn*&aUGn7jHHjCsCzv<`R37 zxwtdqI8GO4x2R84q6mq;p=wp0Dk`xcctBj9TUFu-gb-+-pn%GXO637w_|N!~OA|q4 zd(O=N{r~r$|8^$#ANSpV-1k`1|-xu)2xefnNW!oMak~VmP)BA=DqV6j`;DXwW~#wU&~jnuhHQ_xUe(pV+== z4*(qHz}enWHAk`Rz(4?O*{ZCF6z)R2f0(n>O4YG14){S*vrIrLwm8S= zOI7SX&Oa0sHM3%e!2u3`jPS?c-JkH6p62>cEEt2Q1;tP-s#RK-kcayW;m-i~cibQH z$AWFqBNB-AhF?LE--TZRVJYmse&8EMgG1<>cMzJJ3jzZg!mzxI5`!gLQK)FvowcfJ z6ZlYrw8KZt9YV=kvu2VSpeD(tStk&B0^xCp!|;wt8kXuPL^XCyOQ$SO#4|^lX5F$C zZHJhy<=qgQ0d1353Y8&RWX~`gq)|1Qlu+v!fdml1Qk&@1XnO467|=0J)9@rrNmKV= zZO9A;9ulf)%xOkV+9?IkT$T}UACp2dH62f;<3f(4W@eMg*{PYyY-T!{7S5Lhy!|); z5aLPD&JiIsn}JVeGU@%*>Y}FFRYhi{S);byFfG|DN4C?~UvRl$6dQ{@$av8oy~`nl zG4`TAXE~~*DGQ3GnWSu5nmn>(d9Icf4XRgR5oQ^fB%S+ku#Q+LPo4ONeO^ zSLsdP3g2vRoSIHyDP|Hq0|wGTs8|HrHAzv7{QA9Ie6_v4`RIbnam z&v5||a>2mE+RG0~^x^$z>-Q1iqalCfLxfe#M?Qo$_(jB>@dwc8=nYmFmMYdA)5;$$ zS?=OwR;G4UG^r)Cn|8m3Bwr7@eC5G#C(+h*2q@{^ou%4Njm^yH&@VI;cflYOsrP6{ zQDl)yd&gNGJjL~(q11!dsI04o*LL1YwH=Fsv;T{xYrM@zW{@_hjG64Yn(+GStisDq&!jWy^Cf#65KthPD`e-ZwNnHuZ0aXK zTSz3Q6UkiSSOuSDb0(Ebrp{z*Nq$=6_~g}#VGH5M_?P${{0+Q;r*Sm$kH~K#??>K@ zh>@2f7s7uFe-!>n_}gI%f-oO;V;6ZeI>zF=-RjEuR&RO{AN>N4t|UAm8=pn5&* z4NNLYX5DaxF7W8`hzIJ*J?&VuYq~Wk^R02|3CA#xCQ>_YyTDG8vtbI+(c!3jF~Xxv zrc)tsj)EH}9Q9mjgYA(pkH+I&bl0C_2ERPOqg1K`aa$Io4IUo9I5mkd)O>!?DBBZpiZkH-%r8s|J)3vGW=AG-Nq_69xJGV@E zVYRWMX7}Z^oL)3mGg2XUC>5%jq~EQJ>01V<7uD-Ymu{@uTWd*meL-u8&EkZ2O)ocS zVZFJv*4W?KBVQe~yZo5ag<)uWF*2*_U)lEomOLvAJ<;Z>!8q-Iyrlb2g}h z$6qbF`MIoE*qbO7ZdB;PEp2NzsnUhjq%?2tFQ#uFE;lpvt&Q7iabdM47Y;PoT3#&V zJoj&`Pf1HFHA&YrQD4@I3+qW*KB!5;&E(d`db7BjDMSFmO*sL8c>KRSWXS;5IK6tXcxv^TK z#*$jvOI789_NsJvB4Fq44Ad8ebz2fNS6|e(nk*BYM3l=n>!PmhQb-g+o48 z{dU!CYQ9`q@hXye={`kD@$@1R|dx{73vgeiaW#K7k(nL&SGA@b+(?a97=RXvoY<&!%HK zwf1DQ0q=OQa+**Bj=j`*)=-@)x#I~+Owa){=h&%!q!NNh "General", - :permalink => "general", - :position => 1 - } - end - it "should create new category" do - post :create, params - expect(subject).to change(Category, :count).by(1) - end -end - -describe CategoriesController, "/edit" do - category = Factory(:category) - it "assigns the requested category as @category" do - get :edit, :id => category.id - expect(assigns(:category)).to eq(category) - end -end +# describe CategoriesController, "/create" do +# let(:params) do +# { +# :name => "General", +# :permalink => "general", +# :position => 1 +# } +# end +# it "should create new category" do +# post :create, params +# expect(subject).to change(Category, :count).by(1) +# end +# end + +# describe CategoriesController, "/edit" do +# category = Factory(:category) +# it "assigns the requested category as @category" do +# get :edit, :id => category.id +# expect(assigns(:category)).to eq(category) +# end +# end describe CategoriesController, "/index" do before do From fddd88fe7612cead3b2b4822c0f19bcea848b386 Mon Sep 17 00:00:00 2001 From: Tammy Date: Tue, 29 Mar 2016 10:21:32 -0700 Subject: [PATCH 06/19] the spec is passing --- .../admin/categories_controller.rb | 10 ++++++---- db/db_test | Bin 143360 -> 143360 bytes 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb index b7026f8f29..11942ad989 100644 --- a/app/controllers/admin/categories_controller.rb +++ b/app/controllers/admin/categories_controller.rb @@ -4,10 +4,10 @@ class Admin::CategoriesController < Admin::BaseController def index; redirect_to :action => 'new' ; end def edit; new_or_edit; end - def new + def new respond_to do |format| format.html { new_or_edit } - format.js { + format.js { @category = Category.new } end @@ -25,12 +25,14 @@ def destroy def new_or_edit @categories = Category.find(:all) - @category = Category.find(params[:id]) + @category = Category.new if params[:id].nil? + @category = Category.find(params[:id]) if !params[:id].nil? + @category.attributes = params[:category] if request.post? respond_to do |format| format.html { save_category } - format.js do + format.js do @category.save @article = Article.new @article.categories << @category diff --git a/db/db_test b/db/db_test index d06a171416c0e99b07f62a036abd8ece5567aa82..463daf9a2acc30bf9279a64b5dbf7ea078ac0b5f 100644 GIT binary patch delta 53 zcmV-50LuS>;0S==2#^~AiIE&b0g16-q%Q^m5AFaD?z0gP z@#J^*Vr-239~k&Q0Og Date: Tue, 29 Mar 2016 10:30:06 -0700 Subject: [PATCH 07/19] my rspec and cucumber test are passing --- db/db_test | Bin 143360 -> 143360 bytes features/support/paths.rb | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/db/db_test b/db/db_test index 463daf9a2acc30bf9279a64b5dbf7ea078ac0b5f..9afcacbc5b6e92cb704bdbffdebea13f156dbd18 100644 GIT binary patch delta 3542 zcma)9TWlj&89rl=lh}!UvTV~dc-uW8O~Y>L_!cL2(5jpD?mAwQtT($GCsCzv<`R37 zxwtdqI8GO)Thu2iQG`U_5L&@gMI{O<4~WZit4e(WAq3hdD4?>UQh9(E{&RfET@ZOR zXXgL@|NGB>JCoNQ_r3PG@2#lt&UY^4g?E1PwI5#W5%32HfAG_DgTKM0X+cDVbSxGN z$<(w=O{V&$quRTwy;-;QIWjR3s=97%E*@9+s8Q3^DcLgOVf+vUv4ilx@L%xn@kjXA z_{Z46-^Xu))phI*^!lF_WXp6_({+3Zq5hz)Dw?eh2L0ngYbm>$WjelapZ{X_jpG~a z0f4LSxtm*>?y9yE7zltZM^jXZ!c$1}j|jF_sk+Yj0Y6A;wgpJl@rQl>(V$FSwPHPE zYpT;H_=kg%ZdIHxI3VCp5dH+b`xE}s(?TDL2BYw{pqi>p^-Aj&;<(Qd{v2?B$NeFH zG}sos|FIAl>l<+5ygi}w4zeUs=N29 znnU16P124Zv9<^$_nI|})BrU_)~z~$*b|74OI(I`Ez+=jqCheSpXC6xl-^Wxck(`Mo(y>&IBxmPRxw*v5R3ep~olTxC3Gn^6 z07%6Wpq(SBMsYO_Wir(xL&uSd4i*I)325fmMdKFsjwkKGp# z!Wi@D&)cph>*|84>lP_nwyumW+1%B#szdpzEW#`UQ>2q0zPT;Uc3g-V*PbFbSVAnD zD5|cqWVkOvs8o|UE;Le={wp31__5&nL_ZF?Cxrb0 zzaRuaCQEIH(L#Pz15aHy$T;1~QN8XxZ<4wza}0!??Ie{@eR#Ba+_^pBO4LpES-5&6s3G^T#CLocG7*}(3b&f2lE)9uq zG{jycd`lCMpUEUkY0i;RNi(V4BoAUCLP`s(PN`y5ir4oXdT%>d??k!7M zSZUnWvb#!JNiUi!8M%<#mkU*0HtyG@^eq$Ai`un>N7q)Ije7}gbwO`P&Eh1#r`tmu-K*_91hE9sotTwlAjvr%TIZcLW)IS16i z`aylH!5`DmcFr_(CETSLcVV8E~fA7FE=ywjkP;kabcyV6!vu3T3#yT zxcfI&r{$&FHQCU0$ynBl3#$oQ-mA%}n~9CJ)n;)!Q;?n8wT%{L8)&Pg?Zz&n1Nyu+ zUnvzl*xB}8wOFV&H_Gd|qESsK3-dFJ%^bu{u1n>cV6(QrXk>IHpY6H<`ryg(`r1m3 znoC+~Cs|br`YZDOk$|1KGf-bltvYf__l!kjqscPSNkqAPvo0C>Hicw#*T?LF{+U5b z-EyQ9c%I7H>^g3KwNTw<>gAjJ5TN@WE#%zwwWV%iSXN4fGozxlgTH7lTeO^Ed95C& zxRchKwA_HGEN37&&f&o4pAF&k@(ItD*LKBAJ*7`NrTQAy^0^hE$E33yrcxb*GEs8qdKI-*=^tgABT- z8Fgc`*3Z5Q;7gI2d2di8kwD~Ag#U=&#joIz$fwYwe~9=l2j2ee6XCMA3JsZg>DhGD zp!SYpHQ@6OR&En&z;%{7?;4t0C3m@?!~`8MbB-PB2Pz?WMPB`S=qvtS_&6F$M-Ryk p8GwJaRHpp&>Dq7q=!p=2Y7~y;p`oE@l%bd5g8R?^`9#21{|mcPI0pa# delta 123 zcmZp8z|ru4V}dke=R_H2#?FliOXN4R2rvn-ykp>hw^>l&3BQm4BeN=FNoqw&d|GBs zNor9s)1n0mi!K-}+90s#g21K?EDf7k4*b#Ibb&=+IZFYf0i4Id#J`k*{|f(7pgA-7 Wr>}d@sL!OuIQ{)QMy+KZ7##r9S}m{u diff --git a/features/support/paths.rb b/features/support/paths.rb index 90c1d3965d..955897d5f7 100644 --- a/features/support/paths.rb +++ b/features/support/paths.rb @@ -18,7 +18,7 @@ def path_to(page_name) when /^the new article page$/ '/admin/content/new' when /^the new category page$/ - '/categories/new' + '/admin/categories/new' # Add more mappings here. # Here is an example that pulls values out of the Regexp: From e0473a0ecd9290e098a62c726e5fae22c6f43ced Mon Sep 17 00:00:00 2001 From: Tammy Date: Tue, 29 Mar 2016 12:13:57 -0700 Subject: [PATCH 08/19] starting to write cucuember test for a feature that will revers all the words in a post --- features/reverse_article.feature | 19 +++++++++++++++++++ features/support/paths.rb | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 features/reverse_article.feature diff --git a/features/reverse_article.feature b/features/reverse_article.feature new file mode 100644 index 0000000000..09eda08346 --- /dev/null +++ b/features/reverse_article.feature @@ -0,0 +1,19 @@ +Feature: Reverse Article + As an author + In order to see the world in a diffrente way + I want to reverse a blog + +Background: + Given the blog is set up + And I am logged into the admin panel + + Scenario: reverse a blog + Given I am on the manage articles page + Then I should see "Welcome" + And I should see "My Shiny Weblog!" + + Scenario: Create blog page not shown when blog created + Given the blog is set up + When I am on the home page + Then I should not see "My Shiny Weblog!" + And I should see "Teh Blag" diff --git a/features/support/paths.rb b/features/support/paths.rb index 955897d5f7..cc088181c7 100644 --- a/features/support/paths.rb +++ b/features/support/paths.rb @@ -19,6 +19,8 @@ def path_to(page_name) '/admin/content/new' when /^the new category page$/ '/admin/categories/new' + when /^the manage articles page$/ + '/admin/content' # Add more mappings here. # Here is an example that pulls values out of the Regexp: From 8a38f77343cd32f214378a53eed4d7a5c59128e1 Mon Sep 17 00:00:00 2001 From: Tammy Date: Tue, 29 Mar 2016 12:20:32 -0700 Subject: [PATCH 09/19] removed comment-out tests after reading Kari notes --- features/reverse_article.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/reverse_article.feature b/features/reverse_article.feature index 09eda08346..98f4584d33 100644 --- a/features/reverse_article.feature +++ b/features/reverse_article.feature @@ -9,7 +9,7 @@ Background: Scenario: reverse a blog Given I am on the manage articles page - Then I should see "Welcome" + Then I should see "Manage articles" And I should see "My Shiny Weblog!" Scenario: Create blog page not shown when blog created From a56c8a3bfe095eebfba710440adb6590ea1f3f1d Mon Sep 17 00:00:00 2001 From: Tammy Date: Tue, 29 Mar 2016 12:21:57 -0700 Subject: [PATCH 10/19] changed the feature name --- features/add_edit_category.feature | 2 +- .../controllers/categories_controller_spec.rb | 21 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/features/add_edit_category.feature b/features/add_edit_category.feature index 849c65cee5..1a6cf41eeb 100644 --- a/features/add_edit_category.feature +++ b/features/add_edit_category.feature @@ -1,4 +1,4 @@ -Feature: Create Category +Feature: Add and Edit Category As an author In order to know what each blog is about I want to create categories diff --git a/spec/controllers/categories_controller_spec.rb b/spec/controllers/categories_controller_spec.rb index a9d23a2db3..d9493238e8 100644 --- a/spec/controllers/categories_controller_spec.rb +++ b/spec/controllers/categories_controller_spec.rb @@ -1,26 +1,5 @@ require 'spec_helper' -# describe CategoriesController, "/create" do -# let(:params) do -# { -# :name => "General", -# :permalink => "general", -# :position => 1 -# } -# end -# it "should create new category" do -# post :create, params -# expect(subject).to change(Category, :count).by(1) -# end -# end - -# describe CategoriesController, "/edit" do -# category = Factory(:category) -# it "assigns the requested category as @category" do -# get :edit, :id => category.id -# expect(assigns(:category)).to eq(category) -# end -# end describe CategoriesController, "/index" do before do From 430d8357960aff67bd53b8f30b8bf6e09b41785b Mon Sep 17 00:00:00 2001 From: Tammy Date: Tue, 29 Mar 2016 14:34:10 -0700 Subject: [PATCH 11/19] added a reverse option, near the edit and delete --- app/helpers/admin/base_helper.rb | 3 ++- db/db_development | Bin 159744 -> 159744 bytes db/db_test | Bin 143360 -> 143360 bytes features/reverse_article.feature | 18 ++++++++---------- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/helpers/admin/base_helper.rb b/app/helpers/admin/base_helper.rb index 00192e723d..756d92640e 100644 --- a/app/helpers/admin/base_helper.rb +++ b/app/helpers/admin/base_helper.rb @@ -17,7 +17,7 @@ def subtab(label, options = {}) end def show_page_heading - return if @page_heading.nil? or @page_heading.blank? + return if @page_heading.nil? or @page_heading.blank? heading = "
" heading << content_tag(:h2, @page_heading.html_safe) heading << "
" @@ -175,6 +175,7 @@ def show_actions item html = <<-HTML
#{link_to_published item} | + #{link_to _("Reverse"), :action => 'reverse', :id => item.id} | #{link_to _("Edit"), :action => 'edit', :id => item.id} | #{link_to _("Delete"), :action => 'destroy', :id => item.id} | #{get_short_url item} diff --git a/db/db_development b/db/db_development index bc7802c16085fbb5cadc3431bf9eead043ed76d7..4a23408fa201a301958deb3a3d24aa4f12057aac 100644 GIT binary patch delta 553 zcmZ{gzi-n(7>2(~tWukVF9@orN<~de)uDBLv6Hy=gcS*uDPllEf)ZT&nz;B!<+wot zp|+@km5_;rrOc?v1BJhVfw2=RWnw}|u#}}&1}3=ShVRvP_q@;6p}2J@KCh5)FwrF8 z+k3Co5rVsbyV-gA5;t#?5|o#x%K#t(;5bwqFZ3giuGVy2*A}U#SM{2^N~_eP)rRL8 z?uyAwgHl?nyJmW|6FPpd;Kt#fy{hA;exE6dB0qX874ZNhWFz+Hy(+05X*w z-JPv)EnAvpu%jPGB6c;nXnMmJ5@EmaL-*9p3DFST^uTh+J-mFlXtsCHQp z#L9y>3B1#(LUlzmWsO?3x<%L~5~Y;mAtz+(>d9Y;an zsG?ZR$fvygPM{=5g?+$%p1#4QYdq{2+_vO8Q5^Xkv&{wdS<>D}0!yBql~#hd(~g{w PS#s*6j`Yt;PuIx_XIGYU delta 220 zcmZp8z}fJCbAmKu)f`&cBv{oxg>d|0Dk{{xkgZ_$To{=5OK8 z*(_+_&9BIRgF&CMpeR2Ls7j47IX|x?HLs+Y3CIH?QJ~D^7JnU1UQVdY>Ha`>y;!$prWK>{~R&7#Xlmt@Jjiw9?j*gtlp^OX+{QUfm@(c{xljCDv zZqAA=VPt8NXO!6dC{D?7G0Opg#Vi{F7PDMX*v_KB$mGCsmx2H8X2F8X{A`MhEDY|v N)A!{w%C;3S0szN9KZXDR diff --git a/db/db_test b/db/db_test index 9afcacbc5b6e92cb704bdbffdebea13f156dbd18..9c8d478747a20b2738a1da809895a707905f1175 100644 GIT binary patch delta 227 zcmZp8z|ru4V?%zOrjdb_iHVh=xt@WUsfn4Tk%6I^u7Rm6B!&G4XeTf gN=iVwg{N=LXH-JiZfR&_VS>d7Gd+mRvI52f0Fl5qw*UYD delta 227 zcmZp8z|ru4V?%zOrlGl&k)@S^nVx}>g}J$*k%6I^u7R=uD#vKiSKBoi4N9V60xBeIG? bx`n52&1Y0X*lq!|-ogNz?GTw|1&jv(xhgmm diff --git a/features/reverse_article.feature b/features/reverse_article.feature index 98f4584d33..bd06c8d839 100644 --- a/features/reverse_article.feature +++ b/features/reverse_article.feature @@ -7,13 +7,11 @@ Background: Given the blog is set up And I am logged into the admin panel - Scenario: reverse a blog - Given I am on the manage articles page - Then I should see "Manage articles" - And I should see "My Shiny Weblog!" - - Scenario: Create blog page not shown when blog created - Given the blog is set up - When I am on the home page - Then I should not see "My Shiny Weblog!" - And I should see "Teh Blag" + Scenario: Successfully reverse articles + Given I am on the new article page + When I fill in "article_title" with "Test" + And I fill in "article__body_and_extended_editor" with "Pink shirt" + And I press "Publish" + Then I should be on the admin content page + When I follow "Reverse" + Then I should see "shirt Pink" From 676cb165227715356173210063ea77d77ed8eafa Mon Sep 17 00:00:00 2001 From: Tammy Date: Tue, 29 Mar 2016 15:23:23 -0700 Subject: [PATCH 12/19] hard coded the item id with 2, for test --- app/controllers/admin/content_controller.rb | 30 ++++++++++++++++---- app/helpers/admin/base_helper.rb | 3 +- app/views/admin/content/reverse.html.erb | 2 ++ config/routes.rb | 1 + db/db_development | Bin 159744 -> 159744 bytes 5 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 app/views/admin/content/reverse.html.erb diff --git a/app/controllers/admin/content_controller.rb b/app/controllers/admin/content_controller.rb index 6ef4ebf969..64f37c299f 100644 --- a/app/controllers/admin/content_controller.rb +++ b/app/controllers/admin/content_controller.rb @@ -13,7 +13,7 @@ def auto_complete_for_article_keywords def index @search = params[:search] ? params[:search] : {} - + @articles = Article.search_with_pagination(@search, {:page => params[:page], :per_page => this_blog.admin_display_elements}) if request.xhr? @@ -37,6 +37,24 @@ def edit new_or_edit end + def reverse + @article = Article.find(params[:id]) + if !@article.nil? + text = @atricle.body + split_text = text.split(' ') + split_text.reverse + reverse_string = "" + split_text.each do |word| + reverse_string += word + end + @article.body = reverse_string + @article.save + end + redirect_to :action => 'index' + + end + + def destroy @record = Article.find(params[:id]) @@ -44,7 +62,7 @@ def destroy flash[:error] = _("Error, you are not allowed to perform this action") return(redirect_to :action => 'index') end - + return(render 'admin/shared/destroy') unless request.post? @record.destroy @@ -77,7 +95,7 @@ def attachment_box_add def attachment_save(attachment) begin - Resource.create(:filename => attachment.original_filename, :mime => attachment.content_type.chomp, + Resource.create(:filename => attachment.original_filename, :mime => attachment.content_type.chomp, :created_at => Time.now).write_to_disk(attachment) rescue => e logger.info(e.message) @@ -92,7 +110,7 @@ def autosave @article.text_filter = current_user.text_filter if current_user.simple_editor? get_fresh_or_existing_draft_for_article - + @article.attributes = params[:article] @article.published = false set_article_author @@ -159,13 +177,13 @@ def new_or_edit @article.keywords = Tag.collection_to_string @article.tags @article.attributes = params[:article] # TODO: Consider refactoring, because double rescue looks... weird. - + @article.published_at = DateTime.strptime(params[:article][:published_at], "%B %e, %Y %I:%M %p GMT%z").utc rescue Time.parse(params[:article][:published_at]).utc rescue nil if request.post? set_article_author save_attachments - + @article.state = "draft" if @article.draft if @article.save diff --git a/app/helpers/admin/base_helper.rb b/app/helpers/admin/base_helper.rb index 756d92640e..82bd22d334 100644 --- a/app/helpers/admin/base_helper.rb +++ b/app/helpers/admin/base_helper.rb @@ -175,7 +175,8 @@ def show_actions item html = <<-HTML
#{link_to_published item} | - #{link_to _("Reverse"), :action => 'reverse', :id => item.id} | + raise + #{link_to _("Reverse"), :action => 'reverse', :id => 2} | #{link_to _("Edit"), :action => 'edit', :id => item.id} | #{link_to _("Delete"), :action => 'destroy', :id => item.id} | #{get_short_url item} diff --git a/app/views/admin/content/reverse.html.erb b/app/views/admin/content/reverse.html.erb new file mode 100644 index 0000000000..879d318a3b --- /dev/null +++ b/app/views/admin/content/reverse.html.erb @@ -0,0 +1,2 @@ +<%= @article.body %> +<%= @article.attributes %> diff --git a/config/routes.rb b/config/routes.rb index 082e0ea906..362a864f85 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -87,6 +87,7 @@ # AuthorsController match '/author/:id(.:format)', :to => 'authors#show', :format => /rss|atom/, :as => 'xml' match '/author(/:id)', :to => 'authors#show', :format => false + get '/admin/article/:id/reverse', :to => 'articles#reverse', :format => false # ThemesController scope :controller => 'theme', :filename => /.*/ do diff --git a/db/db_development b/db/db_development index 4a23408fa201a301958deb3a3d24aa4f12057aac..a78440d6a6f954261c1363c56a969d787a8b1c67 100644 GIT binary patch delta 592 zcmZ{g&ui0Q7{}iqu`{9JX=P*TEX_fgmv?=Wv};p}GZefC4nzlnlf@*(h)GBCg7mZs zf=BIgR>Xf`Y7T-I{R2FB^tdT_Ee>{352orwD!#mzm(RoZ`+45st~}h8A1&Z$bgGM^ z7aPx3PWniJwE}#B*YFOWz&3n>`|uprAkNCX4IOosR&nfmLF~ICA@BjI^5L^IN6-9W zK|e}J@ffXOw;u^V5(!PWS7U`1yQtVzZ$ly5D>aH)_xfW((Ao6kjniBA?$YCEfz4l3 zRoj-?Rg4e-*i}@Uvttpscl>amMNa5zL84u8!f@btVGwmT)h%}+FOD+l@gJ=UpB zh{5$`#!Y5enqjoL)vh;|xY^>mHAU9{Lg9c-idc{^F)7lUJ=Zf#lW|^mSzXWbtfp?V zo4uA_Z#lZr)ICY`#8jl!=6s3&Jn5zN`I*HS_+{2Tbo_)|9v z8o2Z8^WWeXWme@ZN=?ZuN=+`w%+D+45n+~x3l#GRG0QS0=jWBA=9LsPO`ham#KFYl z%)sN!o3;6&fH}`*=a{)nOpHpCAH}Im&WZW8DS<_SgNgqu1OIRSubTxAyyTz!zMpmT zuYN88Hb(x54Ez&;7Ps?Hp18gkRoV8h@=V+Un=Y^z0M-3s;Qs~G{GOkKfrXKUfs>PW TGvftjg?1JL#_cQyOn>YF3%^Z^ From df9d0d4ed9e2aacad77221df8c585d14d4a98784 Mon Sep 17 00:00:00 2001 From: Tammy Date: Tue, 29 Mar 2016 15:31:29 -0700 Subject: [PATCH 13/19] yess it seems to almost work --- app/controllers/admin/content_controller.rb | 4 ++-- app/helpers/admin/base_helper.rb | 3 +-- db/db_development | Bin 159744 -> 159744 bytes 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/content_controller.rb b/app/controllers/admin/content_controller.rb index 64f37c299f..45eedfe17e 100644 --- a/app/controllers/admin/content_controller.rb +++ b/app/controllers/admin/content_controller.rb @@ -39,8 +39,8 @@ def edit def reverse @article = Article.find(params[:id]) - if !@article.nil? - text = @atricle.body + if @article != nil + text = @article.body split_text = text.split(' ') split_text.reverse reverse_string = "" diff --git a/app/helpers/admin/base_helper.rb b/app/helpers/admin/base_helper.rb index 82bd22d334..756d92640e 100644 --- a/app/helpers/admin/base_helper.rb +++ b/app/helpers/admin/base_helper.rb @@ -175,8 +175,7 @@ def show_actions item html = <<-HTML
#{link_to_published item} | - raise - #{link_to _("Reverse"), :action => 'reverse', :id => 2} | + #{link_to _("Reverse"), :action => 'reverse', :id => item.id} | #{link_to _("Edit"), :action => 'edit', :id => item.id} | #{link_to _("Delete"), :action => 'destroy', :id => item.id} | #{get_short_url item} diff --git a/db/db_development b/db/db_development index a78440d6a6f954261c1363c56a969d787a8b1c67..aa806955e8e1911255d4a0ddd3c69e942f3de56b 100644 GIT binary patch delta 110 zcmZp8z}fJCbAmKu{zMsP#{7*5YyBDdH$N0G<=N~UGmnYUaPp%#6(I%&hF=WQy5ioA zdCU?ZhUH}bcthdH)Z&ti%;L=A+{(Pf+*BL=0=vmE@ftkFhE@g!dd6mk2Brqh6XM$^ N#4~Q65YJQ~005z#B3l3e delta 101 zcmZp8z}fJCbAmKu-b5K^#=MOQYyBD7Ha`?F<=N~UGmnW;WAdXo70$+TW(fvqU2*Tp z67hyIyj+}-sl^H<8JWcjK$Kglke8U7YNKCZ$ICT2CSGH5RyIi#4{BL F004-EAb$V= From 890c0b5aa0474674509a27b542dec15340eb56cd Mon Sep 17 00:00:00 2001 From: Tammy Date: Tue, 29 Mar 2016 16:04:42 -0700 Subject: [PATCH 14/19] it reverse seccufuly succefuly --- app/controllers/admin/content_controller.rb | 6 +++--- db/db_development | Bin 159744 -> 159744 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/content_controller.rb b/app/controllers/admin/content_controller.rb index 45eedfe17e..4337f5ae28 100644 --- a/app/controllers/admin/content_controller.rb +++ b/app/controllers/admin/content_controller.rb @@ -41,11 +41,11 @@ def reverse @article = Article.find(params[:id]) if @article != nil text = @article.body - split_text = text.split(' ') - split_text.reverse + split_text = text.split + split_text.reverse! reverse_string = "" split_text.each do |word| - reverse_string += word + reverse_string = reverse_string + " " + word end @article.body = reverse_string @article.save diff --git a/db/db_development b/db/db_development index aa806955e8e1911255d4a0ddd3c69e942f3de56b..a76f8145514365611404dd72dda03fe5556bcf1a 100644 GIT binary patch delta 251 zcmZp8z}fJCbAmKu=|mZ4#?p-m%ltV48F&JDv-mkSKNK+Kk>I<>sLmj*D&1(xz~JcE zB*rKS=1ETWjWM<_$q%V4$kz+W$Slq*uFNkjO3N%NE=epZ$xO~k)pJeBEXglQNzF+u zNzE+LDalC914}05(`tO;yOP rRPacxRIr&G6|cc(Y-M0#WnigiZeVO-Y}7mu?ucr`_ky)$&M3woaMG9$|Ma3lwiA5!u$vLTd3a%-cB?|dP3Mr{MsU@ij znI$?3B^jxC3dJQrB??J7`RVDIdFhIi3*$r-OifJ;Ee(wf49#>6jCGAH6bvn_OpJg? z&&b@w!pv|pW9$P)M#IUE;*^CI7#J9SF-Yr*dpG7WOMn=blLh1TL~IJ|B2$Y?fG)}` t&aKQ#%uTh?pBxph!DnP;Y-nX*pl57mXkcp4JR!b)LOkR43Gqw?0syKjO7;K% From 940812309043422476253b9a00e9a77a28be529e Mon Sep 17 00:00:00 2001 From: Tammy Date: Tue, 29 Mar 2016 16:34:16 -0700 Subject: [PATCH 15/19] so I've just noticed I created a new feature that I didn't have to :( we should do something totaly else. I'm gonna stop writing the cucuember for it, and move on to merging articles --- app/controllers/admin/content_controller.rb | 2 +- app/views/admin/content/reverse.html.erb | 2 -- db/db_development | Bin 159744 -> 159744 bytes db/db_test | Bin 143360 -> 143360 bytes 4 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 app/views/admin/content/reverse.html.erb diff --git a/app/controllers/admin/content_controller.rb b/app/controllers/admin/content_controller.rb index 4337f5ae28..05a3db7b79 100644 --- a/app/controllers/admin/content_controller.rb +++ b/app/controllers/admin/content_controller.rb @@ -45,7 +45,7 @@ def reverse split_text.reverse! reverse_string = "" split_text.each do |word| - reverse_string = reverse_string + " " + word + reverse_string = reverse_string + " " + word end @article.body = reverse_string @article.save diff --git a/app/views/admin/content/reverse.html.erb b/app/views/admin/content/reverse.html.erb deleted file mode 100644 index 879d318a3b..0000000000 --- a/app/views/admin/content/reverse.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -<%= @article.body %> -<%= @article.attributes %> diff --git a/db/db_development b/db/db_development index a76f8145514365611404dd72dda03fe5556bcf1a..902e97bed26f77f5ea3393544b4baab43fc551ec 100644 GIT binary patch delta 219 zcmZp8z}fJCbAmKu#Y7or#)^#z%ltVk8F(ytv-mkSKNQg5k>k6^*rdlO$snyN-RR28 z>*&a-9LmVRz|YU`D9@ljIVVOsMj?Rk+i71$wniyId8W|Xx=^7a88d)kB8Cw|{TA7&XnVXqen3zvyjCGlOGhV$p QE4Do=mT`MlEYmb006iH%n*aa+ delta 241 zcmZp8z}fJCbAmKu=|mZ4#?p-m%ltV48F&JDv-mkSKNK+Kspq@LsLmj*D&1(xz~JcE zB*rKS=1GEhoXVk$3=I7I{EqSr+M;m6B!&G4XeTf gN=iVQg{N=LXHd3Gd+mRvI52f0LVu+?*IS* From 25a83d9da9b87eaaf88fd189597c1efdf5063602 Mon Sep 17 00:00:00 2001 From: Tammy Date: Wed, 30 Mar 2016 09:29:26 -0700 Subject: [PATCH 16/19] the cucuember test is passing. PR and nex feature (the real one) --- db/db_development | Bin 159744 -> 159744 bytes db/db_test | Bin 143360 -> 143360 bytes features/reverse_article.feature | 3 ++- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/db/db_development b/db/db_development index 902e97bed26f77f5ea3393544b4baab43fc551ec..5f4ab6d15d729723adbd04dba73249f339bf400a 100644 GIT binary patch delta 175 zcmZp8z}fJCbAmKu?L--8#@dYu0x{7x1$GMIsX58{xv2^z`3fPG1^IdkAsLy)3P4nu zUs|M)mRVF>qL5frl9`;7s;A(Zl3AjVU!;(dnv+_Rs*qWtqfnBOs!&`4RH2ZRlb@cR znU}6;qhDY*xiC&-^8FY-A!7ptLo+KQGb;llJp)4{153-z|6}TzVB)4$Mn-xjh9(vU T=FJo0+b6^`Zl4g(R3HEVm_j)h delta 175 zcmZp8z}fJCbAmKu#Y7or#)^#z0x{7^Ir-`7nR)4oHu?p23dJRfMI{O)8L0}HB{~Wz zsX3`7sS5c;3a%-cB?>^P%;cO@J%zN)qT&*T%KXwIh0J1wkPHw}S&*-%P?E0@o|==K zpPQ;+Q(!l_FivFh{TMzWBTEG%V=E&=D-$z4b2Bpw6Z6ggW9pfp;sz#G29|o}2F4b~ TM$HrA+b6^`Zl4g(R3HEVpr<)5 diff --git a/db/db_test b/db/db_test index 79c0674d3a4b337a8ecc15c51d7ade14d508621e..e740888f3dbe84ffa0ec56750feda4cbebd2d612 100644 GIT binary patch delta 239 zcmZp8z|ru4V?$1zj Date: Wed, 30 Mar 2016 11:10:42 -0700 Subject: [PATCH 17/19] added cucuember test --- features/merge_articles.feature | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 features/merge_articles.feature diff --git a/features/merge_articles.feature b/features/merge_articles.feature new file mode 100644 index 0000000000..f9baaa2b55 --- /dev/null +++ b/features/merge_articles.feature @@ -0,0 +1,22 @@ +Feature: Merge Articles + As a the admin + In order to condense similar articles + I want to be able to merge articles + + Background: + Given the blog is set up + And I am logged into the admin panel + + Scenario: Successfully merge articles + Given I am on the new article page + When I fill in "article_title" with "Merge me!" + And I fill in "article__body_and_extended_editor" with "I like tomato soup" + And I press "Publish" + Then I should be on the admin content page + When I go to the home page + Then I should see "Hello World!" + And I should see "Merge me!" + When I go to the new article page + And I fill in "merge" with "1" + And I follow "Merge" + Then I should be on the new article page From b2b7babe106cf1294396d6c9bfc67c92d0fd2be0 Mon Sep 17 00:00:00 2001 From: Tammy Date: Wed, 30 Mar 2016 14:43:59 -0700 Subject: [PATCH 18/19] after reading Kari's comment I've changed the each method --- app/controllers/admin/content_controller.rb | 7 +------ db/db_development | Bin 159744 -> 159744 bytes 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/controllers/admin/content_controller.rb b/app/controllers/admin/content_controller.rb index 05a3db7b79..faddadd926 100644 --- a/app/controllers/admin/content_controller.rb +++ b/app/controllers/admin/content_controller.rb @@ -41,12 +41,7 @@ def reverse @article = Article.find(params[:id]) if @article != nil text = @article.body - split_text = text.split - split_text.reverse! - reverse_string = "" - split_text.each do |word| - reverse_string = reverse_string + " " + word - end + reverse_string = text.split.reverse!.join(" ") @article.body = reverse_string @article.save end diff --git a/db/db_development b/db/db_development index 5f4ab6d15d729723adbd04dba73249f339bf400a..db7028eddcf60a945fe2f922d0d8d83b2c4a6f7b 100644 GIT binary patch delta 85 zcmV-b0IL6h;0b`>36L8Be~}zR0e`Vztxo|7v*8dZ46`;|s{#Qllj2?`3IKt00~i1s rEf+36L8BeUThP0e!Jxtxo|6v*8dZ46`;|s{#Qklj2?`34wJ37yuhB s7e|v4UoHV4lR#fV4>2}6GBr9fGA=YRG&nFfgOFc`kY53}kY56D5VOV_AOHXW From cfe2958f552615702a77243dd12786710d9dd276 Mon Sep 17 00:00:00 2001 From: Tammy Date: Wed, 30 Mar 2016 14:48:15 -0700 Subject: [PATCH 19/19] changed the if statement after reading Kari's comment --- .../admin/categories_controller.rb | 8 +++++--- app/controllers/admin/content_controller.rb | 11 ++++------- db/db_development | Bin 159744 -> 159744 bytes 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb index 11942ad989..ae45c82377 100644 --- a/app/controllers/admin/categories_controller.rb +++ b/app/controllers/admin/categories_controller.rb @@ -25,9 +25,11 @@ def destroy def new_or_edit @categories = Category.find(:all) - @category = Category.new if params[:id].nil? - @category = Category.find(params[:id]) if !params[:id].nil? - + if params[:id].nil? + @category = Category.new + else + @category = Category.find(params[:id]) + end @category.attributes = params[:category] if request.post? respond_to do |format| diff --git a/app/controllers/admin/content_controller.rb b/app/controllers/admin/content_controller.rb index faddadd926..cedc104c5b 100644 --- a/app/controllers/admin/content_controller.rb +++ b/app/controllers/admin/content_controller.rb @@ -39,14 +39,11 @@ def edit def reverse @article = Article.find(params[:id]) - if @article != nil - text = @article.body - reverse_string = text.split.reverse!.join(" ") - @article.body = reverse_string - @article.save - end + text = @article.body + reverse_string = text.split.reverse!.join(" ") + @article.body = reverse_string + @article.save redirect_to :action => 'index' - end diff --git a/db/db_development b/db/db_development index db7028eddcf60a945fe2f922d0d8d83b2c4a6f7b..9e923b2a9253bcf437d263483fe80f15e7b560e6 100644 GIT binary patch delta 75 zcmZp8z}fJCbAmKu!$cWp#)gdv58|Y33hWd-QY#g5D;4q*b5j*Eixol=b8{FF6S delta 75 zcmZp8z}fJCbAmKu{X`jO#`=v358|Xk5_5AaZS)K56f%ny@)C1X6>=*TJW?waY$iv= fYjYc08CmF=n;BXf8#PaeZ=Vp)xP3xAQ-J^g@FE#8