From 0e3bb4ee2692cefc2df21e186b91682c06b9d262 Mon Sep 17 00:00:00 2001 From: Artur-Gaifutdinov Date: Fri, 28 Feb 2014 19:29:01 -0500 Subject: [PATCH] removed dead code, added more tests --- app/controllers/application_controller.rb | 7 ------- app/helpers/application_helper.rb | 4 ---- spec/models/deleted_user_spec.rb | 20 ++++++++++++++++++++ spec/unit/sluggifier_spec.rb | 2 -- 4 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 spec/models/deleted_user_spec.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 95596f7c..68f1059c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,14 +1,7 @@ class ApplicationController < ActionController::Base protect_from_forgery - helper_method :title - def title t=nil - @title = t unless t.blank? - @title - end - rescue_from CanCan::AccessDenied do |exception| redirect_to login_url, :alert => exception.message end - end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3419e0a3..eb35501b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,8 +1,4 @@ module ApplicationHelper - def program_path program - "/users/#{program.author_username}/programs/#{program.slug}" - end - def markdown(text) Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(hard_wrap: true), autolink: true).render(text).html_safe end diff --git a/spec/models/deleted_user_spec.rb b/spec/models/deleted_user_spec.rb new file mode 100644 index 00000000..9afc850b --- /dev/null +++ b/spec/models/deleted_user_spec.rb @@ -0,0 +1,20 @@ +require 'spec_helper' + +describe DeletedUser do + + before do + @user = DeletedUser.new + end + + it 'has deleted username' do + @user.username.should == 'Deleted User' + end + + it 'has no email' do + @user.email.should == 'none' + end + + it 'returns deleted user param' do + @user.to_param.should == 'deleted_user' + end +end \ No newline at end of file diff --git a/spec/unit/sluggifier_spec.rb b/spec/unit/sluggifier_spec.rb index 19afa177..9cc71ce9 100644 --- a/spec/unit/sluggifier_spec.rb +++ b/spec/unit/sluggifier_spec.rb @@ -22,6 +22,4 @@ end end end - - end