Merge branch 'master' into mmonaco/gitlab-ce-api-user-noconfirm

Conflicts:
	lib/api/users.rb

1 files changed, 3 insertions, 8 deletions

diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index a1206989d39..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
-      Gitlab.config.gitlab.stub(:signup_enabled).and_return(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_sign_up", with: "password1234"
-      fill_in "user_password_confirmation", with: "password1234"
-      expect { click_button "Sign up" }.to change {User.count}.by(1)
+      expect { click_button "Sign up" }.to change { User.count }.by(1)
     end
   end
 end