Commit ab22caa9 authored by Douwe Maan's avatar Douwe Maan

Redirect signup page to signin page.

Resolves #1916.
parent 56a456b4
class RegistrationsController < Devise::RegistrationsController
before_filter :signup_enabled?
def new
redirect_to(new_user_session_path)
end
def destroy
current_user.destroy
......
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,29 +184,13 @@ 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
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
end
describe "PUT /users/:id" do
let!(:admin_user) { create(:admin) }
......
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