From 344b198900a972cacb9c7a11da328f3fe87bd4c8 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 24 Apr 2015 01:36:51 +0200 Subject: [PATCH] use camo for medium and small avatars --- app/presenters/avatar_presenter.rb | 10 +++++----- spec/presenters/avatar_presenter_spec.rb | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 spec/presenters/avatar_presenter_spec.rb diff --git a/app/presenters/avatar_presenter.rb b/app/presenters/avatar_presenter.rb index 5cb0060d8..f612c9c07 100644 --- a/app/presenters/avatar_presenter.rb +++ b/app/presenters/avatar_presenter.rb @@ -1,12 +1,12 @@ class AvatarPresenter < BasePresenter - - DEFAULT_IMAGE = ActionController::Base.helpers.image_path('user/default.png') + DEFAULT_IMAGE = ActionController::Base.helpers.image_path("user/default.png") def base_hash - { small: image_url_small || DEFAULT_IMAGE, - medium: image_url_medium || DEFAULT_IMAGE, - large: image_url || DEFAULT_IMAGE + { + small: image_url(:thumb_small) || DEFAULT_IMAGE, + medium: image_url(:thumb_medium) || DEFAULT_IMAGE, + large: image_url || DEFAULT_IMAGE } end end diff --git a/spec/presenters/avatar_presenter_spec.rb b/spec/presenters/avatar_presenter_spec.rb new file mode 100644 index 000000000..c819b96fc --- /dev/null +++ b/spec/presenters/avatar_presenter_spec.rb @@ -0,0 +1,22 @@ +require "spec_helper" + +describe AvatarPresenter do + describe "#base_hash" do + it "calls image_url() for the avatars" do + @profile = FactoryGirl.create(:profile_with_image_url, person: alice.person) + @presenter = AvatarPresenter.new(@profile) + expect(@profile).to receive(:image_url).exactly(3).times + expect(@presenter.base_hash).to be_present + end + + it "returns the default images if no images set" do + @profile = FactoryGirl.create(:profile, person: alice.person) + @presenter = AvatarPresenter.new(@profile) + expect(@presenter.base_hash).to eq( + small: "/assets/user/default.png", + medium: "/assets/user/default.png", + large: "/assets/user/default.png" + ) + end + end +end