diff options
author | spag <spag@golwen.net> | 2012-12-31 08:50:27 +0100 |
---|---|---|
committer | spag <spag@golwen.net> | 2012-12-31 08:50:27 +0100 |
commit | aed84444142604a62e37e57acfaaf957219e2c8d (patch) | |
tree | e00b1f5844590393171e0bc839ab516d39f5144d /test/functional/page_controller_test.rb | |
parent | c24bd3a8212e85894b2f7c26e190fe5e89fbaaf2 (diff) | |
parent | 12c8f4c82770ded6ea6b519e4451ed6757419ddf (diff) |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'test/functional/page_controller_test.rb')
-rw-r--r-- | test/functional/page_controller_test.rb | 8 |
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 |