From f074a13488a4de1c8dd36c14c5d879c9996370fb Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Sat, 11 May 2019 15:05:28 -0500 Subject: [PATCH] Dont log out when seeding/reseting an acct. --- app/mutations/devices/reset.rb | 2 +- .../api/devices/devices_controller_destroy_spec.rb | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/mutations/devices/reset.rb b/app/mutations/devices/reset.rb index a5bcd94ff..f1a228fbf 100644 --- a/app/mutations/devices/reset.rb +++ b/app/mutations/devices/reset.rb @@ -23,7 +23,7 @@ module Devices device.send(resource).destroy! end - Device::PLURAL_RESOURCES.map do |resources| + Device::PLURAL_RESOURCES.without(:token_issuances).map do |resources| device.send(resources).destroy_all end diff --git a/spec/controllers/api/devices/devices_controller_destroy_spec.rb b/spec/controllers/api/devices/devices_controller_destroy_spec.rb index 0aaf36507..131bad7ec 100644 --- a/spec/controllers/api/devices/devices_controller_destroy_spec.rb +++ b/spec/controllers/api/devices/devices_controller_destroy_spec.rb @@ -9,7 +9,7 @@ describe Api::DevicesController do resources = %w(sensor peripheral log pin_binding generic_pointer tool_slot plant_template saved_garden sensor_reading - farmware_installation tool) + farmware_installation tool token_issuance) it "resets a bot" do sign_in user @@ -24,10 +24,18 @@ describe Api::DevicesController do run_jobs_now { post :reset, params: { password: password } } - resources.map do |resource| - expect(device.send(resource.pluralize).reload.count).to eq 0 + resources + .without("token_issuance") + .map do |resource| + count = device.send(resource.pluralize).reload.count + if count > 0 + did_not_delete = "Epected #{resource} count to be 0 but got #{count}" + fail(did_not_delete) + end end + expect(device.alerts.count).to eq(1) + expect(device.token_issuances.count).to_not be > 1 end it "can't reset a device if credentials are missing" do