Number of Cities Using the Robot:
diff --git a/app/views/locations/index.html.erb b/app/views/locations/index.html.erb
index 65f22f90..f9c74bd5 100755
--- a/app/views/locations/index.html.erb
+++ b/app/views/locations/index.html.erb
@@ -65,7 +65,7 @@
edit
<% end %>
- <%= link_to loc, confirm: "Are you sure?", method: :delete, class: 'btn btn-danger' do %>
+ <%= link_to loc, data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger' do %>
delete
<% end %>
diff --git a/app/views/logs/index.html.erb b/app/views/logs/index.html.erb
index 99340848..a65de867 100755
--- a/app/views/logs/index.html.erb
+++ b/app/views/logs/index.html.erb
@@ -141,7 +141,7 @@
<% shift.logs.each do |log| %>
<%= link_to "edit log #{log.id}", edit_log_path(log), class: 'btn btn-primary' %>
- <%= link_to "delete log #{log.id}", log, class: 'btn btn-danger', confirm: "Are you sure you want to delete this shift's log?", method: :delete %>
+ <%= link_to "delete log #{log.id}", log, class: 'btn btn-danger', data: { confirm: "Are you sure you want to delete this shift's log?" }, method: :delete %>
<% end %>
|
<% end %>
diff --git a/app/views/region_admin/donors/index.html.erb b/app/views/region_admin/donors/index.html.erb
index b45ef68f..0e28a57c 100644
--- a/app/views/region_admin/donors/index.html.erb
+++ b/app/views/region_admin/donors/index.html.erb
@@ -39,7 +39,7 @@
<%= link_to 'Hud', hud_location_path(location, key: location.receipt_key) %>
<% end %>
<%= link_to "Edit", edit_location_url(location) %>
- <%= link_to "Delete", location_url(location), confirm: "Are you sure?", method: :delete %>
+ <%= link_to "Delete", location_url(location), data: { confirm: "Are you sure?" }, method: :delete %>
<% end %>
diff --git a/app/views/region_admin/food_types/index.html.erb b/app/views/region_admin/food_types/index.html.erb
index 82a2e444..cb05a679 100755
--- a/app/views/region_admin/food_types/index.html.erb
+++ b/app/views/region_admin/food_types/index.html.erb
@@ -32,7 +32,7 @@
<% end %>
- <%= link_to region_admin_food_type_url(food_type), confirm: "Are you sure?", method: :delete, class: 'btn btn-danger' do %>
+ <%= link_to region_admin_food_type_url(food_type), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger' do %>
Delete
<% end %>
diff --git a/app/views/regions/index.html.erb b/app/views/regions/index.html.erb
index 71bca8de..e4ba7124 100755
--- a/app/views/regions/index.html.erb
+++ b/app/views/regions/index.html.erb
@@ -60,7 +60,7 @@
<%= link_to edit_region_url(region), class: 'btn btn-primary' do %>
<% end %>
- <%= link_to region_url(region), class: 'btn btn-danger', confirm: "Are you sure?", method: :delete do %>
+ <%= link_to region_url(region), class: 'btn btn-danger', data: { confirm: "Are you sure?" }, method: :delete do %>
<% end %>
diff --git a/app/views/schedule_chains/index.html.erb b/app/views/schedule_chains/index.html.erb
index 3ac5c43c..564b9ad8 100755
--- a/app/views/schedule_chains/index.html.erb
+++ b/app/views/schedule_chains/index.html.erb
@@ -136,7 +136,7 @@
<% if current_volunteer.any_admin? %>
<%= link_to 'edit', edit_schedule_chain_path(schedule) %>
- <%= link_to "delete", schedule, confirm: "Are you sure?", method: :delete %>
+ <%= link_to "delete", schedule, data: { confirm: "Are you sure?" }, method: :delete %>
<% end %>
|
diff --git a/app/views/schedule_chains/show.html.erb b/app/views/schedule_chains/show.html.erb
index e1fdd53a..d5cbe204 100755
--- a/app/views/schedule_chains/show.html.erb
+++ b/app/views/schedule_chains/show.html.erb
@@ -61,7 +61,7 @@
<% if @chain.volunteers.count == 0 %>
No volunteers yet...
- <%= link_to take_schedule_chains_path(id: @chain), confirm: "Are you sure you want to sign up for this weekly pickup?", class: 'btn btn-primary' do %>
+ <%= link_to take_schedule_chains_path(id: @chain), data: { confirm: "Are you sure you want to sign up for this weekly pickup?" }, class: 'btn btn-primary' do %>
Signup for this weekly pickup now!
<% end %>
diff --git a/app/views/volunteers/index.html.erb b/app/views/volunteers/index.html.erb
index c18d38d5..a594f322 100755
--- a/app/views/volunteers/index.html.erb
+++ b/app/views/volunteers/index.html.erb
@@ -53,7 +53,7 @@
<%= link_to edit_volunteer_path(v), class: 'btn btn-primary' do %>
<% end %>
- <%= link_to v, confirm: "Are you sure?", method: :delete, class: 'btn btn-danger' do %>
+ <%= link_to v, data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger' do %>
<% end %>
<% unless v.active %>
diff --git a/app/views/volunteers/unassigned.html.erb b/app/views/volunteers/unassigned.html.erb
index d4505db6..c13db986 100755
--- a/app/views/volunteers/unassigned.html.erb
+++ b/app/views/volunteers/unassigned.html.erb
@@ -55,7 +55,7 @@
<%= submit_tag("Assign", class: 'btn btn-primary') %>
|
- <%= link_to "Delete", volunteer, confirm: "Are you sure?", method: :delete, class: 'btn btn-danger' %>
+ <%= link_to "Delete", volunteer, data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger' %>
<% end # form end tag %>
|
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 00000000..66e9889e
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/guard b/bin/guard
new file mode 100755
index 00000000..bcb966f4
--- /dev/null
+++ b/bin/guard
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'guard' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+ Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+ if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+ load(bundle_binstub)
+ else
+ abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+ end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("guard", "guard")
diff --git a/bin/pry b/bin/pry
new file mode 100755
index 00000000..bfcc3d48
--- /dev/null
+++ b/bin/pry
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'pry' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+ Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+ if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+ load(bundle_binstub)
+ else
+ abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+ end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("pry", "pry")
diff --git a/bin/pry-remote b/bin/pry-remote
new file mode 100755
index 00000000..34d1ea16
--- /dev/null
+++ b/bin/pry-remote
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'pry-remote' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+ Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+ if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+ load(bundle_binstub)
+ else
+ abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+ end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("pry-remote", "pry-remote")
diff --git a/bin/puma b/bin/puma
new file mode 100755
index 00000000..880935b2
--- /dev/null
+++ b/bin/puma
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'puma' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+ Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+ if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+ load(bundle_binstub)
+ else
+ abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+ end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("puma", "puma")
diff --git a/bin/pumactl b/bin/pumactl
new file mode 100755
index 00000000..b698e6e9
--- /dev/null
+++ b/bin/pumactl
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'pumactl' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+ Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+ if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+ load(bundle_binstub)
+ else
+ abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+ end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("puma", "pumactl")
diff --git a/bin/rackup b/bin/rackup
new file mode 100755
index 00000000..3ac4a5a7
--- /dev/null
+++ b/bin/rackup
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rackup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+ Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+ if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+ load(bundle_binstub)
+ else
+ abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+ end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rack", "rackup")
diff --git a/bin/rails b/bin/rails
new file mode 100755
index 00000000..728cd85a
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 00000000..17240489
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
diff --git a/bin/support/bootstrap-database.rb b/bin/support/bootstrap-database.rb
old mode 100644
new mode 100755
diff --git a/bin/support/create-dot-env.rb b/bin/support/create-dot-env.rb
old mode 100644
new mode 100755
diff --git a/config.ru b/config.ru
index 0c7f17cd..85d3c784 100755
--- a/config.ru
+++ b/config.ru
@@ -2,5 +2,6 @@
# This file is used by Rack-based servers to start the application.
-require ::File.expand_path('../config/environment', __FILE__)
+require_relative 'config/environment'
+
run Webapp::Application
diff --git a/config/application.rb b/config/application.rb
index 1003c6d6..8a297abf 100755
--- a/config/application.rb
+++ b/config/application.rb
@@ -4,12 +4,7 @@
require 'rails/all'
-if defined?(Bundler)
- # If you precompile assets before deploying to production, use this line
- Bundler.require(*Rails.groups(:assets => %w(development test)))
- # If you want your assets lazily compiled in production, use this line
- # Bundler.require(:default, :assets, Rails.env)
-end
+Bundler.require(*Rails.groups)
module Webapp
class Application < Rails::Application
@@ -57,12 +52,6 @@ class Application < Rails::Application
# like if you have constraints or database-specific column types
# config.active_record.schema_format = :sql
- # Enforce whitelist mode for mass assignment.
- # This will create an empty whitelist of attributes available for mass-assignment for all models
- # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
- # parameters by using an attr_accessible or attr_protected declaration.
- config.active_record.whitelist_attributes = true
-
# Enable the asset pipeline
config.assets.enabled = true
diff --git a/config/environment.rb b/config/environment.rb
index f3c19b3b..97f0f011 100755
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
# Load the rails application
-require File.expand_path('application', __dir__)
+require_relative 'application'
# Initialize the rails application
Webapp::Application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 257a573b..b3cf539a 100755
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -9,9 +9,6 @@
# session since you don't have to restart the web server when you make code changes.
config.cache_classes = false
- # Log error messages when you accidentally call methods on nil.
- config.whiny_nils = true
-
# Do not eager load code on boot.
config.eager_load = false
@@ -23,7 +20,7 @@
config.action_mailer.raise_delivery_errors = true
config.action_mailer.delivery_method = :sendmail
config.action_mailer.perform_deliveries = true
- config.action_mailer.default_url_options = { :host => 'robot.boulderfoodrescue.org' }
+ config.action_mailer.default_url_options = { host: 'robot.boulderfoodrescue.org' }
# Print deprecation notices to the Rails logger
config.active_support.deprecation = :log
@@ -31,16 +28,9 @@
# rotate logs
config.logger = Logger.new(Rails.root.join('log', Rails.env + '.log'), 3, 5*1024*1024)
- # Only use best-standards-support built into browsers
- config.action_dispatch.best_standards_support = :builtin
-
# Raise exception on mass assignment protection for Active Record models
config.active_record.mass_assignment_sanitizer = :strict
- # Log the query plan for queries taking more than this (works
- # with SQLite, MySQL, and PostgreSQL)
- config.active_record.auto_explain_threshold_in_seconds = 0.5
-
# Do not compress assets
config.assets.compress = true
@@ -61,4 +51,15 @@
# Show it all!
config.log_level = :debug
+
+ config.paperclip_defaults = {
+ storage: :s3,
+ s3_credentials: {
+ access_key_id: ENV['S3_ACCESS_KEY_ID'],
+ secret_access_key: ENV['S3_SECRET_ACCESS_KEY'],
+ s3_region: 'us-west-2'
+ },
+ url: ':s3_domain_url',
+ path: '/:class/:attachment/:id_partition/:style/:filename'
+ }
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index ef7f0e9f..1360c519 100755
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -17,7 +17,6 @@
password: ENV['SENDGRID_PASSWORD']
}
# ActionMailer Config
- # config.action_mailer.default_url_options = { :host => 'robot.boulderfoodrescue.org' }
config.action_mailer.default_url_options = { host: "#{ENV['DOMAIN_NAME']}" }
config.action_mailer.delivery_method = :smtp
config.action_mailer.perform_deliveries = true
@@ -25,6 +24,7 @@
# Code is not reloaded between requests
config.cache_classes = true
+ config.eager_load = true
# Full error reports are disabled and caching is turned on
config.consider_all_requests_local = false
@@ -84,10 +84,6 @@
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
- # Log the query plan for queries taking more than this (works
- # with SQLite, MySQL, and PostgreSQL)
- # config.active_record.auto_explain_threshold_in_seconds = 0.5
-
config.middleware.use ExceptionNotifier,
email_prefix: '[BFR ROBOT ERROR] ',
sender_address: %{"BFR Robot" },
diff --git a/config/environments/test.rb b/config/environments/test.rb
index bb5d9e42..66ea6179 100755
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,8 +13,7 @@
config.serve_static_assets = true
config.static_cache_control = 'public, max-age=3600'
- # Log error messages when you accidentally call methods on nil
- config.whiny_nils = true
+ config.eager_load = false
# Show full error reports and disable caching
config.consider_all_requests_local = true
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index d8d5c34e..85b2d840 100755
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -7,7 +7,7 @@
# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
ActiveSupport.on_load(:action_controller) do
- wrap_parameters :format => [:json]
+ wrap_parameters format: [:json]
end
# Disable root element in JSON by default.
diff --git a/config/puma.rb b/config/puma.rb
new file mode 100644
index 00000000..f668d606
--- /dev/null
+++ b/config/puma.rb
@@ -0,0 +1,34 @@
+# Puma can serve each request in a thread from an internal thread pool.
+# The `threads` method setting takes two numbers: a minimum and maximum.
+# Any libraries that use thread pools should be configured to match
+# the maximum value specified for Puma. Default is set to 5 threads for minimum
+# and maximum; this matches the default thread size of Active Record.
+#
+threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+threads threads_count, threads_count
+
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+#
+port ENV.fetch("PORT") { 5000 }
+
+# Specifies the `environment` that Puma will run in.
+#
+environment ENV.fetch("RAILS_ENV") { "development" }
+
+# Specifies the number of `workers` to boot in clustered mode.
+# Workers are forked webserver processes. If using threads and workers together
+# the concurrency of the application would be max `threads` * `workers`.
+# Workers do not work on JRuby or Windows (both of which do not support
+# processes).
+#
+# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+
+# Use the `preload_app!` method when specifying a `workers` number.
+# This directive tells Puma to first boot the application and load code
+# before forking the application. This takes advantage of Copy On Write
+# process behavior so workers use less memory.
+#
+# preload_app!
+
+# Allow puma to be restarted by `rails restart` command.
+plugin :tmp_restart
diff --git a/config/routes.rb b/config/routes.rb
index 3872c648..c08ef8b7 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,6 @@
# frozen_string_literal: true
+
Webapp::Application.routes.draw do
resources :assignments, only: [] do
collection do
@@ -65,9 +66,6 @@
get :create
get :destroy
end
- # member do
- # get :show
- # end
end
resources :locations do
@@ -88,7 +86,7 @@
end
end
- devise_for :volunteers, :controllers => { :sessions => 'sessions' }
+ devise_for :volunteers, controllers: { sessions: 'sessions' }
resources :volunteers do
collection do
diff --git a/lib/assets/.gitkeep b/lib/assets/.gitkeep
deleted file mode 100755
index e69de29b..00000000
diff --git a/spec/factories/absences.rb b/spec/factories/absences.rb
index 6d4e706e..2c07b4d9 100755
--- a/spec/factories/absences.rb
+++ b/spec/factories/absences.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :absence do
start_date { Time.zone.today + 1.day }
stop_date { Time.zone.today + 5.days }
diff --git a/spec/factories/assignments.rb b/spec/factories/assignments.rb
index c50ec048..0ebc7d15 100755
--- a/spec/factories/assignments.rb
+++ b/spec/factories/assignments.rb
@@ -1,12 +1,12 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :assignment do
volunteer { (Volunteer.all.count >= 5 ? Volunteer.all.sample : create(:volunteer)) }
region { (Region.all.count >= 3 ? Region.all.sample : create(:region)) }
trait :admin do
- admin true
+ admin { true }
end
factory :admin_volunteer, traits: [:admin]
diff --git a/spec/factories/food_types.rb b/spec/factories/food_types.rb
index 4ce25b1d..289dbd0b 100755
--- a/spec/factories/food_types.rb
+++ b/spec/factories/food_types.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :food_type do
- name 'Some food!'
- region { (Region.all.count >= 5 ? Region.all.sample : create(:region)) }
+ name { 'Some food!' }
+ region { Region.all.count >= 5 ? Region.all.sample : FactoryBot.create(:region) }
end
end
diff --git a/spec/factories/locations.rb b/spec/factories/locations.rb
index 056389e8..97ecada8 100755
--- a/spec/factories/locations.rb
+++ b/spec/factories/locations.rb
@@ -1,33 +1,33 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :location do
address { '710 31st St., Boulder, CO, 80303' }
sequence(:name) { |n| "Some place #{n}" }
- contact 'Some dude'
- website 'http://foobar.com'
- admin_notes 'Some admin notes'
- public_notes 'Some public notes'
- hours 'Some hours'
+ contact { 'Some dude' }
+ website { 'http://foobar.com' }
+ admin_notes { 'Some admin notes' }
+ public_notes { 'Some public notes' }
+ hours { 'Some hours' }
region { (Region.all.count >= 5 ? Region.all.sample : create(:region)) }
sequence(:email) { |n| "location#{n}@gmail.com" }
- phone '555-555-5555'
- equipment_storage_info 'Or something'
- food_storage_info 'Or something else'
- entry_info 'Yeppers'
- exit_info 'Blah!'
- onsite_contact_info 'Some people'
+ phone { '555-555-5555' }
+ equipment_storage_info { 'Or something' }
+ food_storage_info { 'Or something else' }
+ entry_info { 'Yeppers' }
+ exit_info { 'Blah!' }
+ onsite_contact_info { 'Some people' }
factory :recipient do
- location_type Location::LOCATION_TYPES.invert['Recipient']
+ location_type { Location::LOCATION_TYPES.invert['Recipient'] }
end
factory :donor do
- location_type Location::LOCATION_TYPES.invert['Donor']
+ location_type { Location::LOCATION_TYPES.invert['Donor'] }
end
factory :hub do
- location_type Location::LOCATION_TYPES.invert['Hub']
+ location_type { Location::LOCATION_TYPES.invert['Hub'] }
end
end
end
diff --git a/spec/factories/log_parts.rb b/spec/factories/log_parts.rb
index d2b19e42..fef8fed8 100755
--- a/spec/factories/log_parts.rb
+++ b/spec/factories/log_parts.rb
@@ -1,18 +1,18 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :log_part do
- required false
+ required { false }
food_type { (FoodType.all.count >= 5 ? FoodType.all.sample : create(:food_type)) }
factory :complete_log_part do
- weight 42.0
- description 'Or something'
- self.count 5
+ weight { 42.0 }
+ description { 'Or something' }
+ self.count { 5 }
end
factory :required_log_part do
- required true
+ required { true }
end
end
end
diff --git a/spec/factories/log_volunteers.rb b/spec/factories/log_volunteers.rb
index c478566f..b413a40e 100755
--- a/spec/factories/log_volunteers.rb
+++ b/spec/factories/log_volunteers.rb
@@ -1,10 +1,10 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :log_volunteer do
association :volunteer
association :log
- active true
- covering false
+ active { true }
+ covering { false }
end
end
diff --git a/spec/factories/logs.rb b/spec/factories/logs.rb
index 919af4df..1d138f01 100755
--- a/spec/factories/logs.rb
+++ b/spec/factories/logs.rb
@@ -1,9 +1,9 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :log do
- notes 'Log Notes Testing123'
- weight_unit 'lb'
+ notes { 'Log Notes Testing123' }
+ weight_unit { 'lb' }
region { (Region.all.count >= 5 ? Region.all.sample : create(:region)) }
self.when { Date.today + (rand > 0.5 ? -1 : 1)*rand(10) } # have to do self. since when is a reserved word in ruby
donor { Location.donors.count >= 5 ? Location.donors.sample : create(:donor) }
diff --git a/spec/factories/regions.rb b/spec/factories/regions.rb
index 2841d1f6..1d03aa35 100755
--- a/spec/factories/regions.rb
+++ b/spec/factories/regions.rb
@@ -1,16 +1,16 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :region do
sequence(:title) { |n| "#{n.ordinalize} Title" }
sequence(:name) { |n| "#{n.ordinalize} Name" }
- address '123 Fake St., Beloxi, MS'
- handbook_url 'http://google.com'
- welcome_email_text 'Hello there!'
- splash_html 'Yep...'
- tax_id '12345'
- phone '555-555-5555'
- tagline 'Knowing is Half the Battle'
- notes 'Some notes'
+ address { '123 Fake St., Beloxi, MS' }
+ handbook_url { 'http://google.com' }
+ welcome_email_text { 'Hello there!' }
+ splash_html { 'Yep...' }
+ tax_id { '12345' }
+ phone { '555-555-5555' }
+ tagline { 'Knowing is Half the Battle' }
+ notes { 'Some notes' }
end
end
diff --git a/spec/factories/scale_types.rb b/spec/factories/scale_types.rb
index 45fb5310..0268c2e5 100755
--- a/spec/factories/scale_types.rb
+++ b/spec/factories/scale_types.rb
@@ -1,9 +1,9 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :scale_type do
- name 'Some scale'
- weight_unit 'lb'
+ name { 'Some scale' }
+ weight_unit { 'lb' }
region { (Region.all.count >= 5 ? Region.all.sample : create(:region)) }
end
end
diff --git a/spec/factories/schedule_chains.rb b/spec/factories/schedule_chains.rb
index 49b2a3df..b99ace54 100755
--- a/spec/factories/schedule_chains.rb
+++ b/spec/factories/schedule_chains.rb
@@ -1,25 +1,25 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :schedule_chain do
transport_type
- backup false
- temporary false
- irregular false
+ backup { false }
+ temporary { false }
+ irregular { false }
scale_type
region
- admin_notes 'some notes'
- public_notes 'some other notes'
+ admin_notes { 'some notes' }
+ public_notes { 'some other notes' }
expected_weight { rand(200) }
day_of_week { rand(6) }
- frequency 'weekly'
+ frequency { 'weekly' }
difficulty_rating { rand(3) }
hilliness { rand(3) }
trait :one_time do
- frequency 'one-time'
- day_of_week nil
- detailed_date Date.today + 4.days
+ frequency { 'one-time' }
+ day_of_week { nil }
+ detailed_date { Date.today + 4.days }
end
end
end
diff --git a/spec/factories/schedule_parts.rb b/spec/factories/schedule_parts.rb
index 7fe5a80a..438c54ba 100755
--- a/spec/factories/schedule_parts.rb
+++ b/spec/factories/schedule_parts.rb
@@ -1,9 +1,9 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :schedule_part do
association :schedule
association :food_type
- required false
+ required { false }
end
end
diff --git a/spec/factories/schedule_volunteers.rb b/spec/factories/schedule_volunteers.rb
index abaf4c8f..b1ff06b8 100755
--- a/spec/factories/schedule_volunteers.rb
+++ b/spec/factories/schedule_volunteers.rb
@@ -1,9 +1,9 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :schedule_volunteer do
association :volunteer
association :schedule_chain
- active true
+ active { true }
end
end
diff --git a/spec/factories/schedules.rb b/spec/factories/schedules.rb
index 9148916e..357832c0 100755
--- a/spec/factories/schedules.rb
+++ b/spec/factories/schedules.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :schedule do
- position 3
+ position { 3 }
location { Location.all.count >= 5 ? Location.all.sample : create(:location) }
factory :donation_schedule do
diff --git a/spec/factories/transport_types.rb b/spec/factories/transport_types.rb
index 584f6025..92ca7c49 100755
--- a/spec/factories/transport_types.rb
+++ b/spec/factories/transport_types.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :transport_type do
- name 'Camel'
+ name { 'Camel' }
end
end
diff --git a/spec/factories/volunteers.rb b/spec/factories/volunteers.rb
index 46e6ba9f..5bd3fb54 100755
--- a/spec/factories/volunteers.rb
+++ b/spec/factories/volunteers.rb
@@ -1,13 +1,13 @@
# frozen_string_literal: true
-FactoryGirl.define do
+FactoryBot.define do
factory :volunteer do
sequence(:name) { |n| "John Doe the #{n.ordinalize}" }
sequence(:email) { |n| "user#{n}@boulderfoodrescue.org" }
- phone '555-555-5555'
- password 'SomePassword'
- waiver_signed true
- waiver_signed_at Time.zone.now
+ phone { '555-555-5555' }
+ password { 'SomePassword' }
+ waiver_signed { true }
+ waiver_signed_at { Time.zone.now }
factory :volunteer_with_assignment do
after(:create) do |v|
@@ -19,8 +19,8 @@
end
trait :not_waived do
- waiver_signed false
- waiver_signed_at nil
+ waiver_signed { false }
+ waiver_signed_at { nil }
end
end
end
diff --git a/spec/models/schedule_spec.rb b/spec/models/schedule_spec.rb
index 020de7d0..4291e71a 100644
--- a/spec/models/schedule_spec.rb
+++ b/spec/models/schedule_spec.rb
@@ -3,10 +3,10 @@
require 'rails_helper'
RSpec.describe Schedule do
- describe 'this file needs to be completed' do
+ describe 'Schedule' do
let(:super_admin) { create(:volunteer, admin: true) }
- xit 'validates super_admin' do
+ it 'validates super_admin' do
expect(super_admin).to be_valid
end
end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c41aa1a3..53970a41 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -39,7 +39,7 @@
Warden.test_reset!
end
- config.include FactoryGirl::Syntax::Methods
+ config.include FactoryBot::Syntax::Methods
config.include ActionDispatch::TestProcess
diff --git a/vendor/assets/javascripts/.gitkeep b/vendor/assets/javascripts/.gitkeep
deleted file mode 100755
index e69de29b..00000000
diff --git a/vendor/assets/stylesheets/.gitkeep b/vendor/assets/stylesheets/.gitkeep
deleted file mode 100755
index e69de29b..00000000