summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Iván Vargas López <jvargas@gitlab.com>2018-07-25 21:26:08 +0000
committerJosé Iván Vargas López <jvargas@gitlab.com>2018-07-25 21:26:08 +0000
commitad62c9e975698a38cf1ac24244276aeac546850f (patch)
tree62a1b59d32f336d0e2de3c8b96286de1f4704994
parentd93eb03d5c2855a166772e425cc74da572a5c2fc (diff)
parent5f8c593a6907f5521ea155fa2bc1273022b36341 (diff)
downloadgitlab-ce-ad62c9e975698a38cf1ac24244276aeac546850f.tar.gz
Merge branch 'fix_10_8_stable_spec' into '10-8-stable'
Fix spec/controllers/users/terms_controller_spec.rb spec See merge request gitlab/gitlabhq!2447
-rw-r--r--spec/controllers/users/terms_controller_spec.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/spec/controllers/users/terms_controller_spec.rb b/spec/controllers/users/terms_controller_spec.rb
index a744463413c..d37f12efac6 100644
--- a/spec/controllers/users/terms_controller_spec.rb
+++ b/spec/controllers/users/terms_controller_spec.rb
@@ -2,7 +2,6 @@ require 'spec_helper'
describe Users::TermsController do
let(:user) { create(:user) }
- let(:term) { create(:term) }
before do
sign_in user
@@ -16,13 +15,17 @@ describe Users::TermsController do
end
it 'shows terms when they exist' do
- term
+ create(:term)
+
+ get :index
expect(response).to have_gitlab_http_status(:success)
end
end
describe 'POST #accept' do
+ let(:term) { create(:term) }
+
it 'saves that the user accepted the terms' do
post :accept, id: term.id
@@ -46,6 +49,8 @@ describe Users::TermsController do
end
context 'redirecting to another domain' do
+ let(:term) { create(:term) }
+
it 'is prevented when passing a redirect param' do
post :accept, id: term.id, redirect: '//example.com/random/path'
@@ -63,6 +68,8 @@ describe Users::TermsController do
end
describe 'POST #decline' do
+ let(:term) { create(:term) }
+
it 'stores that the user declined the terms' do
post :decline, id: term.id