Address @nilsding's review comments

This commit is contained in:
Dominik M. Kwiatek 2020-05-27 22:27:54 +01:00
parent e512d5502d
commit 4c7ec05198
3 changed files with 17 additions and 19 deletions

View File

@ -63,6 +63,7 @@ admins:
# bucket name, required # bucket name, required
# directory: 'retrospring' # directory: 'retrospring'
# hCaptcha -- get keys from https://www.hcaptcha.com/
hcaptcha: hcaptcha:
enabled: false enabled: false
site_key: '' site_key: ''

View File

@ -5,13 +5,15 @@ require "rails_helper"
describe User::RegistrationsController, type: :controller do describe User::RegistrationsController, type: :controller do
before do before do
@request.env["devise.mapping"] = Devise.mappings[:user] @request.env["devise.mapping"] = Devise.mappings[:user]
allow(APP_CONFIG).to receive(:dig).with(:hcaptcha, :enabled).and_return(true)
allow(controller).to receive(:verify_hcaptcha).and_return(captcha_successful)
end end
describe "#create" do describe "#create" do
context "valid user sign up" do context "valid user sign up" do
before do
allow(APP_CONFIG).to receive(:dig).with(:hcaptcha, :enabled).and_return(true)
allow(controller).to receive(:verify_hcaptcha).and_return(captcha_successful)
end
let :registration_params do let :registration_params do
{ {
user: { user: {
@ -25,15 +27,15 @@ describe User::RegistrationsController, type: :controller do
subject { post :create, params: registration_params } subject { post :create, params: registration_params }
context "when captcha was invalid" do context "when captcha is invalid" do
let(:captcha_successful) { false } let(:captcha_successful) { false }
it "doesn't allow a registration without an invalid captcha" do it "doesn't allow a registration with an invalid captcha" do
expect { subject }.not_to(change { User.count }) expect { subject }.not_to(change { User.count })
expect(response).to redirect_to :new_user_registration expect(response).to redirect_to :new_user_registration
end end
end end
context "when captcha was valid" do context "when captcha is valid" do
let(:captcha_successful) { true } let(:captcha_successful) { true }
it "creates a user" do it "creates a user" do
allow(controller).to receive(:verify_hcaptcha).and_return(true) allow(controller).to receive(:verify_hcaptcha).and_return(true)
@ -43,6 +45,10 @@ describe User::RegistrationsController, type: :controller do
end end
context "invalid user sign up" do context "invalid user sign up" do
before do
allow(APP_CONFIG).to receive(:dig).with(:hcaptcha, :enabled).and_return(false)
end
subject { post :create, params: registration_params } subject { post :create, params: registration_params }
context "when registration params are empty" do context "when registration params are empty" do
@ -56,11 +62,8 @@ describe User::RegistrationsController, type: :controller do
} }
} }
end end
let(:captcha_successful) { true }
it "rejects unfilled registration forms" do
allow(APP_CONFIG).to receive(:dig).with(:hcaptcha, :enabled).and_return(false)
it "does not create a user" do
expect { subject }.not_to(change { User.count }) expect { subject }.not_to(change { User.count })
end end
end end
@ -74,11 +77,8 @@ describe User::RegistrationsController, type: :controller do
password_confirmation: 'AReallySecurePassword456!' password_confirmation: 'AReallySecurePassword456!'
} }
} } } }
let(:captcha_successful) { true }
it "rejects registrations with invalid usernames" do
allow(APP_CONFIG).to receive(:dig).with(:hcaptcha, :enabled).and_return(false)
it "does not create a user" do
expect { subject }.not_to(change { User.count }) expect { subject }.not_to(change { User.count })
end end
end end
@ -92,11 +92,8 @@ describe User::RegistrationsController, type: :controller do
password_confirmation: 'AReallySecurePassword456!' password_confirmation: 'AReallySecurePassword456!'
} }
} } } }
let(:captcha_successful) { true }
it "rejects registrations with reserved usernames" do
allow(APP_CONFIG).to receive(:dig).with(:hcaptcha, :enabled).and_return(false)
it "does not create a user" do
expect { subject }.not_to(change { User.count }) expect { subject }.not_to(change { User.count })
end end
end end