Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 26 deletions

diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index 8f147f949d0..8f260aa8b43 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -30,6 +30,7 @@ describe RegistrationsController do
 
       it 'renders new template and sets the resource variable' do
         expect(subject).to render_template(:new)
+        expect(response).to have_gitlab_http_status(200)
         expect(assigns(:resource)).to be_a(User)
       end
     end
@@ -47,6 +48,7 @@ describe RegistrationsController do
 
       it 'renders new template and sets the resource variable' do
         subject
+        expect(response).to have_gitlab_http_status(302)
         expect(response).to redirect_to(new_user_session_path(anchor: 'register-pane'))
       end
     end
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index d9bcbffa844..1a1e80f1ce3 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -635,32 +635,6 @@ describe API::Users do
     end
   end
 
-  describe "GET /users/sign_up" do
-    context 'when experimental signup_flow is active' do
-      before do
-        stub_experiment_for_user(signup_flow: true)
-      end
-
-      it "shows sign up page" do
-        get "/users/sign_up"
-        expect(response).to have_gitlab_http_status(200)
-        expect(response).to render_template(:new)
-      end
-    end
-
-    context 'when experimental signup_flow is not active' do
-      before do
-        stub_experiment_for_user(signup_flow: false)
-      end
-
-      it "redirects to sign in page" do
-        get "/users/sign_up"
-        expect(response).to have_gitlab_http_status(302)
-        expect(response).to redirect_to(new_user_session_path(anchor: 'register-pane'))
-      end
-    end
-  end
-
   describe "PUT /users/:id" do
     let!(:admin_user) { create(:admin) }