Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

1 files changed, 8 insertions, 8 deletions

diff --git a/spec/factories.rb b/spec/factories.rb
index 26e8a795fa4..b7b2a1dac8e 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -2,23 +2,23 @@ include ActionDispatch::TestProcess
 
 FactoryGirl.define do
   sequence :sentence, aliases: [:title, :content] do
-    Faker::Lorem.sentence
+    FFaker::Lorem.sentence
   end
 
   sequence :name do
-    Faker::Name.name
+    FFaker::Name.name
   end
 
   sequence :file_name do
-    Faker::Internet.user_name
+    FFaker::Internet.user_name
   end
 
-  sequence(:url) { Faker::Internet.uri('http') }
+  sequence(:url) { FFaker::Internet.uri('http') }
 
   factory :user, aliases: [:author, :assignee, :owner, :creator] do
-    email { Faker::Internet.email }
+    email { FFaker::Internet.email }
     name
-    sequence(:username) { |n| "#{Faker::Internet.user_name}#{n}" }
+    sequence(:username) { |n| "#{FFaker::Internet.user_name}#{n}" }
     password "12345678"
     confirmed_at { Time.now }
     confirmation_token { nil }
@@ -122,12 +122,12 @@ FactoryGirl.define do
   factory :email do
     user
     email do
-      Faker::Internet.email('alias')
+      FFaker::Internet.email('alias')
     end
 
     factory :another_email do
       email do
-        Faker::Internet.email('another.alias')
+        FFaker::Internet.email('another.alias')
       end
     end
   end