Commit 8e238f42 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix user remove tests. Remove user even if he has projects

parent 7b8bd93e
...@@ -2,9 +2,6 @@ class RegistrationsController < Devise::RegistrationsController ...@@ -2,9 +2,6 @@ class RegistrationsController < Devise::RegistrationsController
before_filter :signup_enabled? before_filter :signup_enabled?
def destroy def destroy
if current_user.owned_projects.count > 0
redirect_to account_profile_path, alert: "Remove projects and groups before removing account." and return
end
current_user.destroy current_user.destroy
respond_to do |format| respond_to do |format|
......
...@@ -17,26 +17,12 @@ describe "Profile account page" do ...@@ -17,26 +17,12 @@ describe "Profile account page" do
it { page.should have_content("Remove account") } it { page.should have_content("Remove account") }
it "should delete the account", js: true do it "should delete the account" do
expect { click_link "Delete account" }.to change {User.count}.by(-1) expect { click_link "Delete account" }.to change {User.count}.by(-1)
current_path.should == new_user_session_path current_path.should == new_user_session_path
end end
end end
describe "when signup is enabled and user has a project" do
before do
Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
@project = create(:project, namespace: @user.namespace)
@project.team << [@user, :master]
visit account_profile_path
end
it { page.should have_content("Remove account") }
it "should not allow user to delete the account" do
expect { click_link "Delete account" }.not_to change {User.count}.by(-1)
end
end
describe "when signup is disabled" do describe "when signup is disabled" do
before do before do
Gitlab.config.gitlab.stub(:signup_enabled).and_return(false) Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
......
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