diff --git a/.ruby-version b/.ruby-version index 276cbf9..097a15a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.0 +2.6.2 diff --git a/Gemfile b/Gemfile index d20d0b2..afe53df 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,11 @@ source "https://rubygems.org" -ruby "2.3.0" +ruby "2.6.2" gem "activerecord" gem "byebug" gem "database_cleaner" -gem "factory_girl" +gem "factory_bot" gem "pg" gem "pry" gem "rake" diff --git a/Gemfile.lock b/Gemfile.lock index 6f91f22..166adaa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,53 +1,49 @@ GEM remote: https://rubygems.org/ specs: - activemodel (4.2.4) - activesupport (= 4.2.4) - builder (~> 3.1) - activerecord (4.2.4) - activemodel (= 4.2.4) - activesupport (= 4.2.4) - arel (~> 6.0) - activesupport (4.2.4) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) + activemodel (5.2.2.1) + activesupport (= 5.2.2.1) + activerecord (5.2.2.1) + activemodel (= 5.2.2.1) + activesupport (= 5.2.2.1) + arel (>= 9.0) + activesupport (5.2.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (6.0.3) - builder (3.2.2) - byebug (6.0.2) - coderay (1.1.0) - database_cleaner (1.5.1) - diff-lcs (1.2.5) - factory_girl (4.5.0) - activesupport (>= 3.0.0) - i18n (0.7.0) - json (1.8.3) - method_source (0.8.2) - minitest (5.8.2) - pg (0.18.3) - pry (0.10.3) + arel (9.0.0) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + database_cleaner (1.7.0) + diff-lcs (1.3) + factory_bot (5.0.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + method_source (0.9.2) + minitest (5.11.3) + pg (1.1.4) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - rake (10.4.2) - rspec (3.3.0) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-core (3.3.2) - rspec-support (~> 3.3.0) - rspec-expectations (3.3.1) + method_source (~> 0.9.0) + rake (12.3.2) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-mocks (3.3.2) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-support (3.3.0) - slop (3.6.0) - thread_safe (0.3.5) - tzinfo (1.2.2) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + thread_safe (0.3.6) + tzinfo (1.2.5) thread_safe (~> 0.1) PLATFORMS @@ -57,11 +53,14 @@ DEPENDENCIES activerecord byebug database_cleaner - factory_girl + factory_bot pg pry rake rspec +RUBY VERSION + ruby 2.6.2p47 + BUNDLED WITH - 1.10.6 + 1.17.2 diff --git a/db/schema.rb b/db/schema.rb index 241a085..fa83afd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,4 +1,4 @@ -class CreateSchema < ActiveRecord::Migration +class CreateSchema < ActiveRecord::Migration[5.2] def self.up create_table :people, force: true do |table| table.string :name, null: false diff --git a/spec/factories.rb b/spec/factories.rb index f874f49..8f6647e 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do sequence :name do |value| "name#{value}sequence" end @@ -12,7 +12,7 @@ location name role - salary 0 + salary { 0 } end factory :region do @@ -21,6 +21,6 @@ factory :role do name - billable true + billable { true } end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 8fa27b4..b32ed81 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,6 @@ require "active_record" require "database_cleaner" -require "factory_girl" +require "factory_bot" Dir.glob(File.expand_path("../../app/models/*.rb", __FILE__)) do |model| require model @@ -20,7 +20,7 @@ CreateSchema.suppress_messages { CreateSchema.migrate(:up) } RSpec.configure do |config| - config.include FactoryGirl::Syntax::Methods + config.include FactoryBot::Syntax::Methods config.before(:suite) do DatabaseCleaner.clean_with(:deletion)