updates

spec/factories/employee_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :employee do
     sequence(:name){|i| "Employee #{i}"}
     sequence(:email){ |i| "employee#{i}@mozo.bar" }

spec/factories/employee_shift_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :employee_shift do
   end
 end

spec/factories/list_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :list do
     association :table
     association :supplier #TODO warning! this may create a different supplier than the one created by the associated table

spec/factories/list_payment.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :list_payment do
 
   end

spec/factories/order_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :order do
     association :list
     association :user

spec/factories/page_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :page do
     locale 'en'
     layout 'theme1'

spec/factories/product_category_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :product_category do
     sequence(:name){|i| "ProductCategory#{i}"}
     sequence(:position){|i| i}

spec/factories/product_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :product do
     sequence(:name){|i| "Product#{i}"}
     price 34.95

spec/factories/product_order_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :product_order do
     quantity 1
     association :order

spec/factories/product_variant.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :product_variant do
     sequence(:name){|i| "Variant #{i}"}
     association :product

spec/factories/section_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :section do
     sequence(:title){|i| "Section #{i} title"}
     association :supplier

spec/factories/supplier_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :supplier do
     sequence(:name){|i| "Supplier #{i}"}
     trait :open do

spec/factories/table_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :table do
     number 22
     association :supplier

spec/factories/user_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     sequence( :email ){|i| "test#{i}@example.com" }
     password "secret"

spec/rails_helper.rb

@@ -115,7 +115,7 @@ RSpec.configure do |config|
   # config.mock_with :flexmock
   # config.mock_with :rr
   #config.mock_with :rspec
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
   config.include FactoryAttributesFor
   config.include Devise::TestHelpers, type: :controller
   config.include SpecControllerHelpers, type: :controller

spec/support/features/basic_helpers.rb

@@ -3,14 +3,14 @@ module Features
     # Put helper methods you need to be available in all acceptance specs here.
 
     def create_user(email, password='secret')
-      @user = User.find_by_email(email) || FactoryGirl.create(:user, email: email, password: password)
+      @user = User.find_by_email(email) || FactoryBot.create(:user, email: email, password: password)
     end
     #def create_supplier(email, password='secret')
-      #@supplier = Supplier.find_by_email(email) || FactoryGirl.create(:supplier, email: email, password: password)
+      #@supplier = Supplier.find_by_email(email) || FactoryBot.create(:supplier, email: email, password: password)
     #end
 
     def create_confirmed_supplier(email, password='secret')
-      @supplier = Supplier.find_by_email(email) || FactoryGirl.create(:supplier, :confirmed, email: email, password: password)
+      @supplier = Supplier.find_by_email(email) || FactoryBot.create(:supplier, :confirmed, email: email, password: password)
       @supplier.confirm! unless @supplier.confirmed?
     end