Merge branch 'redirect-sign_up' into 'master'
Redirect signup page to signin page. Resolves #1916. See merge request !1468
This commit is contained in:
commit
50e8e5943f
|
@ -1,6 +1,10 @@
|
|||
class RegistrationsController < Devise::RegistrationsController
|
||||
before_filter :signup_enabled?
|
||||
|
||||
def new
|
||||
redirect_to(new_user_session_path)
|
||||
end
|
||||
|
||||
def destroy
|
||||
current_user.destroy
|
||||
|
||||
|
|
|
@ -1,19 +1,14 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'Users', feature: true do
|
||||
describe "GET /users/sign_up" do
|
||||
before do
|
||||
ApplicationSetting.any_instance.stub(signup_enabled?: true)
|
||||
end
|
||||
|
||||
describe "GET /users/sign_in" do
|
||||
it "should create a new user account" do
|
||||
visit new_user_registration_path
|
||||
visit new_user_session_path
|
||||
fill_in "user_name", with: "Name Surname"
|
||||
fill_in "user_username", with: "Great"
|
||||
fill_in "user_email", with: "name@mail.com"
|
||||
fill_in "user_password", with: "password1234"
|
||||
fill_in "user_password_confirmation", with: "password1234"
|
||||
expect { click_button "Sign up" }.to change {User.count}.by(1)
|
||||
fill_in "user_password_sign_up", with: "password1234"
|
||||
expect { click_button "Sign up" }.to change { User.count }.by(1)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -184,27 +184,11 @@ describe API::API, api: true do
|
|||
end
|
||||
|
||||
describe "GET /users/sign_up" do
|
||||
context 'enabled' do
|
||||
before do
|
||||
ApplicationSetting.any_instance.stub(signup_enabled?: true)
|
||||
end
|
||||
|
||||
it "should return sign up page if signup is enabled" do
|
||||
get "/users/sign_up"
|
||||
response.status.should == 200
|
||||
end
|
||||
end
|
||||
|
||||
context 'disabled' do
|
||||
before do
|
||||
ApplicationSetting.any_instance.stub(signup_enabled?: false)
|
||||
end
|
||||
|
||||
it "should redirect to sign in page if signup is disabled" do
|
||||
get "/users/sign_up"
|
||||
response.status.should == 302
|
||||
response.should redirect_to(new_user_session_path)
|
||||
end
|
||||
it "should redirect to sign in page" do
|
||||
get "/users/sign_up"
|
||||
response.status.should == 302
|
||||
response.should redirect_to(new_user_session_path)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue