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

1 files changed, 3 insertions, 3 deletions

diff --git a/test/unit/manufacturer_test.rb b/test/unit/manufacturer_test.rb
index 635a977..012d34d 100644
--- a/test/unit/manufacturer_test.rb
+++ b/test/unit/manufacturer_test.rb
@@ -2,18 +2,18 @@ require 'test_helper'
 
 class ManufacturerTest < ActiveSupport::TestCase
   def test_should_have_a_valid_factory
-    assert Factory.build(:manufacturer).valid?
+    assert FactoryGirl.build(:manufacturer).valid?
   end
 
   # StateMachine Tests:
   def test_that_the_initial_state_should_be_active
-    @manufacturer = Factory.create(:manufacturer)
+    @manufacturer = FactoryGirl.create(:manufacturer)
     assert_equal 'active', @manufacturer.state
     assert @manufacturer.active?
   end
   
   def test_not_active_state_will_not_be_displayed
-    @manufacturer = Factory.create(:manufacturer)
+    @manufacturer = FactoryGirl.create(:manufacturer)
     assert_equal 1, Manufacturer.count
     
     @manufacturer.deactivate!