Permalink
Browse files

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

  • Loading branch information...
1 parent 7b8bd93 commit 8e238f42732e5968dc46e3f08d853d0f3c9b2760 @dzaporozhets dzaporozhets committed Sep 4, 2013
Showing with 1 addition and 18 deletions.
  1. +0 −3 app/controllers/registrations_controller.rb
  2. +1 −15 spec/features/profile_spec.rb
@@ -2,9 +2,6 @@ class RegistrationsController < Devise::RegistrationsController
before_filter :signup_enabled?
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
respond_to do |format|
@@ -17,26 +17,12 @@
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)
current_path.should == new_user_session_path
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
before do
Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)

0 comments on commit 8e238f4

Please sign in to comment.