Upgrade factory_bot, faker

spec/factories/article.rb

@@ -10,20 +10,20 @@ FactoryBot.define do
     unit_quantity { rand(5) < 3 ? 1 : rand(1..20) }
 
     factory :article do
-      sequence(:name) { |n| Faker::Lorem.words(rand(2..4)).join(' ') + " ##{n}" }
+      sequence(:name) { |n| Faker::Lorem.words(number: rand(2..4)).join(' ') + " ##{n}" }
       supplier { create :supplier }
       article_category { create :article_category }
     end
 
     factory :shared_article, class: SharedArticle do
-      sequence(:name) { |n| Faker::Lorem.words(rand(2..4)).join(' ') + " s##{n}" }
-      order_number { Faker::Lorem.characters(rand(1..12)) }
+      sequence(:name) { |n| Faker::Lorem.words(number: rand(2..4)).join(' ') + " s##{n}" }
+      order_number { Faker::Lorem.characters(number: rand(1..12)) }
       supplier { create :shared_supplier }
     end
   end
 
   factory :article_category do
-    sequence(:name) { |n| Faker::Lorem.characters(rand(2..12)) + " ##{n}" }
+    sequence(:name) { |n| Faker::Lorem.characters(number: rand(2..12)) + " ##{n}" }
   end
 
 end

spec/factories/doorkeeper.rb

@@ -5,7 +5,7 @@ FactoryBot.define do
 
   factory :oauth2_application, class: Doorkeeper::Application do
     name { Faker::App.name }
-    redirect_uri 'https://example.com:1234/app'
+    redirect_uri { 'https://example.com:1234/app' }
   end
 
   factory :oauth2_access_token, class: Doorkeeper::AccessToken do

spec/factories/financial_transaction_type.rb

@@ -3,12 +3,12 @@ require 'factory_bot'
 FactoryBot.define do
 
   factory :financial_transaction_class do
-    sequence(:name) { |n| Faker::Lorem.characters(rand(2..12)) + " ##{n}" }
+    sequence(:name) { |n| Faker::Lorem.characters(number: rand(2..12)) + " ##{n}" }
   end
 
   factory :financial_transaction_type do
     financial_transaction_class
-    sequence(:name) { |n| Faker::Lorem.words(rand(2..4)).join(' ') + " ##{n}" }
+    sequence(:name) { |n| Faker::Lorem.words(number: rand(2..4)).join(' ') + " ##{n}" }
   end
 
 end

spec/factories/order.rb

@@ -8,12 +8,12 @@ FactoryBot.define do
     article_ids { supplier.articles.map(&:id) unless supplier.nil? }
 
     transient do
-      article_count true
+      article_count { true }
     end
 
     # for an order from stock; need to add articles
     factory :stock_order do
-      supplier_id 0
+      supplier_id { 0 }
       # article_ids needs to be supplied
     end
 

spec/factories/supplier.rb

@@ -8,7 +8,7 @@ FactoryBot.define do
     address { Faker::Address.street_address }
 
     transient do
-      article_count 0
+      article_count { 0 }
     end
 
     after :create do |supplier, evaluator|

spec/factories/user.rb

@@ -10,7 +10,7 @@ FactoryBot.define do
 
     factory :admin do
       sequence(:nick) { |n| "admin#{n}" }
-      first_name 'Administrator'
+      first_name { 'Administrator' }
       after :create do |user, evaluator|
         create :workgroup, role_admin: true, user_ids: [user.id]
       end
@@ -35,11 +35,11 @@ FactoryBot.define do
     sequence(:name) {|n| "Group ##{n}"}
 
     factory :workgroup do
-      type ''
+      type { '' }
     end
 
     factory :ordergroup do
-      type 'Ordergroup'
+      type { 'Ordergroup' }
       sequence(:name) {|n| "Order group ##{n}"}
       # workaround to avoid needing to save the ordergroup
       #   avoids e.g. error after logging in related to applebar

spec/integration/config_spec.rb

@@ -1,7 +1,7 @@
 require_relative '../spec_helper'
 
 feature 'admin/configs' do
-  let(:name) { Faker::Lorem.words(rand(2..4)).join(' ') }
+  let(:name) { Faker::Lorem.words(number: rand(2..4)).join(' ') }
   let(:email) { Faker::Internet.email }
   let(:admin) { create :admin }
 

spec/lib/foodsoft_config_spec.rb

@@ -1,8 +1,8 @@
 require_relative '../spec_helper'
 
 describe FoodsoftConfig do
-  let(:name) { Faker::Lorem.words(rand(2..4)).join(' ') }
-  let(:other_name) { Faker::Lorem.words(rand(2..4)).join(' ') }
+  let(:name) { Faker::Lorem.words(number: rand(2..4)).join(' ') }
+  let(:other_name) { Faker::Lorem.words(number: rand(2..4)).join(' ') }
 
   it 'returns a default value' do
     expect(FoodsoftConfig[:protected][:database]).to be true

spec/lib/token_verifier_spec.rb

@@ -23,7 +23,7 @@ describe TokenVerifier do
     msg
     oldscope = FoodsoftConfig.scope
     begin
-      FoodsoftConfig.scope = Faker::Lorem.words(1)
+      FoodsoftConfig.scope = Faker::Lorem.words(number: 1)
       v2 = TokenVerifier.new(prefix)
       expect{ v2.verify(msg) }.to raise_error(TokenVerifier::InvalidScope)
     ensure
@@ -32,7 +32,7 @@ describe TokenVerifier do
   end
 
   it 'does not validate a random string' do
-    expect{ v.verify(Faker::Lorem.characters(100)) }.to raise_error(ActiveSupport::MessageVerifier::InvalidSignature)
+    expect{ v.verify(Faker::Lorem.characters(number: 100)) }.to raise_error(ActiveSupport::MessageVerifier::InvalidSignature)
   end
 
   it 'returns the message' do