Merge branch 'develop' of github.com:amooma/GS5 into develop

1 files changed, 4 insertions, 4 deletions

diff --git a/test/functional/page_controller_test.rb b/test/functional/page_controller_test.rb
index a5ae5ad..2bc1b80 100644
--- a/test/functional/page_controller_test.rb
+++ b/test/functional/page_controller_test.rb
@@ -11,8 +11,8 @@ class PageControllerTest < ActionController::TestCase
   
   
   test "a logged in user should get index" do
-    @tenant = Factory.create(:tenant)
-    @user  = Factory.create(:user)
+    @tenant = FactoryGirl.create(:tenant)
+    @user  = FactoryGirl.create(:user)
     
     @tenant.users << @user
     
@@ -22,8 +22,8 @@ class PageControllerTest < ActionController::TestCase
   end
 
   test "a logged out user should be redirected to the login" do
-    @tenant = Factory.create(:tenant)
-    @user  = Factory.create(:user)
+    @tenant = FactoryGirl.create(:tenant)
+    @user  = FactoryGirl.create(:user)
     
     @tenant.users << @user