Merge branch 'upgrade/gemfile' into 'master'

Upgrade/gemfile

See merge request leap/webapp!55

2 files changed, 3 insertions, 3 deletions

diff --git a/features/step_definitions/auth_steps.rb b/features/step_definitions/auth_steps.rb
index 52c92ee..81c5fc5 100644
--- a/features/step_definitions/auth_steps.rb
+++ b/features/step_definitions/auth_steps.rb
@@ -1,7 +1,7 @@
 Given /^I authenticated$/ do
   @testcode = InviteCode.new
   @testcode.save!
-  @user = FactoryGirl.create(:user, :invite_code => @testcode.invite_code)
+  @user = FactoryBot.create(:user, :invite_code => @testcode.invite_code)
   @my_auth_token = Token.create user_id: @user.id
 end
 
diff --git a/features/step_definitions/messages_steps.rb b/features/step_definitions/messages_steps.rb
index 30bc7c3..89d0196 100644
--- a/features/step_definitions/messages_steps.rb
+++ b/features/step_definitions/messages_steps.rb
@@ -1,5 +1,5 @@
 Given /^there is a message for me$/ do
-  @message = FactoryGirl.create :message, user_ids_to_show: [@user.id]
+  @message = FactoryBot.create :message, user_ids_to_show: [@user.id]
 end
 
 Given /^there is a message for me with:$/ do |options|
@@ -8,7 +8,7 @@ Given /^there is a message for me with:$/ do |options|
   if old_message = Message.find(attributes['id'])
     old_message.destroy
   end
-  @message = FactoryGirl.create :message, attributes
+  @message = FactoryBot.create :message, attributes
 end
 
 Given(/^that message is marked as read$/) do