Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.0
3.1.2
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
source "https://rubygems.org"

ruby "2.3.0"
ruby "3.1.2"

gem "activerecord"
gem "byebug"
gem "database_cleaner"
gem "factory_girl"
gem "factory_bot"
gem "pg"
gem "pry"
gem "rake"
Expand Down
99 changes: 50 additions & 49 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,67 +1,68 @@
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)
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)
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)
activemodel (7.0.4.3)
activesupport (= 7.0.4.3)
activerecord (7.0.4.3)
activemodel (= 7.0.4.3)
activesupport (= 7.0.4.3)
activesupport (7.0.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
byebug (11.1.3)
coderay (1.1.3)
concurrent-ruby (1.2.2)
database_cleaner (2.0.2)
database_cleaner-active_record (>= 2, < 3)
database_cleaner-active_record (2.1.0)
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
diff-lcs (1.5.0)
factory_bot (6.2.1)
activesupport (>= 5.0.0)
i18n (1.13.0)
concurrent-ruby (~> 1.0)
method_source (1.0.0)
minitest (5.18.0)
pg (1.5.3)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
rake (13.0.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.5)
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)
thread_safe (~> 0.1)
rspec-support (~> 3.12.0)
rspec-support (3.12.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)

PLATFORMS
ruby
arm64-darwin-21

DEPENDENCIES
activerecord
byebug
database_cleaner
factory_girl
factory_bot
pg
pry
rake
rspec

RUBY VERSION
ruby 3.1.2p20

BUNDLED WITH
1.10.6
2.3.20
2 changes: 1 addition & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateSchema < ActiveRecord::Migration
class CreateSchema < ActiveRecord::Migration[7.0]
def self.up
create_table :people, force: true do |table|
table.string :name, null: false
Expand Down
6 changes: 3 additions & 3 deletions spec/factories.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FactoryGirl.define do
FactoryBot.define do
sequence :name do |value|
"name#{value}sequence"
end
Expand All @@ -12,7 +12,7 @@
location
name
role
salary 0
salary { 0 }
end

factory :region do
Expand All @@ -21,6 +21,6 @@

factory :role do
name
billable true
billable { true }
end
end
4 changes: 2 additions & 2 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand Down