spec/views/leads/_sidebar_show.haml_spec.rb @@ -16,7 +16,7 @@ == #{account.user.id == @current_user.id ? "me" : account.user.full_name} - unless @current_user.preference[:accounts_outline] == "brief" %dt - = link_to(account.website, account.website) << " | " if account.website? + = link_to(account.website, account.website.match(/^https?:\/\//) ? account.website : 'http://' << account.website) << " | " if account.website? = "phone: " << (account.toll_free_phone || account.phone) << " | " if account.toll_free_phone? || account.phone? = pluralize(account.contacts.count, "contact") << " | " = pluralize(account.opportunities.count, "opportunity") app/views/accounts/_account.html.haml @@ -7,6 +7,12 @@ describe "/accounts/index.html.haml" do login_and_assign end + it "should render a proper account website link if an account is provided" do + assigns[:accounts] = [ Factory(:account, :website => 'www.fatfreecrm.com'), Factory(:account) ].paginate + render "/accounts/index.html.haml" + response.should have_tag("a[href=http://www.fatfreecrm.com]") + end + it "should render list of accounts if list of accounts is not empty" do assigns[:accounts] = [ Factory(:account), Factory(:account) ].paginate template.should_receive(:render).with(hash_including(:partial => "account")) spec/views/accounts/index.haml_spec.rb 07be9dd7864568f4318aca911f4b08d600bac543 726fd3fb8c8d0c3942c32f241b67f6926f76435c Mike Dvorkin mike@dvorkin.net http://github.com/enderson/fat_free_crm/commit/176ebfa31c9c1cf3d9a596905dc37c8ce80ac24b 176ebfa31c9c1cf3d9a596905dc37c8ce80ac24b 2009-08-21T23:11:31-07:00 2009-08-21T23:11:31-07:00 Merge branch 'master' of git://github.com/kinsteronline/fat_free_crm into kinsteronline/master 7582be80f9bde81e97f0134114edfceead442bf5 Mike Dvorkin mike@dvorkin.net