Merge pull request #1195 from RickCarlino/tues

Capitalization fixes for `device.name`

app/mailers/fatal_error_mailer.rb

@@ -13,7 +13,7 @@ class FatalErrorMailer < ApplicationMailer
                       .map{|(t,m)| [t.in_time_zone(device.timezone || "UTC"), m] }
                       .map{|(x,y)| "[#{x}]: #{y}"}
                       .join("\n\n")
-      @device_name = device.name || "Farmbot"
+      @device_name = device.name || "FarmBot"
       mail(to: @emails, subject: "🚨 New error reported by #{@device_name}!")
       @logs.update_all(sent_at: Time.now)
     end

app/mutations/devices/create.rb

@@ -12,7 +12,7 @@ module Devices
 
     def execute
       merge_default_values
-      device = Device.create!({ name: "Farmbot" }.merge(inputs.except(:user)))
+      device = Device.create!({ name: "FarmBot" }.merge(inputs.except(:user)))
       Alerts::Create.run!(Alert::SEED_DATA.merge(device: device))
       Alerts::Create.run!(Alert::TOUR.merge(device: device))
       Alerts::Create.run!(Alert::USER.merge(device: device))
@@ -34,7 +34,7 @@ module Devices
     private
 
     def merge_default_values
-      inputs[:name] ||= "Farmbot"
+      inputs[:name] ||= "FarmBot"
     end
   end
 end

db/migrate/20190515205442_update_a_few_column_defaults_again.rb

@@ -0,0 +1,5 @@
+class UpdateAFewColumnDefaultsAgain < ActiveRecord::Migration[5.2]
+  def change
+    change_column_default(:devices, :name, from: "Farmbot", to: "FarmBot")
+  end
+end

db/structure.sql

@@ -194,7 +194,7 @@ ALTER SEQUENCE public.delayed_jobs_id_seq OWNED BY public.delayed_jobs.id;
 
 CREATE TABLE public.devices (
     id integer NOT NULL,
-    name character varying DEFAULT 'Farmbot'::character varying,
+    name character varying DEFAULT 'FarmBot'::character varying,
     max_log_count integer DEFAULT 1000,
     max_images_count integer DEFAULT 100,
     timezone character varying(280),
@@ -2967,6 +2967,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20190504170018'),
 ('20190512015442'),
 ('20190513221836'),
-('20190515185612');
+('20190515185612'),
+('20190515205442');
 
 

spec/controllers/api/devices/devices_controller_create_spec.rb

@@ -1,24 +1,30 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Api::DevicesController do
-
   include Devise::Test::ControllerHelpers
 
-  describe '#create' do
-
+  describe "#create" do
     let!(:user) { FactoryBot.create(:user) }
     let!(:user2) { FactoryBot.create(:user) }
 
-    it 'creates a new device for a user' do
+    it "creates a new device for a user" do
       sign_in user
-      params     = { user_id: user.id, name: Faker::Food.vegetables }
+      params = { user_id: user.id, name: Faker::Food.vegetables }
       post :create, params: params
       expect(response.status).to eq(200)
-      resp       = JSON.parse(response.body)
-      new_device = Device.find(resp['id'])
+      resp = JSON.parse(response.body)
+      new_device = Device.find(resp["id"])
       user.reload
       expect(user.device).to eq(new_device)
       expect(response.status).to eq(200)
     end
+
+    it "defaults name to `FarmBot`" do
+      sign_in user
+      params = { user_id: user.id }
+      post :create, params: params
+      expect(response.status).to eq(200)
+      expect(json.fetch(:name)).to eq("FarmBot")
+    end
   end
 end