diff options
| -rw-r--r-- | app/controllers/users_controller.rb | 4 | ||||
| -rw-r--r-- | spec/controllers/users_controller_spec.rb | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 8c96f67a2a4..ff5e31067fb 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,4 +1,6 @@ class UsersController < ApplicationController + skip_before_filter :authenticate_user! + before_filter :set_user layout :determine_layout def show @@ -47,7 +49,7 @@ class UsersController < ApplicationController private - def authenticate_user! + def set_user @user = User.find_by_username!(params[:username]) unless current_user || @user.public_profile? diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 0c537a552c2..44225c054f2 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -9,18 +9,18 @@ describe UsersController do describe "GET #show" do render_views - before do - get :show, username: user.username - end it "renders the show template" do + get :show, username: user.username expect(response.status).to eq(200) expect(response).to render_template("show") end + end + describe "GET #calendar" do it "renders calendar" do - controller.prepend_view_path 'app/views/users' - expect(response).to render_template("_calendar") + get :calendar, username: user.username + expect(response).to render_template("calendar") end end end |