From ab22caa97e4c1d749f1acfa344c0b1c91eba598b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 5 Feb 2015 15:56:28 +0100
Subject: Redirect signup page to signin page.

Resolves #1916.
---
 app/controllers/registrations_controller.rb |  4 ++++
 spec/features/users_spec.rb                 | 13 ++++---------
 spec/requests/api/users_spec.rb             | 24 ++++--------------------
 3 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 97aa2d9bdb4..38d116a4ee3 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -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
 
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index 8b237199bcc..21a3a4bf937 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -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
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index dec488c6d00..12dfcacec23 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -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
 
-- 
cgit v1.2.1