Merge branch 'develop'5.1-beta1

1 files changed, 10 insertions, 10 deletions

diff --git a/test/unit/user_group_membership_test.rb b/test/unit/user_group_membership_test.rb
index 251229f..34a577c 100644
--- a/test/unit/user_group_membership_test.rb
+++ b/test/unit/user_group_membership_test.rb
@@ -2,29 +2,29 @@ require 'test_helper'
 
 class UserGroupMembershipTest < ActiveSupport::TestCase
   def test_should_have_a_valid_factory
-    assert Factory.build(:user_group_membership).valid?
+    assert FactoryGirl.build(:user_group_membership).valid?
   end
   def test_should_have_unique_members_in_each_group
-    group1 = Factory.create(:user_group)
-    group2 = Factory.create(:user_group)
-    user1 = Factory.create(:user)
-    user2 = Factory.create(:user)
-    member = Factory.create(
+    group1 = FactoryGirl.create(:user_group)
+    group2 = FactoryGirl.create(:user_group)
+    user1 = FactoryGirl.create(:user)
+    user2 = FactoryGirl.create(:user)
+    member = FactoryGirl.create(
                             :user_group_membership,
                             :user_id => user1.id,
                             :user_group_id => group1.id
                             )
-    assert !Factory.build(
+    assert !FactoryGirl.build(
                           :user_group_membership,
                           :user_id => user1.id,
                           :user_group_id => group1.id
                             ).valid?
-    assert Factory.build(
+    assert FactoryGirl.build(
                           :user_group_membership,
                           :user_id => user1.id,
                           :user_group_id => group2.id
                             ).valid?
-    assert Factory.build(
+    assert FactoryGirl.build(
                           :user_group_membership,
                           :user_id => user2.id,
                           :user_group_id => group1.id
@@ -32,7 +32,7 @@ class UserGroupMembershipTest < ActiveSupport::TestCase
   end
   
   def test_that_the_initial_state_should_be_active
-    @user_group_membership = Factory.create(:user_group_membership)
+    @user_group_membership = FactoryGirl.create(:user_group_membership)
     assert_equal 'active', @user_group_membership.state
     assert @user_group_membership.active?
   end