diff --git a/Gemfile b/Gemfile index c232b802c..fd62f4fe3 100755 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,7 @@ group :development, :test do gem "database_cleaner" gem "pry" gem "pry-rails" - gem "factory_girl_rails" + gem "factory_bot_rails" # 4.8.0 gem "faker" gem "smarf_doc", git: "https://github.com/RickCarlino/smarf_doc.git" gem "rails-erd" diff --git a/Gemfile.lock b/Gemfile.lock index 4ec0478bb..fcd006d91 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,10 +93,10 @@ GEM erubi (1.6.1) eventmachine (1.2.5) excon (0.59.0) - factory_girl (4.8.0) + factory_bot (4.8.2) activesupport (>= 3.0.0) - factory_girl_rails (4.8.0) - factory_girl (~> 4.8.0) + factory_bot_rails (4.8.2) + factory_bot (~> 4.8.2) railties (>= 3.0.0) faker (1.8.4) i18n (~> 0.5) @@ -268,7 +268,7 @@ DEPENDENCIES delayed_job delayed_job_active_record devise - factory_girl_rails + factory_bot_rails faker figaro fog-google! diff --git a/config/application.rb b/config/application.rb index 07642e9ae..f6e8fcb17 100755 --- a/config/application.rb +++ b/config/application.rb @@ -13,10 +13,10 @@ module FarmBot I18n.enforce_available_locales = false config.generators do |g| g.template_engine :erb - g.test_framework :rspec, :fixture_replacement => :factory_girl, :views => false, :helper => false + g.test_framework :rspec, :fixture_replacement => :factory_bot, :views => false, :helper => false g.view_specs false g.helper_specs false - g.fixture_replacement :factory_girl, :dir => 'spec/factories' + g.fixture_replacement :factory_bot, :dir => 'spec/factories' end config.autoload_paths << Rails.root.join('lib') config.autoload_paths << Rails.root.join('lib/sequence_migrations') diff --git a/db/seeds.rb b/db/seeds.rb index 2aa5fb7f0..02e68a41a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -25,7 +25,7 @@ unless Rails.env == "production" u = User.last u.update_attributes(confirmed_at: Time.now) Log.transaction do - FactoryGirl.create_list(:log, 35, device: u.device) + FactoryBot.create_list(:log, 35, device: u.device) end [ "https://via.placeholder.com/350x250?text=Image%20Zero", "https://i.imgur.com/XvFBGA4.jpg", diff --git a/spec/controllers/api/bot_auth_spec.rb b/spec/controllers/api/bot_auth_spec.rb index 3ee7ec293..17a0089d8 100644 --- a/spec/controllers/api/bot_auth_spec.rb +++ b/spec/controllers/api/bot_auth_spec.rb @@ -5,7 +5,7 @@ describe Api::FarmEventsController do describe 'Bot authentication' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } let(:device) { user.device } it 'tells you why you failed to auth' do diff --git a/spec/controllers/api/devices/devices_controller_create_spec.rb b/spec/controllers/api/devices/devices_controller_create_spec.rb index 3b98b64a7..ae6de6a9c 100644 --- a/spec/controllers/api/devices/devices_controller_create_spec.rb +++ b/spec/controllers/api/devices/devices_controller_create_spec.rb @@ -6,8 +6,8 @@ describe Api::DevicesController do describe '#create' do - let!(:user) { FactoryGirl.create(:user) } - let!(:user2) { FactoryGirl.create(:user) } + let!(:user) { FactoryBot.create(:user) } + let!(:user2) { FactoryBot.create(:user) } it 'creates a new device for a user' do sign_in user diff --git a/spec/controllers/api/devices/devices_controller_destroy_spec.rb b/spec/controllers/api/devices/devices_controller_destroy_spec.rb index 75df253d2..996fd35c1 100644 --- a/spec/controllers/api/devices/devices_controller_destroy_spec.rb +++ b/spec/controllers/api/devices/devices_controller_destroy_spec.rb @@ -6,7 +6,7 @@ describe Api::DevicesController do describe '#destroy' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } it 'destroys a Device' do sign_in user diff --git a/spec/controllers/api/devices/devices_controller_index_spec.rb b/spec/controllers/api/devices/devices_controller_index_spec.rb index e39b913c7..d5034bdc5 100644 --- a/spec/controllers/api/devices/devices_controller_index_spec.rb +++ b/spec/controllers/api/devices/devices_controller_index_spec.rb @@ -6,7 +6,7 @@ describe Api::DevicesController do describe '#show' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } it 'returns all the users devices, as JSON' do sign_in user diff --git a/spec/controllers/api/devices/devices_controller_show_spec.rb b/spec/controllers/api/devices/devices_controller_show_spec.rb index 463e64d7e..a390af909 100644 --- a/spec/controllers/api/devices/devices_controller_show_spec.rb +++ b/spec/controllers/api/devices/devices_controller_show_spec.rb @@ -4,7 +4,7 @@ describe Api::DevicesController do include Devise::Test::ControllerHelpers - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } describe '#show' do it 'handles deviceless requests' do diff --git a/spec/controllers/api/devices/devices_controller_update_spec.rb b/spec/controllers/api/devices/devices_controller_update_spec.rb index dc4243fb5..8b2a7397e 100644 --- a/spec/controllers/api/devices/devices_controller_update_spec.rb +++ b/spec/controllers/api/devices/devices_controller_update_spec.rb @@ -8,8 +8,8 @@ describe Api::DevicesController do describe '#update' do - let(:user) { FactoryGirl.create(:user) } - let(:user2) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } + let(:user2) { FactoryBot.create(:user) } it 'updates a Device' do sign_in user diff --git a/spec/controllers/api/farm_events/farm_events_create_spec.rb b/spec/controllers/api/farm_events/farm_events_create_spec.rb index fd5c4d582..269b0a62e 100644 --- a/spec/controllers/api/farm_events/farm_events_create_spec.rb +++ b/spec/controllers/api/farm_events/farm_events_create_spec.rb @@ -4,9 +4,9 @@ describe Api::FarmEventsController do include Devise::Test::ControllerHelpers describe '#create' do - let(:user) { FactoryGirl.create(:user) } - let(:sequence) { FactoryGirl.create(:sequence) } - let(:regimen) { FactoryGirl.create(:regimen, device: user.device) } + let(:user) { FactoryBot.create(:user) } + let(:sequence) { FactoryBot.create(:sequence) } + let(:regimen) { FactoryBot.create(:regimen, device: user.device) } it 'makes a farm_event' do sign_in user @@ -37,7 +37,7 @@ describe Api::FarmEventsController do it 'creates a one-off FarmEvent' do sign_in user - r = FactoryGirl.create(:regimen, device: user.device) + r = FactoryBot.create(:regimen, device: user.device) input = { "start_time": (Time.now + 1.hour).to_json.gsub("\"", ""), "next_time": "2017-06-05T18:33:04.342Z", "time_unit": "never", @@ -53,7 +53,7 @@ describe Api::FarmEventsController do it 'disallows FarmEvents too far in the past' do sign_in user - r = FactoryGirl.create(:regimen, device: user.device) + r = FactoryBot.create(:regimen, device: user.device) input = { "start_time": (Time.now - 40.years).as_json, "time_unit": "never", "executable_id": r.id, @@ -67,7 +67,7 @@ describe Api::FarmEventsController do it 'disallows FarmEvents too far in the future' do sign_in user - r = FactoryGirl.create(:regimen, device: user.device) + r = FactoryBot.create(:regimen, device: user.device) input = { "end_time": "+099999-08-18T13:54:00.000Z", "time_unit": "never", "executable_id": r.id, diff --git a/spec/controllers/api/farm_events/farm_events_destroy_spec.rb b/spec/controllers/api/farm_events/farm_events_destroy_spec.rb index 98bb17176..aa3db87c2 100644 --- a/spec/controllers/api/farm_events/farm_events_destroy_spec.rb +++ b/spec/controllers/api/farm_events/farm_events_destroy_spec.rb @@ -4,11 +4,11 @@ describe Api::FarmEventsController do include Devise::Test::ControllerHelpers describe '#destroy' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } it 'deletes a farm_event' do sign_in user - farm_event = FactoryGirl.create(:farm_event, device: user.device) + farm_event = FactoryBot.create(:farm_event, device: user.device) before = FarmEvent.count delete :destroy, params: { id: farm_event.id } @@ -18,7 +18,7 @@ describe Api::FarmEventsController do it 'prevents unauthorized deletion' do sign_in user - farm_event = FactoryGirl.create(:farm_event) + farm_event = FactoryBot.create(:farm_event) delete :destroy, params: { id: farm_event.id } before = FarmEvent.count diff --git a/spec/controllers/api/farm_events/farm_events_index_spec.rb b/spec/controllers/api/farm_events/farm_events_index_spec.rb index db0d548bd..b969bd97c 100644 --- a/spec/controllers/api/farm_events/farm_events_index_spec.rb +++ b/spec/controllers/api/farm_events/farm_events_index_spec.rb @@ -5,12 +5,12 @@ describe Api::FarmEventsController do describe '#index' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } it 'lists all farm_events for a user' do sign_in user - farm_events = FactoryGirl.create_list(:farm_event, 2, device_id: user.device.id) + farm_events = FactoryBot.create_list(:farm_event, 2, device_id: user.device.id) farm_event_ids = user.device.farm_events .map(&:id) .sort @@ -22,7 +22,7 @@ describe Api::FarmEventsController do it 'cleans up old farm events' do sign_in user - farm_events = FactoryGirl.create_list(:farm_event, + farm_events = FactoryBot.create_list(:farm_event, 2, device_id: user.device.id, end_time: Date.yesterday - 1.day) diff --git a/spec/controllers/api/farm_events/farm_events_update_spec.rb b/spec/controllers/api/farm_events/farm_events_update_spec.rb index 540aee1db..490b21836 100644 --- a/spec/controllers/api/farm_events/farm_events_update_spec.rb +++ b/spec/controllers/api/farm_events/farm_events_update_spec.rb @@ -4,11 +4,11 @@ describe Api::FarmEventsController do include Devise::Test::ControllerHelpers describe '#update' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } it 'allows authorized modification' do sign_in user - id = FactoryGirl.create(:farm_event, device: user.device).id + id = FactoryBot.create(:farm_event, device: user.device).id input = { id: id, farm_event: { repeat: 66 } } patch :update, params: input expect(response.status).to eq(200) @@ -16,7 +16,7 @@ describe Api::FarmEventsController do it 'prevents unauthorized modification' do sign_in user - id = FactoryGirl.create(:farm_event).id + id = FactoryBot.create(:farm_event).id input = { id: id, repeat: 66 } patch :update, params: input expect(response.status).to eq(403) @@ -25,7 +25,7 @@ describe Api::FarmEventsController do it 'sets end_time to self.start_time if no start_time is passed in' do sign_in user - id = FactoryGirl.create(:farm_event, device: user.device).id + id = FactoryBot.create(:farm_event, device: user.device).id patch :update, params: { id: id, repeat: 1, time_unit: FarmEvent::NEVER } @@ -37,7 +37,7 @@ describe Api::FarmEventsController do it 'disallows start/end times that are outside of a 20 year window' do sign_in user - id = FactoryGirl.create(:farm_event, device: user.device).id + id = FactoryBot.create(:farm_event, device: user.device).id patch :update, params: { id: id, end_time: "+045633-08-18T13:25:00.000Z" } expect(response.status).to eq(422) diff --git a/spec/controllers/api/images/images_spec.rb b/spec/controllers/api/images/images_spec.rb index 9fcb56827..da387ecb0 100644 --- a/spec/controllers/api/images/images_spec.rb +++ b/spec/controllers/api/images/images_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe Api::ImagesController do include Devise::Test::ControllerHelpers - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } describe '#index' do it 'shows only the max images allowed' do @@ -10,7 +10,7 @@ describe Api::ImagesController do device = user.device # Using the *real* value (10) was super slow (~30 seconds) device.update_attributes!(max_images_count: 1) - FactoryGirl.create_list(:image, 2, device: user.device) + FactoryBot.create_list(:image, 2, device: user.device) get :index expect(response.status).to eq(200) expect(json.length).to eq(device.max_images_count) @@ -21,7 +21,7 @@ describe Api::ImagesController do describe '#show' do it 'shows image meta data' do sign_in user - image = FactoryGirl.create(:image, device: user.device) + image = FactoryBot.create(:image, device: user.device) get :show, params: { id: image.id } expect(response.status).to eq(200) expect(json[:id]).to eq(image.id) @@ -53,7 +53,7 @@ describe Api::ImagesController do describe '#delete' do it 'deletes an image' do sign_in user - image = FactoryGirl.create(:image, device: user.device) + image = FactoryBot.create(:image, device: user.device) before_count = Image.count run_jobs_now do delete :destroy, params: { id: image.id } diff --git a/spec/controllers/api/logs/logs_spec.rb b/spec/controllers/api/logs/logs_spec.rb index f5c963fd3..c8bbba744 100644 --- a/spec/controllers/api/logs/logs_spec.rb +++ b/spec/controllers/api/logs/logs_spec.rb @@ -3,8 +3,8 @@ JSON_EXAMPLE = File.read("spec/controllers/api/logs/connor_fixture.json") describe Api::LogsController do include Devise::Test::ControllerHelpers - let(:user) { FactoryGirl.create(:user) } - let!(:logs) { FactoryGirl.create_list(:log, 5, device: user.device) } + let(:user) { FactoryBot.create(:user) } + let!(:logs) { FactoryBot.create_list(:log, 5, device: user.device) } describe '#index' do it 'lists last x logs' do diff --git a/spec/controllers/api/password_resets/password_resets_spec.rb b/spec/controllers/api/password_resets/password_resets_spec.rb index d27c648d0..855fafd21 100644 --- a/spec/controllers/api/password_resets/password_resets_spec.rb +++ b/spec/controllers/api/password_resets/password_resets_spec.rb @@ -3,7 +3,7 @@ describe Api::PasswordResetsController do include Devise::Test::ControllerHelpers describe '#create' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } it 'resets password for a user' do params = { email: user.email } diff --git a/spec/controllers/api/peripherals/peripherals_create_spec.rb b/spec/controllers/api/peripherals/peripherals_create_spec.rb index fd2d76fee..df8dc6c73 100644 --- a/spec/controllers/api/peripherals/peripherals_create_spec.rb +++ b/spec/controllers/api/peripherals/peripherals_create_spec.rb @@ -4,7 +4,7 @@ describe Api::PeripheralsController do include Devise::Test::ControllerHelpers describe '#create' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } it 'makes a Peripheral' do sign_in user diff --git a/spec/controllers/api/peripherals/peripherals_destroy_spec.rb b/spec/controllers/api/peripherals/peripherals_destroy_spec.rb index 139a900ed..2b543127e 100644 --- a/spec/controllers/api/peripherals/peripherals_destroy_spec.rb +++ b/spec/controllers/api/peripherals/peripherals_destroy_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe Api::PeripheralsController do include Devise::Test::ControllerHelpers describe '#destroy' do - let(:user) { FactoryGirl.create(:user) } - let(:peripheral) { FactoryGirl.create(:peripheral, device: user.device) } - + let(:user) { FactoryBot.create(:user) } + let(:peripheral) { FactoryBot.create(:peripheral, device: user.device) } + it 'deletes a Peripheral' do sign_in user peripheral @@ -17,7 +17,7 @@ describe Api::PeripheralsController do it 'prevents unauthorized deletion' do sign_in user - peripheral = FactoryGirl.create(:peripheral) + peripheral = FactoryBot.create(:peripheral) delete :destroy, params: { id: peripheral.id } before = Peripheral.count expect(response.status).to eq(403) diff --git a/spec/controllers/api/peripherals/peripherals_index_spec.rb b/spec/controllers/api/peripherals/peripherals_index_spec.rb index e9e28f19b..74bc90e9e 100644 --- a/spec/controllers/api/peripherals/peripherals_index_spec.rb +++ b/spec/controllers/api/peripherals/peripherals_index_spec.rb @@ -5,12 +5,12 @@ describe Api::PeripheralsController do describe '#index' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } it 'lists all Peripherals for a user' do sign_in user - peripherals = FactoryGirl.create_list(:peripheral, 2, device_id: user.device.id) + peripherals = FactoryBot.create_list(:peripheral, 2, device_id: user.device.id) peripheral_ids = user.device.peripherals .map(&:id) .sort diff --git a/spec/controllers/api/peripherals/peripherals_update_spec.rb b/spec/controllers/api/peripherals/peripherals_update_spec.rb index 3c84cb09d..a458fa1d9 100644 --- a/spec/controllers/api/peripherals/peripherals_update_spec.rb +++ b/spec/controllers/api/peripherals/peripherals_update_spec.rb @@ -4,11 +4,11 @@ # include Devise::Test::ControllerHelpers # describe '#update' do -# let(:user) { FactoryGirl.create(:user) } +# let(:user) { FactoryBot.create(:user) } # it 'allows authorized modification' do # sign_in user -# id = FactoryGirl.create(:peripheral, device: user.device).id +# id = FactoryBot.create(:peripheral, device: user.device).id # input = { id: id, pin: 9 } # patch :update, input # expect(response.status).to eq(200) @@ -17,7 +17,7 @@ # it 'prevents unauthorized modification' do # sign_in user -# id = FactoryGirl.create(:peripheral).id +# id = FactoryBot.create(:peripheral).id # input = { id: id, pin: 9 } # patch :update, input # expect(response.status).to eq(403) diff --git a/spec/controllers/api/points/create_spec.rb b/spec/controllers/api/points/create_spec.rb index 8f873f056..d71df4c57 100644 --- a/spec/controllers/api/points/create_spec.rb +++ b/spec/controllers/api/points/create_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Api::PointsController do include Devise::Test::ControllerHelpers describe '#create' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } let(:device) { user.device } it 'creates a tool slot' do diff --git a/spec/controllers/api/points/destroy_spec.rb b/spec/controllers/api/points/destroy_spec.rb index 6c6c225e6..8a0d79e03 100644 --- a/spec/controllers/api/points/destroy_spec.rb +++ b/spec/controllers/api/points/destroy_spec.rb @@ -10,9 +10,9 @@ describe Api::PointsController do "offset":{ "kind":"coordinate", "args":{ "x":0, "y":0, "z":0 } }, "speed":800}}] HEREDOC - let(:device) { FactoryGirl.create(:device) } - let(:user) { FactoryGirl.create(:user, device: device) } - let!(:point) { FactoryGirl.create(:point, device: device) } + let(:device) { FactoryBot.create(:device) } + let(:user) { FactoryBot.create(:user, device: device) } + let!(:point) { FactoryBot.create(:point, device: device) } let(:plant) { Point.create!(x: 10, y: 20, @@ -58,7 +58,7 @@ describe Api::PointsController do it 'performs batch deletion' do sign_in user - points = FactoryGirl.create_list(:point, 6, device: user.device) + points = FactoryBot.create_list(:point, 6, device: user.device) before_count = Point.count delete :destroy, params: { id: points.map(&:id).join(",") } expect(Point.count).to eq(before_count - 6) diff --git a/spec/controllers/api/points/index_spec.rb b/spec/controllers/api/points/index_spec.rb index aa7916a94..59b62885a 100644 --- a/spec/controllers/api/points/index_spec.rb +++ b/spec/controllers/api/points/index_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe Api::PointsController do include Devise::Test::ControllerHelpers describe '#index' do - let(:device) { FactoryGirl.create(:device) } + let(:device) { FactoryBot.create(:device) } let(:user) do - FactoryGirl.create(:user, device: device, password: "password123") + FactoryBot.create(:user, device: device, password: "password123") end let(:auth_token) do Auth::CreateToken @@ -14,7 +14,7 @@ describe Api::PointsController do it 'lists points' do sign_in user - FactoryGirl.create_list(:point, 3, device: device) + FactoryBot.create_list(:point, 3, device: device) get :index expect(response.status).to eq(200) expect(json.length).to eq(3) @@ -57,7 +57,7 @@ describe Api::PointsController do allow(request).to receive(:user_agent).and_return(ua) request.env["HTTP_USER_AGENT"] = ua sign_in user - FactoryGirl.create_list(:point, 1, device: device) + FactoryBot.create_list(:point, 1, device: device) get :index expect(response.status).to eq(426) expect(json[:error]).to include("Upgrade to latest FarmBot OS") @@ -69,7 +69,7 @@ describe Api::PointsController do allow(request).to receive(:user_agent).and_return(ua) request.env["HTTP_USER_AGENT"] = ua request.headers["Authorization"] = "bearer #{auth_token}" - FactoryGirl.create_list(:point, 1, device: device) + FactoryBot.create_list(:point, 1, device: device) get :index new_last_saw_api = user.device.reload.last_saw_api expect(response.status).to eq(200) diff --git a/spec/controllers/api/points/search_spec.rb b/spec/controllers/api/points/search_spec.rb index 48b15ce7f..bef30a8f6 100644 --- a/spec/controllers/api/points/search_spec.rb +++ b/spec/controllers/api/points/search_spec.rb @@ -3,13 +3,13 @@ require 'spec_helper' describe Api::PointsController do include Devise::Test::ControllerHelpers describe '#search' do - let(:device) { FactoryGirl.create(:device) } - let(:user) { FactoryGirl.create(:user, device: device) } + let(:device) { FactoryBot.create(:device) } + let(:user) { FactoryBot.create(:user, device: device) } it 'queries points' do sign_in user - FactoryGirl.create(:point, device: device, meta: {foo1: 1}) - FactoryGirl.create(:point, device: device, meta: {bar2: 2}) + FactoryBot.create(:point, device: device, meta: {foo1: 1}) + FactoryBot.create(:point, device: device, meta: {bar2: 2}) post :search, body: {meta: {foo1: 1}}.to_json, params: {format: :json } @@ -21,8 +21,8 @@ describe Api::PointsController do it 'queries fields other than meta' do sign_in user - FactoryGirl.create(:point, device: device, x: 23) - FactoryGirl.create(:point, device: device, x: 98) + FactoryBot.create(:point, device: device, x: 23) + FactoryBot.create(:point, device: device, x: 98) post :search, body: {x: 23}.to_json, params: {format: :json } expect(response.status).to eq(200) expect(json.length).to eq(1) diff --git a/spec/controllers/api/points/show_spec.rb b/spec/controllers/api/points/show_spec.rb index 9705156ab..e7c735f42 100644 --- a/spec/controllers/api/points/show_spec.rb +++ b/spec/controllers/api/points/show_spec.rb @@ -4,7 +4,7 @@ describe Api::PointsController do include Devise::Test::ControllerHelpers describe("#show") do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } let(:device) { user.device } it 'renders a tool slot' do diff --git a/spec/controllers/api/points/update_spec.rb b/spec/controllers/api/points/update_spec.rb index 493f19e03..46fd543ad 100644 --- a/spec/controllers/api/points/update_spec.rb +++ b/spec/controllers/api/points/update_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe Api::PointsController do include Devise::Test::ControllerHelpers describe '#update' do - let(:device) { FactoryGirl.create(:device) } - let(:user) { FactoryGirl.create(:user, device: device) } - let!(:point) { FactoryGirl.create(:point, device: device) } + let(:device) { FactoryBot.create(:device) } + let(:user) { FactoryBot.create(:user, device: device) } + let!(:point) { FactoryBot.create(:point, device: device) } it 'updates a point' do sign_in user diff --git a/spec/controllers/api/regimens/regimens_create_spec.rb b/spec/controllers/api/regimens/regimens_create_spec.rb index d222b60d7..6a6f87256 100644 --- a/spec/controllers/api/regimens/regimens_create_spec.rb +++ b/spec/controllers/api/regimens/regimens_create_spec.rb @@ -5,12 +5,12 @@ describe Api::RegimensController do include Devise::Test::ControllerHelpers describe '#create' do - let(:user) { FactoryGirl.create(:user) } - let(:sequence) { FactoryGirl.create(:sequence, device: user.device) } + let(:user) { FactoryBot.create(:user) } + let(:sequence) { FactoryBot.create(:sequence, device: user.device) } it 'creates a new regimen' do sign_in user color = %w(blue green yellow orange purple pink gray red).sample - + name = (1..3).map{ Faker::Pokemon.name }.join(" ") payload = { name: name, diff --git a/spec/controllers/api/regimens/regimens_destroy_spec.rb b/spec/controllers/api/regimens/regimens_destroy_spec.rb index 8474f3c8b..3bc032fc6 100644 --- a/spec/controllers/api/regimens/regimens_destroy_spec.rb +++ b/spec/controllers/api/regimens/regimens_destroy_spec.rb @@ -3,8 +3,8 @@ describe Api::RegimensController do include Devise::Test::ControllerHelpers describe '#index' do - let(:user) { FactoryGirl.create(:user) } - let!(:regimen) { FactoryGirl.create(:regimen, device: user.device) } + let(:user) { FactoryBot.create(:user) } + let!(:regimen) { FactoryBot.create(:regimen, device: user.device) } it 'retrieves all regimina' do sign_in user diff --git a/spec/controllers/api/regimens/regimens_spec.rb b/spec/controllers/api/regimens/regimens_spec.rb index d7ad81ebf..608ef59af 100644 --- a/spec/controllers/api/regimens/regimens_spec.rb +++ b/spec/controllers/api/regimens/regimens_spec.rb @@ -5,7 +5,7 @@ describe Api::RegimensController do include Devise::Test::ControllerHelpers describe '#index' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } it 'retrieves all regimina' do regimen = Regimen.create!(name: SecureRandom.hex, device: user.device) @@ -18,7 +18,7 @@ describe Api::RegimensController do it 'doesnt fetch other peoples regimens' do regimen = Regimen.create!(name: SecureRandom.hex, device: user.device) - other_person = FactoryGirl.create(:user) + other_person = FactoryBot.create(:user) sign_in other_person process :index, method: :get expect(response.status).to eq(200) diff --git a/spec/controllers/api/regimens/regimens_update_spec.rb b/spec/controllers/api/regimens/regimens_update_spec.rb index cc18567c2..9a91a859a 100644 --- a/spec/controllers/api/regimens/regimens_update_spec.rb +++ b/spec/controllers/api/regimens/regimens_update_spec.rb @@ -5,8 +5,8 @@ describe Api::RegimensController do include Devise::Test::ControllerHelpers describe '#update' do - let(:user) { FactoryGirl.create(:user) } - let(:sequence) { FactoryGirl.create(:sequence, device: user.device) } + let(:user) { FactoryBot.create(:user) } + let(:sequence) { FactoryBot.create(:sequence, device: user.device) } it 'updates an old regimen' do sign_in user diff --git a/spec/controllers/api/sequences/sequences_create_spec.rb b/spec/controllers/api/sequences/sequences_create_spec.rb index 7c7f3adf7..f96260bd1 100644 --- a/spec/controllers/api/sequences/sequences_create_spec.rb +++ b/spec/controllers/api/sequences/sequences_create_spec.rb @@ -9,7 +9,7 @@ describe Api::SequencesController do include Devise::Test::ControllerHelpers describe '#create' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } let(:nodes) { sequence_body_for(user) } it 'handles a well formed AST in the body attribute' do @@ -77,7 +77,7 @@ describe Api::SequencesController do end it 'tracks Points' do - point = FactoryGirl.create(:point, device: user.device) + point = FactoryBot.create(:point, device: user.device) SequenceDependency.delete_all Sequence.delete_all old_count = SequenceDependency.count diff --git a/spec/controllers/api/sequences/sequences_destroy_spec.rb b/spec/controllers/api/sequences/sequences_destroy_spec.rb index fcf391fd8..f5a7460fd 100644 --- a/spec/controllers/api/sequences/sequences_destroy_spec.rb +++ b/spec/controllers/api/sequences/sequences_destroy_spec.rb @@ -8,9 +8,9 @@ describe Api::SequencesController do include Devise::Test::ControllerHelpers describe '#destroy' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } let(:device) { user.device } - let(:sequence) { FactoryGirl.create(:sequence, device: device) } + let(:sequence) { FactoryBot.create(:sequence, device: device) } it 'destroys a sequence' do sign_in user @@ -23,7 +23,7 @@ describe Api::SequencesController do it 'doesnt destroy other peoples sequence' do sign_in user - other_persons = FactoryGirl.create(:sequence) + other_persons = FactoryBot.create(:sequence) input = { id: other_persons.id } delete :destroy, params: input expect(response.status).to eq(403) diff --git a/spec/controllers/api/sequences/sequences_index_spec.rb b/spec/controllers/api/sequences/sequences_index_spec.rb index c807eb002..cbe9f190f 100644 --- a/spec/controllers/api/sequences/sequences_index_spec.rb +++ b/spec/controllers/api/sequences/sequences_index_spec.rb @@ -9,11 +9,11 @@ describe Api::SequencesController do request.headers["accept"] = 'application/json' end - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } it 'lists all sequences for a user' do sign_in user - sequences = FactoryGirl + sequences = FactoryBot .create_list(:sequence, 2, device: user.device) .map(&:id) .sort diff --git a/spec/controllers/api/sequences/sequences_show_spec.rb b/spec/controllers/api/sequences/sequences_show_spec.rb index 66968d9ce..bdf9c5e39 100644 --- a/spec/controllers/api/sequences/sequences_show_spec.rb +++ b/spec/controllers/api/sequences/sequences_show_spec.rb @@ -9,11 +9,11 @@ describe Api::SequencesController do describe '#show' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } it 'shows sequence' do sign_in user - id = FactoryGirl.create(:sequence, device: user.device).id + id = FactoryBot.create(:sequence, device: user.device).id get :show, params: { id: id } expect(response.status).to eq(200) expect(json[:id]).to eq(id) diff --git a/spec/controllers/api/sequences/sequences_update_spec.rb b/spec/controllers/api/sequences/sequences_update_spec.rb index b3c9d09ac..1fb15782e 100644 --- a/spec/controllers/api/sequences/sequences_update_spec.rb +++ b/spec/controllers/api/sequences/sequences_update_spec.rb @@ -6,13 +6,13 @@ describe Api::SequencesController do describe '#update' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } it 'refreshes sequence dependencies on update' do SequenceDependency.destroy_all old_count = SequenceDependency.count sign_in user - sequence = FactoryGirl.create(:sequence, device: user.device) + sequence = FactoryBot.create(:sequence, device: user.device) input = { id: sequence.id, sequence: { name: "Scare Birds", body: nodes } } @@ -27,7 +27,7 @@ describe Api::SequencesController do it 'updates existing sequences' do sign_in user - sequence = FactoryGirl.create(:sequence, device: user.device) + sequence = FactoryBot.create(:sequence, device: user.device) input = { sequence: { name: "Scare Birds" } } params = { id: sequence.id } patch :update, diff --git a/spec/controllers/api/tokens/tokens_controller_create_spec.rb b/spec/controllers/api/tokens/tokens_controller_create_spec.rb index c9eda010e..df8f076a6 100644 --- a/spec/controllers/api/tokens/tokens_controller_create_spec.rb +++ b/spec/controllers/api/tokens/tokens_controller_create_spec.rb @@ -5,7 +5,7 @@ describe Api::TokensController do include Devise::Test::ControllerHelpers describe '#create' do - let(:user) { FactoryGirl.create(:user, password: "password") } + let(:user) { FactoryBot.create(:user, password: "password") } it 'creates a new token' do payload = {user: {email: user.email, password: "password"}} post :create, params: payload diff --git a/spec/controllers/api/tokens/tokens_controller_show_spec.rb b/spec/controllers/api/tokens/tokens_controller_show_spec.rb index 5a859332c..4b437eac3 100644 --- a/spec/controllers/api/tokens/tokens_controller_show_spec.rb +++ b/spec/controllers/api/tokens/tokens_controller_show_spec.rb @@ -5,7 +5,7 @@ describe Api::TokensController do include Devise::Test::ControllerHelpers describe '#show' do - let(:user) { FactoryGirl.create(:user, password: "password") } + let(:user) { FactoryBot.create(:user, password: "password") } let(:auth_token) { SessionToken.issue_to(user) } it 'creates a new token' do diff --git a/spec/controllers/api/tools/create_spec.rb b/spec/controllers/api/tools/create_spec.rb index 14333f839..1060d4793 100644 --- a/spec/controllers/api/tools/create_spec.rb +++ b/spec/controllers/api/tools/create_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe Api::ToolsController do include Devise::Test::ControllerHelpers describe '#create' do - let(:user) { FactoryGirl.create(:user) } - let(:tool_slot) { FactoryGirl.create(:tool_slot) } + let(:user) { FactoryBot.create(:user) } + let(:tool_slot) { FactoryBot.create(:tool_slot) } it 'creates a new tool' do sign_in user diff --git a/spec/controllers/api/tools/destroy_spec.rb b/spec/controllers/api/tools/destroy_spec.rb index 30302707d..3de7161a8 100644 --- a/spec/controllers/api/tools/destroy_spec.rb +++ b/spec/controllers/api/tools/destroy_spec.rb @@ -3,11 +3,11 @@ require 'spec_helper' describe Api::ToolsController do include Devise::Test::ControllerHelpers describe '#destroy' do - let(:user) { FactoryGirl.create(:user) } - let(:tool_slot) { FactoryGirl.create(:tool_slot) } + let(:user) { FactoryBot.create(:user) } + let(:tool_slot) { FactoryBot.create(:tool_slot) } let!(:tool) { Point.destroy_all - FactoryGirl.create(:tool, + FactoryBot.create(:tool, tool_slot: tool_slot, device: user.device) } diff --git a/spec/controllers/api/tools/index_spec.rb b/spec/controllers/api/tools/index_spec.rb index 675767d4e..d4ec318f4 100644 --- a/spec/controllers/api/tools/index_spec.rb +++ b/spec/controllers/api/tools/index_spec.rb @@ -3,10 +3,10 @@ require 'spec_helper' describe Api::ToolsController do include Devise::Test::ControllerHelpers describe '#index' do - let(:user) { FactoryGirl.create(:user) } - let(:tool_slot) { FactoryGirl.create(:tool_slot) } - let(:tools) { FactoryGirl.create_list(:tool, 1, tool_slot: tool_slot) } - let!(:tools) { FactoryGirl.create_list(:tool, + let(:user) { FactoryBot.create(:user) } + let(:tool_slot) { FactoryBot.create(:tool_slot) } + let(:tools) { FactoryBot.create_list(:tool, 1, tool_slot: tool_slot) } + let!(:tools) { FactoryBot.create_list(:tool, 1, tool_slot: tool_slot, device: user.device) } diff --git a/spec/controllers/api/tools/show_spec.rb b/spec/controllers/api/tools/show_spec.rb index 365472077..a7e04b40c 100644 --- a/spec/controllers/api/tools/show_spec.rb +++ b/spec/controllers/api/tools/show_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe Api::ToolsController do include Devise::Test::ControllerHelpers describe '#show' do - let(:user) { FactoryGirl.create(:user) } - let(:tool_slot) { FactoryGirl.create(:tool_slot) } - let(:tool) { FactoryGirl.create(:tool, + let(:user) { FactoryBot.create(:user) } + let(:tool_slot) { FactoryBot.create(:tool_slot) } + let(:tool) { FactoryBot.create(:tool, tool_slot: tool_slot, device: user.device) } diff --git a/spec/controllers/api/tools/update_spec.rb b/spec/controllers/api/tools/update_spec.rb index 0c211ad95..c982de69b 100644 --- a/spec/controllers/api/tools/update_spec.rb +++ b/spec/controllers/api/tools/update_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe Api::ToolsController do include Devise::Test::ControllerHelpers describe '#update' do - let(:user) { FactoryGirl.create(:user) } - let(:tool_slot) { FactoryGirl.create(:tool_slot) } - let!(:tool) { FactoryGirl.create(:tool, + let(:user) { FactoryBot.create(:user) } + let(:tool_slot) { FactoryBot.create(:tool_slot) } + let!(:tool) { FactoryBot.create(:tool, tool_slot: tool_slot, device: user.device) } diff --git a/spec/controllers/api/users/users_controller_spec.rb b/spec/controllers/api/users/users_controller_spec.rb index 367e965ab..532c3dea9 100644 --- a/spec/controllers/api/users/users_controller_spec.rb +++ b/spec/controllers/api/users/users_controller_spec.rb @@ -10,7 +10,7 @@ BIG_WARNING = <<~HEREDOC HEREDOC describe Api::UsersController do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } include Devise::Test::ControllerHelpers it 'errors if you try to delete with the wrong password' do sign_in user diff --git a/spec/controllers/api/users/verification_spec.rb b/spec/controllers/api/users/verification_spec.rb index bce739ac2..1d2386947 100644 --- a/spec/controllers/api/users/verification_spec.rb +++ b/spec/controllers/api/users/verification_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Api::UsersController do - let(:user) { FactoryGirl.create(:user, confirmed_at: nil) } + let(:user) { FactoryBot.create(:user, confirmed_at: nil) } include Devise::Test::ControllerHelpers it 'creates a new user' do diff --git a/spec/controllers/api/webcam_feeds/create_spec.rb b/spec/controllers/api/webcam_feeds/create_spec.rb index 4c98e9775..f911f7a85 100644 --- a/spec/controllers/api/webcam_feeds/create_spec.rb +++ b/spec/controllers/api/webcam_feeds/create_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Api::WebcamFeedsController do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } include Devise::Test::ControllerHelpers it 'creates a webcam feed' do diff --git a/spec/controllers/api/webcam_feeds/destroy_spec.rb b/spec/controllers/api/webcam_feeds/destroy_spec.rb index 1a66d9f11..0887d21a9 100644 --- a/spec/controllers/api/webcam_feeds/destroy_spec.rb +++ b/spec/controllers/api/webcam_feeds/destroy_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Api::WebcamFeedsController do include Devise::Test::ControllerHelpers describe '#destroy' do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } it 'destroy a webcam feed' do sign_in user diff --git a/spec/controllers/api/webcam_feeds/index_spec.rb b/spec/controllers/api/webcam_feeds/index_spec.rb index 499714b33..c34a5fa19 100644 --- a/spec/controllers/api/webcam_feeds/index_spec.rb +++ b/spec/controllers/api/webcam_feeds/index_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Api::WebcamFeedsController do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } include Devise::Test::ControllerHelpers it 'shows webcam feeds' do diff --git a/spec/controllers/api/webcam_feeds/show_spec.rb b/spec/controllers/api/webcam_feeds/show_spec.rb index 04c4b73d4..732df4c00 100644 --- a/spec/controllers/api/webcam_feeds/show_spec.rb +++ b/spec/controllers/api/webcam_feeds/show_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Api::WebcamFeedsController do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } include Devise::Test::ControllerHelpers it 'shows webcam feeds' do diff --git a/spec/controllers/api/webcam_feeds/update_spec.rb b/spec/controllers/api/webcam_feeds/update_spec.rb index 0e27888ca..cddcd9924 100644 --- a/spec/controllers/api/webcam_feeds/update_spec.rb +++ b/spec/controllers/api/webcam_feeds/update_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Api::WebcamFeedsController do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } include Devise::Test::ControllerHelpers it 'updates a webcam feed URL' do diff --git a/spec/factories/devices.rb b/spec/factories/devices.rb index 25a370409..fb9acb7a9 100644 --- a/spec/factories/devices.rb +++ b/spec/factories/devices.rb @@ -1,7 +1,7 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot require 'securerandom' -FactoryGirl.define do +FactoryBot.define do factory :device do name { Haikunator.haikunate(1000) } webcam_url { Faker::Company.logo } diff --git a/spec/factories/farm_event.rb b/spec/factories/farm_event.rb index 6bbc9df97..132f8b0b7 100644 --- a/spec/factories/farm_event.rb +++ b/spec/factories/farm_event.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :farm_event do start_time { Date.yesterday - [*(1..5)].sample.days } end_time { Date.today + 1.minute + ([*(1..5)].sample).days } diff --git a/spec/factories/images.rb b/spec/factories/images.rb index e556a4bf9..e39333977 100644 --- a/spec/factories/images.rb +++ b/spec/factories/images.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :image do attachment File.open("./spec/fixture.jpg") meta ({x: 1, y: 2, z: 3}) diff --git a/spec/factories/log_dispatches.rb b/spec/factories/log_dispatches.rb index f4ba80e2c..98fa9d2ed 100644 --- a/spec/factories/log_dispatches.rb +++ b/spec/factories/log_dispatches.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :log_dispatch do device log diff --git a/spec/factories/logs.rb b/spec/factories/logs.rb index 94b3e9beb..7bcd1e175 100644 --- a/spec/factories/logs.rb +++ b/spec/factories/logs.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :log do device sequence(:created_at) { |n| n.minutes.ago.utc } diff --git a/spec/factories/peripherals.rb b/spec/factories/peripherals.rb index 41ad464a3..0d8050e60 100644 --- a/spec/factories/peripherals.rb +++ b/spec/factories/peripherals.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :peripheral do device pin { rand(1..540) } diff --git a/spec/factories/plants.rb b/spec/factories/plants.rb index 401fc7ee3..f1aa6f530 100644 --- a/spec/factories/plants.rb +++ b/spec/factories/plants.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :plant do openfarm_slug "lettuce" point diff --git a/spec/factories/points.rb b/spec/factories/points.rb index 68fe24a69..64a21365e 100644 --- a/spec/factories/points.rb +++ b/spec/factories/points.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :point do radius 1.5 x { rand(1...550) } diff --git a/spec/factories/regimen.rb b/spec/factories/regimen.rb index aa11e0de9..63c648172 100644 --- a/spec/factories/regimen.rb +++ b/spec/factories/regimen.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :regimen, :class => 'Regimen' do name { Faker::Pokemon.name + Faker::Pokemon.name } device diff --git a/spec/factories/regimen_items.rb b/spec/factories/regimen_items.rb index 14f00e61c..516481241 100644 --- a/spec/factories/regimen_items.rb +++ b/spec/factories/regimen_items.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :regimen_item do regimen after(:build) do |s| diff --git a/spec/factories/sequence_dependencies.rb b/spec/factories/sequence_dependencies.rb index a8ac210d6..283b6455b 100644 --- a/spec/factories/sequence_dependencies.rb +++ b/spec/factories/sequence_dependencies.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :sequence_dependency do ref "" sequence_id 1 diff --git a/spec/factories/sequences.rb b/spec/factories/sequences.rb index 60b0ca965..f1b8762d0 100644 --- a/spec/factories/sequences.rb +++ b/spec/factories/sequences.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :sequence do name { Faker::Company.catch_phrase } color { Sequence::COLORS.sample } diff --git a/spec/factories/token_expirations.rb b/spec/factories/token_expirations.rb index db639ac93..f7a534ac8 100644 --- a/spec/factories/token_expirations.rb +++ b/spec/factories/token_expirations.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :token_expiration do sub "MyString" exp "" diff --git a/spec/factories/tool_slots.rb b/spec/factories/tool_slots.rb index 67d087da2..0ea092983 100644 --- a/spec/factories/tool_slots.rb +++ b/spec/factories/tool_slots.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :tool_slot do tool end diff --git a/spec/factories/tools.rb b/spec/factories/tools.rb index aff101c45..b1bc5ab69 100644 --- a/spec/factories/tools.rb +++ b/spec/factories/tools.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :tool do device name { Faker::Pokemon.name + Faker::Pokemon.name } diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 1ae3f62c3..9ca617750 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -1,6 +1,6 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl +# Read about factories at https://github.com/thoughtbot/factory_bot -FactoryGirl.define do +FactoryBot.define do factory :user do device name { Faker::Name.name } diff --git a/spec/factories/webcam_feeds.rb b/spec/factories/webcam_feeds.rb index 44153a4ab..b8e603da7 100644 --- a/spec/factories/webcam_feeds.rb +++ b/spec/factories/webcam_feeds.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :webcam_feed do device url "http://placehold.it/320x240" diff --git a/spec/lib/celery_script/checker_spec.rb b/spec/lib/celery_script/checker_spec.rb index 087821e85..7de78aff6 100644 --- a/spec/lib/celery_script/checker_spec.rb +++ b/spec/lib/celery_script/checker_spec.rb @@ -9,7 +9,7 @@ describe CeleryScript::Checker do version: 0 }, comment: "Properly formatted, syntactically valid sequence.", - body: sequence_body_for(FactoryGirl.create(:sequence)) + body: sequence_body_for(FactoryBot.create(:sequence)) }.deep_symbolize_keys end diff --git a/spec/lib/celery_script/corpus_spec.rb b/spec/lib/celery_script/corpus_spec.rb index bc2ea7243..6851bb8b0 100644 --- a/spec/lib/celery_script/corpus_spec.rb +++ b/spec/lib/celery_script/corpus_spec.rb @@ -34,7 +34,7 @@ describe CeleryScript::Corpus do args: { location: { kind: "tool", - args: { tool_id: FactoryGirl.create(:tool).id } + args: { tool_id: FactoryBot.create(:tool).id } }, offset: { kind: "coordinate", diff --git a/spec/lib/celery_script/point_spec.rb b/spec/lib/celery_script/point_spec.rb index 8f8f13c60..e664445e6 100644 --- a/spec/lib/celery_script/point_spec.rb +++ b/spec/lib/celery_script/point_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe "Celery Script `point` node" do - let(:plant) { FactoryGirl.create(:plant_point).pointer } + let(:plant) { FactoryBot.create(:plant_point).pointer } let(:hash) do { kind: "sequence", args: { version:4 }, diff --git a/spec/lib/session_token_spec.rb b/spec/lib/session_token_spec.rb index 3b258a382..619547c8c 100644 --- a/spec/lib/session_token_spec.rb +++ b/spec/lib/session_token_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe SessionToken do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } FAKE_TOKEN = [ { "sub" => "admin@admin.com", diff --git a/spec/mailers/log_delivery_spec.rb b/spec/mailers/log_delivery_spec.rb index f2239b1cc..5c917a93b 100644 --- a/spec/mailers/log_delivery_spec.rb +++ b/spec/mailers/log_delivery_spec.rb @@ -1,8 +1,8 @@ require "spec_helper" describe LogDeliveryMailer, type: :mailer do - let(:device) { FactoryGirl.create(:device) } - let!(:log_dispatches) { FactoryGirl.create(:log_dispatch, device: device) } + let(:device) { FactoryBot.create(:device) } + let!(:log_dispatches) { FactoryBot.create(:log_dispatch, device: device) } it "throttles excess requests" do LogDispatch.max_per_hour = -1 # Throttle it all diff --git a/spec/models/farmbot_device_spec.rb b/spec/models/farmbot_device_spec.rb index 0264c9497..fcdbc984c 100644 --- a/spec/models/farmbot_device_spec.rb +++ b/spec/models/farmbot_device_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Device do - let(:device){ FactoryGirl.create(:device, users: [FactoryGirl.create(:user)])} + let(:device){ FactoryBot.create(:device, users: [FactoryBot.create(:user)])} let(:user) { device.users.first } it 'is associated with a user' do diff --git a/spec/models/image_spec.rb b/spec/models/image_spec.rb index ccec17b88..b1e873bfa 100644 --- a/spec/models/image_spec.rb +++ b/spec/models/image_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Image do - let(:device) { FactoryGirl.create(:device) } + let(:device) { FactoryBot.create(:device) } it 'adds URL attachments' do image = Image.create(device: device) diff --git a/spec/models/regimen_spec.rb b/spec/models/regimen_spec.rb index c536cff23..760f3f387 100644 --- a/spec/models/regimen_spec.rb +++ b/spec/models/regimen_spec.rb @@ -1,8 +1,8 @@ require 'spec_helper' describe Regimen do - let(:regimen) { FactoryGirl.create(:regimen) } + let(:regimen) { FactoryBot.create(:regimen) } - it "Enforces uniqueness of names" do + it "Enforces uniqueness of names" do expect {Regimen.create!(name: regimen.name, device: regimen.device)}.to raise_error(ActiveRecord::RecordInvalid) end diff --git a/spec/models/sequence_dependency_spec.rb b/spec/models/sequence_dependency_spec.rb index 19b70feb8..3d53af3a5 100644 --- a/spec/models/sequence_dependency_spec.rb +++ b/spec/models/sequence_dependency_spec.rb @@ -1,6 +1,6 @@ describe SequenceDependency do - let(:parent) { FactoryGirl.create(:sequence) } - let(:child1) { FactoryGirl.create(:sequence) } + let(:parent) { FactoryBot.create(:sequence) } + let(:child1) { FactoryBot.create(:sequence) } let(:child2) do Point.create!(x: 1, y: 2, diff --git a/spec/models/sequence_spec.rb b/spec/models/sequence_spec.rb index fe7bc9a80..72fbf0344 100644 --- a/spec/models/sequence_spec.rb +++ b/spec/models/sequence_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' describe Sequence do - let(:regimen) { FactoryGirl.create(:regimen) } + let(:regimen) { FactoryBot.create(:regimen) } it "Enforces uniqueness of names" do Sequence.destroy_all @@ -12,7 +12,7 @@ describe Sequence do end it "picks random values" do - FactoryGirl.create(:sequence) + FactoryBot.create(:sequence) 3.times { expect(Sequence.random).to be_kind_of(Sequence) } end end diff --git a/spec/models/tool_spec.rb b/spec/models/tool_spec.rb index 38c54b46b..7cd27654d 100644 --- a/spec/models/tool_spec.rb +++ b/spec/models/tool_spec.rb @@ -1,7 +1,7 @@ describe Tool do describe 'names' do - let(:tool) { FactoryGirl.create(:tool) } + let(:tool) { FactoryBot.create(:tool) } it 'must be unique' do tool2 = Tool.create(name: tool.name, device: tool.device) expect(tool2.valid?).to be(false) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index aa79d0458..bd6ad9d1c 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -6,7 +6,7 @@ describe User do end describe 'SKIP_EMAIL_VALIDATION' do - let (:user) { FactoryGirl.create(:user, confirmed_at: nil) } + let (:user) { FactoryBot.create(:user, confirmed_at: nil) } it 'considers al users verified when set to `true`' do const_reassign(User, :SKIP_EMAIL_VALIDATION, true) diff --git a/spec/models/webcam_feed_spec.rb b/spec/models/webcam_feed_spec.rb index 6b4eb5db6..782b260e0 100644 --- a/spec/models/webcam_feed_spec.rb +++ b/spec/models/webcam_feed_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe WebcamFeed do - let(:feed) { FactoryGirl.create(:webcam_feed) } + let(:feed) { FactoryBot.create(:webcam_feed) } it "requires a URL" do result = feed.update_attributes(url: nil) diff --git a/spec/mutations/auth/create_token_from_credentials_spec.rb b/spec/mutations/auth/create_token_from_credentials_spec.rb index 786b2aa94..c28235da0 100644 --- a/spec/mutations/auth/create_token_from_credentials_spec.rb +++ b/spec/mutations/auth/create_token_from_credentials_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Auth::FromJWT do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } def fake_credentials(email, password) @@ -20,7 +20,7 @@ describe Auth::FromJWT do it 'accepts good credentials' do pw = "password123" - user = FactoryGirl.create(:user, password: pw) + user = FactoryBot.create(:user, password: pw) email = user.email creds = fake_credentials(email, pw) results = Auth::CreateTokenFromCredentials.run!(credentials: creds) diff --git a/spec/mutations/auth/from_jwt_spec.rb b/spec/mutations/auth/from_jwt_spec.rb index 6a62275dd..3af17d2f8 100644 --- a/spec/mutations/auth/from_jwt_spec.rb +++ b/spec/mutations/auth/from_jwt_spec.rb @@ -1,7 +1,7 @@ require "spec_helper" describe Auth::FromJWT do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } let(:token) { SessionToken.issue_to(user).encoded } fake = -> (sub) { AbstractJwtToken.new([{ sub: sub, diff --git a/spec/mutations/devices/update_spec.rb b/spec/mutations/devices/update_spec.rb index 9ccfc0829..1c8467e87 100644 --- a/spec/mutations/devices/update_spec.rb +++ b/spec/mutations/devices/update_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Devices::Update do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } let(:device) { user.device } diff --git a/spec/mutations/farm_events/create_spec.rb b/spec/mutations/farm_events/create_spec.rb index 36dbaaac4..bd150f26f 100644 --- a/spec/mutations/farm_events/create_spec.rb +++ b/spec/mutations/farm_events/create_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe FarmEvents::Create do - let(:seq) { FactoryGirl.create(:sequence) } + let(:seq) { FactoryBot.create(:sequence) } it 'Builds a farm_event' do device = seq.device start_time = '2027-02-17T15:16:17.000Z' diff --git a/spec/mutations/regimens/create_spec.rb b/spec/mutations/regimens/create_spec.rb index 0fb8802c7..022e7fa75 100644 --- a/spec/mutations/regimens/create_spec.rb +++ b/spec/mutations/regimens/create_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper' describe Regimens::Create do it 'Builds a regimen' do - seq1 = FactoryGirl.create(:sequence) - seq2 = FactoryGirl.create(:sequence, device: seq1.device) + seq1 = FactoryBot.create(:sequence) + seq2 = FactoryBot.create(:sequence, device: seq1.device) device = seq1.device optns = { device: device, @@ -13,7 +13,7 @@ describe Regimens::Create do { time_offset: 129600000, sequence_id: seq1.id - }, + }, { time_offset: 259200000, sequence_id: seq2.id diff --git a/spec/mutations/regimens/update_spec.rb b/spec/mutations/regimens/update_spec.rb index 2e32a9ce8..c8dc31db8 100644 --- a/spec/mutations/regimens/update_spec.rb +++ b/spec/mutations/regimens/update_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Regimens::Update do - let(:sequence) { FactoryGirl.create(:sequence) } + let(:sequence) { FactoryBot.create(:sequence) } let(:device) { sequence.device } it 'updates an existing regimen' do @@ -32,4 +32,4 @@ describe Regimens::Update do expect(result.color).to eq(new_reg_params[:color]) expect(result.regimen_items.count).to eq(new_reg_params[:regimen_items].count) end -end \ No newline at end of file +end diff --git a/spec/mutations/sequences/create_spec.rb b/spec/mutations/sequences/create_spec.rb index 2cdb81547..65b2353d5 100644 --- a/spec/mutations/sequences/create_spec.rb +++ b/spec/mutations/sequences/create_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Sequences::Create do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } let(:device) { user.device } let(:body) { sequence_body_for(user) } diff --git a/spec/mutations/sequences/delete_spec.rb b/spec/mutations/sequences/delete_spec.rb index 385d9ad73..7a260e0a8 100644 --- a/spec/mutations/sequences/delete_spec.rb +++ b/spec/mutations/sequences/delete_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' describe Sequences::Delete do - let(:sequence) { FactoryGirl.create(:sequence) } + let(:sequence) { FactoryBot.create(:sequence) } it 'refuses to delete a sequence that a regimen depends on' do - regimen_item1 = FactoryGirl.create(:regimen_item, sequence: sequence) - regimen_item2 = FactoryGirl.create(:regimen_item, sequence: sequence) + regimen_item1 = FactoryBot.create(:regimen_item, sequence: sequence) + regimen_item2 = FactoryBot.create(:regimen_item, sequence: sequence) expect(sequence.regimen_items.count).to eq(2) result = Sequences::Delete.run(device: sequence.device, sequence: sequence) expect(result.success?).to be false @@ -22,7 +22,7 @@ describe Sequences::Delete do end it 'prevents deletion when the sequence is in use by another sequence' do - SequenceDependency.create!(sequence: FactoryGirl.create(:sequence), + SequenceDependency.create!(sequence: FactoryBot.create(:sequence), dependency: sequence) result = Sequences::Delete.run(device: sequence.device, sequence: sequence) expect(result.success?).to be(false) diff --git a/spec/mutations/sequences/migration_from_v_0_or_none_spec.rb b/spec/mutations/sequences/migration_from_v_0_or_none_spec.rb index 8e60028f4..749c0f34e 100644 --- a/spec/mutations/sequences/migration_from_v_0_or_none_spec.rb +++ b/spec/mutations/sequences/migration_from_v_0_or_none_spec.rb @@ -80,10 +80,10 @@ BODY2 = [ } ] describe "Migration from version 0 or nil" do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } let(:device) { user.device } - let(:seq1) { FactoryGirl.create(:sequence, device: device, body: BODY1) } - let(:seq2) { FactoryGirl.create(:sequence, device: device, body: BODY2) } + let(:seq1) { FactoryBot.create(:sequence, device: device, body: BODY1) } + let(:seq2) { FactoryBot.create(:sequence, device: device, body: BODY2) } it 'handles nodes without a body' do # BEFORE: diff --git a/spec/mutations/sequences/migration_from_v_1_spec.rb b/spec/mutations/sequences/migration_from_v_1_spec.rb index 0692ac6fb..6d2dbf38d 100644 --- a/spec/mutations/sequences/migration_from_v_1_spec.rb +++ b/spec/mutations/sequences/migration_from_v_1_spec.rb @@ -23,9 +23,9 @@ BODY = [ ] describe "Migration from version 0 or nil" do - let(:user) { FactoryGirl.create(:user) } + let(:user) { FactoryBot.create(:user) } let(:device) { user.device } - let(:seq) { FactoryGirl.create(:sequence, device: device, body: BODY) } + let(:seq) { FactoryBot.create(:sequence, device: device, body: BODY) } it 'Updates `move_absolute` nodes' do Sequences::Migrate.run!(device: device, sequence: seq) diff --git a/spec/mutations/users/update_spec.rb b/spec/mutations/users/update_spec.rb index f1b8bef10..74710ed73 100644 --- a/spec/mutations/users/update_spec.rb +++ b/spec/mutations/users/update_spec.rb @@ -9,7 +9,7 @@ describe Users::Update do password_confirmation: "password12345", agree_to_terms: true) u = User.last - u2 = FactoryGirl.create(:user) + u2 = FactoryBot.create(:user) Users::Update.run!(user: u, email: u.email) result = Users::Update.run(user: u, email: u2.email) expect(result.success?).to be(false) diff --git a/spec/serializers/farm_event_serializer_spec.rb b/spec/serializers/farm_event_serializer_spec.rb index 9e1c3dd30..447793192 100644 --- a/spec/serializers/farm_event_serializer_spec.rb +++ b/spec/serializers/farm_event_serializer_spec.rb @@ -2,10 +2,10 @@ require "spec_helper" describe FarmEventSerializer do let(:farm_event) do - fe = FactoryGirl.build(:farm_event, start_time: Time.now + 5.days) - fe.executable = FactoryGirl.build(:regimen, device: fe.device) + fe = FactoryBot.build(:farm_event, start_time: Time.now + 5.days) + fe.executable = FactoryBot.build(:regimen, device: fe.device) fe.save! - FactoryGirl.create(:regimen_item, regimen: fe.executable, + FactoryBot.create(:regimen_item, regimen: fe.executable, time_offset: 7000) fe end diff --git a/spec/stuff.rb b/spec/stuff.rb index 810961039..4879c529b 100644 --- a/spec/stuff.rb +++ b/spec/stuff.rb @@ -32,8 +32,8 @@ module Helpers else raise "No #{mystery.class}" end - sid = FactoryGirl.create(:sequence, device: device).id - tid = FactoryGirl.create(:tool, device: device).id + sid = FactoryBot.create(:sequence, device: device).id + tid = FactoryBot.create(:tool, device: device).id str = AST_FIXTURE .gsub(MAGIC_NUMBER_SEQ_ID, sid.to_s) .gsub(MAGIC_NUMBER_TOOL_ID, tid.to_s)