From ed6bb2275a152c5bf8b3ca66324921b2478d6d19 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Thu, 26 Jun 2014 15:04:32 +1000 Subject: [PATCH] Fixing some regressions in tests, switching favicons --- app/views/layouts/darkswarm.html.haml | 5 ++++- public/favicon-production.ico | Bin 1389 -> 0 bytes public/favicon.ico | Bin 0 -> 1389 bytes spec/controllers/home_controller_spec.rb | 9 +++++---- spec/controllers/producers_controller_spec.rb | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 public/favicon-production.ico diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml index 257d989cf1..3d246acab8 100644 --- a/app/views/layouts/darkswarm.html.haml +++ b/app/views/layouts/darkswarm.html.haml @@ -4,7 +4,10 @@ %meta{name: 'viewport', content: "width=device-width,initial-scale=1.0"}/ %title= content_for?(:title) ? yield(:title) : 'Welcome to Open Food Network' - = favicon_link_tag "favicon.png" + - if Rails.env.production? + = favicon_link_tag + - else + = favicon_link_tag "/favicon-staging.ico" %link{href: "https://fonts.googleapis.com/css?family=Open+Sans:400,700", rel: "stylesheet", type: "text/css"}/ = yield :scripts diff --git a/public/favicon-production.ico b/public/favicon-production.ico deleted file mode 100644 index 9e0f9a2681d21ceffa5066c3d41dbf294ec371cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1389 zcmV-z1(Nyz0096203aX$0096X09OS702TlM0EtjeM-2)Z3IG5A4M|8uQUCw|AOHXW zAP5Ek0047(dh`GQ010qNS#tmY79{`x79{~mQY7#I00jw2L_t(og{9Yftk-oJ2k_T9 zoP!r6E^*O-RAgaNYX~yM3ryAODWE-=l>ymd9*&eA<#=;eG=_B z7e5x*`V|_d2>fSYCT_=ce7FJ`jh|y{J@YIkU@g9mOK>v!V=x|MmkiIt+qg|6Hv(@p zMEbnQt5r&|0Q05Z4`QWoOzNf{PYaC2}4 z?!;q4?3LXEc(ERsfqxeg6Vbb}o`Q#)3}S1250_f^#V_s3zN38X4B%>E=)riZ{=2&t zZ^0x{!v5O5BI!j!+}{bQpAh206|ER4x?Lx%JzQ$EO_VWB;M-qYh6{ys-xc-~UaS>T zztkpjdq*_CK>GKBa@^E`vKPA@pRM1&kUlU|&^ZF9w+iu25~glycz75-`F}X?EeSk@ zM+D)qQvVTn4I^5m>utblTq>j)jL(SN`gh;CNqYyQa6^3$l7_cYdd_iprA=h^O(EJM z>4JTw>9kY;2SP$PUa~!^_L_-X1dUmEpiQJVMHqT$Ex2Azxb4_{fX-nc#)|?L${8|J zy61GPXp;=*h-A8kjGLu)_X}JHVqe2NT#JuMKeb8XV^&lJ`_Ec4uJ0vX}O zT~eMMO*$Wlo1_zt5=q}G{a~~7m?i8wj82ofjK=^$rC)spV@ze#tnH`-euImo`HaVv z(i3_M$#=Hm){3fK#;#Sh!D!*axLP+!hSPmnS391JuSoknteg&&8S@}^4J7UOgpg$d zj+Pnk*U}lkh3{2H6Dykw@y`aQog&*YGAT`#qx%dQ+egbmv|Kp1u@QlH<(Qo!XZ(Qr zZ&5{iWo5BY;QXo7bR5pF%x)Cu+iS1Y_=~(NbjpzruXH(Y44}(8WFmf`9=sUeu6r-Y zOz^Uliw1_FmFI=HRz= zUj_fBOvXg}{X~Yly&rTBV7tiiM=~QkF0fxGt#hf=c#X*D3o@+CuZ`P}_;ck$U0oY?*&|YpA?0MQOg|4btm)DD-U8^ddEKrj2%|gex<%x>rh@Dcl5WzZ v?JI!pwocmY7?IPua@b{?<>b7h*$w{(3oK4vw@vs&00000NkvXXu0mjf!>*hz diff --git a/public/favicon.ico b/public/favicon.ico index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9e0f9a2681d21ceffa5066c3d41dbf294ec371cf 100644 GIT binary patch literal 1389 zcmV-z1(Nyz0096203aX$0096X09OS702TlM0EtjeM-2)Z3IG5A4M|8uQUCw|AOHXW zAP5Ek0047(dh`GQ010qNS#tmY79{`x79{~mQY7#I00jw2L_t(og{9Yftk-oJ2k_T9 zoP!r6E^*O-RAgaNYX~yM3ryAODWE-=l>ymd9*&eA<#=;eG=_B z7e5x*`V|_d2>fSYCT_=ce7FJ`jh|y{J@YIkU@g9mOK>v!V=x|MmkiIt+qg|6Hv(@p zMEbnQt5r&|0Q05Z4`QWoOzNf{PYaC2}4 z?!;q4?3LXEc(ERsfqxeg6Vbb}o`Q#)3}S1250_f^#V_s3zN38X4B%>E=)riZ{=2&t zZ^0x{!v5O5BI!j!+}{bQpAh206|ER4x?Lx%JzQ$EO_VWB;M-qYh6{ys-xc-~UaS>T zztkpjdq*_CK>GKBa@^E`vKPA@pRM1&kUlU|&^ZF9w+iu25~glycz75-`F}X?EeSk@ zM+D)qQvVTn4I^5m>utblTq>j)jL(SN`gh;CNqYyQa6^3$l7_cYdd_iprA=h^O(EJM z>4JTw>9kY;2SP$PUa~!^_L_-X1dUmEpiQJVMHqT$Ex2Azxb4_{fX-nc#)|?L${8|J zy61GPXp;=*h-A8kjGLu)_X}JHVqe2NT#JuMKeb8XV^&lJ`_Ec4uJ0vX}O zT~eMMO*$Wlo1_zt5=q}G{a~~7m?i8wj82ofjK=^$rC)spV@ze#tnH`-euImo`HaVv z(i3_M$#=Hm){3fK#;#Sh!D!*axLP+!hSPmnS391JuSoknteg&&8S@}^4J7UOgpg$d zj+Pnk*U}lkh3{2H6Dykw@y`aQog&*YGAT`#qx%dQ+egbmv|Kp1u@QlH<(Qo!XZ(Qr zZ&5{iWo5BY;QXo7bR5pF%x)Cu+iS1Y_=~(NbjpzruXH(Y44}(8WFmf`9=sUeu6r-Y zOz^Uliw1_FmFI=HRz= zUj_fBOvXg}{X~Yly&rTBV7tiiM=~QkF0fxGt#hf=c#X*D3o@+CuZ`P}_;ck$U0oY?*&|YpA?0MQOg|4btm)DD-U8^ddEKrj2%|gex<%x>rh@Dcl5WzZ v?JI!pwocmY7?IPua@b{?<>b7h*$w{(3oK4vw@vs&00000NkvXXu0mjf!>*hz literal 0 HcmV?d00001 diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb index babb1c84e6..5cd2b0cda8 100644 --- a/spec/controllers/home_controller_spec.rb +++ b/spec/controllers/home_controller_spec.rb @@ -14,14 +14,15 @@ describe HomeController do assigns[:active_distributors].should == [distributor] end - it "does not show invisible hubs" do + # Exclusion from actual rendered view handled in features/consumer/home + it "shows JSON for invisible hubs" do get :index - response.body.should_not have_content invisible_distributor.name + response.body.should have_content invisible_distributor.name end - # This is done inside the json/hubs RABL template + # This is done inside the json/hubs Serializer it "gets the next order cycle for each hub" do - OrderCycle.should_receive(:first_closing_for).with(distributor) + OrderCycle.should_receive(:first_closing_for).twice get :index end end diff --git a/spec/controllers/producers_controller_spec.rb b/spec/controllers/producers_controller_spec.rb index d5a90a77d3..812b08892f 100644 --- a/spec/controllers/producers_controller_spec.rb +++ b/spec/controllers/producers_controller_spec.rb @@ -5,7 +5,7 @@ describe ProducersController do before do Enterprise.stub(:distributors_with_active_order_cycles).and_return [distributor] - Enterprise.stub(:visible).and_return [distributor] + Enterprise.stub(:all).and_return [distributor] end it "sets active distributors" do