Skip to content

Commit ac720d9

Browse files
authored
refactor(questionnaire): No longer deletes user with questionnaire (#287)
* refactor(questionnaire): No longer deletes user with questionnaire * Hound whitespace
1 parent 5e96a9c commit ac720d9

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

app/controllers/manage/questionnaires_controller.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@ def convert_to_admin
103103
end
104104

105105
def destroy
106-
user = @questionnaire.user
107106
@questionnaire.destroy
108-
user.destroy if user.present?
109107
respond_with(:manage, @questionnaire)
110108
end
111109

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
= render "layouts/manage/page_title", title: "Edit Questionnaire", subtitle: @questionnaire.user.full_name do
22
.btn-group
33
= link_to 'Cancel', manage_questionnaire_path(@questionnaire), class: 'btn btn-sm btn-outline-secondary'
4-
= link_to 'Delete', manage_questionnaire_path(@questionnaire), method: :delete, data: { confirm: "Are you sure? The questionnaire and account for \"#{@questionnaire.user.full_name}\" will be permanently erased. This action is irreversible." }, class: 'btn btn-sm btn-outline-secondary'
4+
= link_to 'Delete', manage_questionnaire_path(@questionnaire), method: :delete, data: { confirm: "Are you sure? The questionnaire will be permanently deleted. This action is irreversible." }, class: 'btn btn-sm btn-outline-secondary'
55

66
= render 'form'

test/controllers/manage/questionnaires_controller_test.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,9 +308,7 @@ class Manage::QuestionnairesControllerTest < ActionController::TestCase
308308

309309
should "destroy questionnaire" do
310310
assert_difference("Questionnaire.count", -1) do
311-
assert_difference("User.count", -1) do
312-
delete :destroy, params: { id: @questionnaire }
313-
end
311+
delete :destroy, params: { id: @questionnaire }
314312
end
315313
assert_redirected_to manage_questionnaires_path
316314
end

0 commit comments

Comments
 (0)