From 27b2002782e17e696444872c3c868b3a85edb775 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Mon, 13 May 2019 10:30:35 -0500 Subject: [PATCH] Change default firmware_hard from "arduino" to "none" --- app/models/fbos_config.rb | 1 + app/mutations/devices/seeders/abstract_seeder.rb | 16 +++++++++------- ...442_change_firmware_hardware_default_value.rb | 5 +++++ db/structure.sql | 4 +++- .../api/configs/fbos_configs_controller_spec.rb | 2 +- spec/models/fbos_config_spec.rb | 4 ++++ 6 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 db/migrate/20190512015442_change_firmware_hardware_default_value.rb diff --git a/app/models/fbos_config.rb b/app/models/fbos_config.rb index 4a453d12a..f1fc2bf9e 100644 --- a/app/models/fbos_config.rb +++ b/app/models/fbos_config.rb @@ -6,6 +6,7 @@ class FbosConfig < ApplicationRecord after_save :maybe_sync_nerves, on: [:create, :update] FIRMWARE_HARDWARE = [ + NONE = "none", ARDUINO = "arduino", FARMDUINO = "farmduino", FARMDUINO_K14 = "farmduino_k14", diff --git a/app/mutations/devices/seeders/abstract_seeder.rb b/app/mutations/devices/seeders/abstract_seeder.rb index b1acff3fc..09d017086 100644 --- a/app/mutations/devices/seeders/abstract_seeder.rb +++ b/app/mutations/devices/seeders/abstract_seeder.rb @@ -61,13 +61,15 @@ module Devices # * Disable the behavior in production ENVs # * Put this code back in the main array when v8 is released. # SEQUENCES ============================== - COMMAND_ORDER += [:sequences_tool_error, - :sequences_mount_tool, - :sequences_pick_up_seed, - :sequences_plant_seed, - :sequences_take_photo_of_plant, - :sequences_unmount_tool, - :sequences_water_plant] + [:sequences_tool_error, + :sequences_mount_tool, + :sequences_pick_up_seed, + :sequences_plant_seed, + :sequences_take_photo_of_plant, + :sequences_unmount_tool, + :sequences_water_plant].map do |x| + COMMAND_ORDER.push(x) + end end def initialize(device) diff --git a/db/migrate/20190512015442_change_firmware_hardware_default_value.rb b/db/migrate/20190512015442_change_firmware_hardware_default_value.rb new file mode 100644 index 000000000..09b2294ed --- /dev/null +++ b/db/migrate/20190512015442_change_firmware_hardware_default_value.rb @@ -0,0 +1,5 @@ +class ChangeFirmwareHardwareDefaultValue < ActiveRecord::Migration[5.2] + def change + change_column_default(:fbos_configs, :firmware_hardware, from: "arduino", to: "none") + end +end diff --git a/db/structure.sql b/db/structure.sql index c64dc71fe..4c4d4033c 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -5,6 +5,7 @@ SET client_encoding = 'UTF8'; SET standard_conforming_strings = on; SELECT pg_catalog.set_config('search_path', '', false); SET check_function_bodies = false; +SET xmloption = content; SET client_min_messages = warning; SET row_security = off; @@ -2963,6 +2964,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20190419174811'), ('20190501143201'), ('20190502163453'), -('20190504170018'); +('20190504170018'), +('20190512015442'); diff --git a/spec/controllers/api/configs/fbos_configs_controller_spec.rb b/spec/controllers/api/configs/fbos_configs_controller_spec.rb index 690a1d5f1..f8dbdd03d 100644 --- a/spec/controllers/api/configs/fbos_configs_controller_spec.rb +++ b/spec/controllers/api/configs/fbos_configs_controller_spec.rb @@ -26,7 +26,7 @@ describe Api::FbosConfigsController do arduino_debug_messages: false, network_not_found_timer: nil, os_auto_update: true, - firmware_hardware: "arduino", + firmware_hardware: "none", api_migrated: true }.to_a.map do |key, value| actual = json[key] diff --git a/spec/models/fbos_config_spec.rb b/spec/models/fbos_config_spec.rb index 53913052a..38a50856a 100644 --- a/spec/models/fbos_config_spec.rb +++ b/spec/models/fbos_config_spec.rb @@ -40,4 +40,8 @@ describe FbosConfig do config.update_attributes!(update_channel: "beta") end end + + it "has default firmware_hardware" do + expect(FbosConfig.create!.firmware_hardware).to eq("none") + end end