Commit 72a74784 authored by Peter Leitzen's avatar Peter Leitzen

Merge branch '204723-nomethoderror-undefined-method-term_agreements-for-nil-nilclass' into 'master'

Resolve "NoMethodError: undefined method `term_agreements' for nil:NilClass"

Closes #204723

See merge request gitlab-org/gitlab!24771
parents 45c888fc 665c8744
...@@ -4,7 +4,7 @@ module Users ...@@ -4,7 +4,7 @@ module Users
class TermsController < ApplicationController class TermsController < ApplicationController
include InternalRedirect include InternalRedirect
skip_before_action :authenticate_user! skip_before_action :authenticate_user!, only: [:index]
skip_before_action :enforce_terms! skip_before_action :enforce_terms!
skip_before_action :check_password_expiration skip_before_action :check_password_expiration
skip_before_action :check_two_factor_requirement skip_before_action :check_two_factor_requirement
......
---
title: Require a logged in user to accept or decline a term
merge_request: 24771
author:
type: fixed
...@@ -4,7 +4,8 @@ require 'spec_helper' ...@@ -4,7 +4,8 @@ require 'spec_helper'
describe Users::TermsController do describe Users::TermsController do
include TermsHelper include TermsHelper
let(:user) { create(:user) }
let_it_be(:user) { create(:user) }
let(:term) { create(:term) } let(:term) { create(:term) }
before do before do
...@@ -12,88 +13,145 @@ describe Users::TermsController do ...@@ -12,88 +13,145 @@ describe Users::TermsController do
end end
describe 'GET #index' do describe 'GET #index' do
it 'redirects when no terms exist' do context 'when a user is signed in' do
get :index it 'redirects when no terms exist' do
get :index
expect(response).to redirect_to(root_path)
end
context 'when terms exist' do
before do
stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
term
end
it 'shows terms when they exist' do
get :index
expect(response).to have_gitlab_http_status(:success)
end
it 'shows a message when the user already accepted the terms' do
accept_terms(user)
get :index
expect(response).to have_gitlab_http_status(:redirect) expect(controller).to set_flash.now[:notice].to(/already accepted/)
end
end
end end
context 'when terms exist' do context 'when a user is not signed in' do
before do before do
stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') sign_out user
term
end end
it 'shows terms when they exist' do context 'when terms exist' do
get :index before do
stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
term
end
expect(response).to have_gitlab_http_status(:success) it 'returns success response' do
end get :index
it 'shows a message when the user already accepted the terms' do expect(response).to have_gitlab_http_status(:success)
accept_terms(user) end
end
get :index context 'when no terms exist' do
it 'redirects' do
get :index
expect(controller).to set_flash.now[:notice].to(/already accepted/) expect(response).to redirect_to(root_path)
end
end end
end end
end end
describe 'POST #accept' do describe 'POST #accept' do
it 'saves that the user accepted the terms' do context 'when a user is signed in' do
post :accept, params: { id: term.id } it 'saves that the user accepted the terms' do
post :accept, params: { id: term.id }
agreement = user.term_agreements.find_by(term: term) agreement = user.term_agreements.find_by(term: term)
expect(agreement.accepted).to eq(true) expect(agreement.accepted).to eq(true)
end end
it 'redirects to a path when specified' do it 'redirects to a path when specified' do
post :accept, params: { id: term.id, redirect: groups_path } post :accept, params: { id: term.id, redirect: groups_path }
expect(response).to redirect_to(groups_path) expect(response).to redirect_to(groups_path)
end end
it 'redirects to the referer when no redirect specified' do it 'redirects to the referer when no redirect specified' do
request.env["HTTP_REFERER"] = groups_url request.env["HTTP_REFERER"] = groups_url
post :accept, params: { id: term.id } post :accept, params: { id: term.id }
expect(response).to redirect_to(groups_path) expect(response).to redirect_to(groups_path)
end end
context 'redirecting to another domain' do context 'redirecting to another domain' do
it 'is prevented when passing a redirect param' do it 'is prevented when passing a redirect param' do
post :accept, params: { id: term.id, redirect: '//example.com/random/path' } post :accept, params: { id: term.id, redirect: '//example.com/random/path' }
expect(response).to redirect_to(root_path) expect(response).to redirect_to(root_path)
end
it 'is prevented when redirecting to the referer' do
request.env["HTTP_REFERER"] = 'http://example.com/and/a/path'
post :accept, params: { id: term.id }
expect(response).to redirect_to(root_path)
end
end end
end
it 'is prevented when redirecting to the referer' do context 'when a user is not signed in' do
request.env["HTTP_REFERER"] = 'http://example.com/and/a/path' before do
sign_out user
end
it 'redirects to login page' do
post :accept, params: { id: term.id } post :accept, params: { id: term.id }
expect(response).to redirect_to(root_path) expect(response).to redirect_to(new_user_session_path)
end end
end end
end end
describe 'POST #decline' do describe 'POST #decline' do
it 'stores that the user declined the terms' do context 'when a user is signed in' do
post :decline, params: { id: term.id } it 'stores that the user declined the terms' do
post :decline, params: { id: term.id }
agreement = user.term_agreements.find_by(term: term)
agreement = user.term_agreements.find_by(term: term) expect(agreement.accepted).to eq(false)
end
expect(agreement.accepted).to eq(false) it 'signs out the user' do
post :decline, params: { id: term.id }
expect(response).to redirect_to(root_path)
expect(assigns(:current_user)).to be_nil
end
end end
it 'signs out the user' do context 'when a user is not signed in' do
post :decline, params: { id: term.id } before do
sign_out user
end
expect(response).to redirect_to(root_path) it 'redirects to login page' do
expect(assigns(:current_user)).to be_nil post :decline, params: { id: term.id }
expect(response).to redirect_to(new_user_session_path)
end
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment