From 8dcd3932fa0aec5fd017b1e197937e464232b3ac Mon Sep 17 00:00:00 2001 From: Skud Date: Tue, 29 Oct 2013 16:22:48 +1100 Subject: [PATCH] Added a partial to display a member's location. --- .../bootstrap_and_overrides.css.less | 9 +++++ app/views/members/_location.html.haml | 5 +++ .../views/members/_location.html.haml_spec.rb | 35 +++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 app/views/members/_location.html.haml create mode 100644 spec/views/members/_location.html.haml_spec.rb diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index b64bca8d9..a0970bd89 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -155,6 +155,15 @@ p.stats { height: 500px; } +.member-location { + font-size: small; + font-style: italic; +} + +.member-location a { + color: @brown; +} + // Overrides applying only to mobile view @media only screen and (max-width: 767px) { diff --git a/app/views/members/_location.html.haml b/app/views/members/_location.html.haml new file mode 100644 index 000000000..195897d71 --- /dev/null +++ b/app/views/members/_location.html.haml @@ -0,0 +1,5 @@ +.member-location + - if member.location.blank? + unknown location + - else + = link_to member.location, place_path(:place => member.location) diff --git a/spec/views/members/_location.html.haml_spec.rb b/spec/views/members/_location.html.haml_spec.rb new file mode 100644 index 000000000..96c1e3b8d --- /dev/null +++ b/spec/views/members/_location.html.haml_spec.rb @@ -0,0 +1,35 @@ +require 'spec_helper' + +describe "members/_location" do + context "member with location" do + before(:each) do + @member = FactoryGirl.create(:london_member) + render :partial => 'members/location', :locals => { :member => @member } + end + + it 'shows location if available' do + rendered.should contain @member.location + end + + it "links to the places page" do + assert_select "a", :href => place_path(@member.location) + end + end + + context "member with no location" do + before(:each) do + @member = FactoryGirl.create(:member) + render :partial => 'members/location', :locals => { :member => @member } + end + + it 'shows unknown location' do + rendered.should contain "unknown location" + end + + it "doesn't link anywhere" do + assert_select "a", false + end + + end + +end