diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 15:33:06 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 15:33:06 +0100 |
commit | 39aa7132ceed3d4beab3a9b828e571bbfc67c07e (patch) | |
tree | 6c88289c9f99be0af8635636fcdf64102090e5ec /test/unit/tenant_test.rb | |
parent | 5ad8203ce4f1bfea997960d0b52c626dea24b944 (diff) | |
parent | 6f69c1a85055ec7c2515719d79d2a7a4e60cec50 (diff) |
Merge branch 'develop'5.1-beta1
Diffstat (limited to 'test/unit/tenant_test.rb')
-rw-r--r-- | test/unit/tenant_test.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/unit/tenant_test.rb b/test/unit/tenant_test.rb index 4d4abce..0b342ba 100644 --- a/test/unit/tenant_test.rb +++ b/test/unit/tenant_test.rb @@ -2,23 +2,23 @@ require 'test_helper' class TenantTest < ActiveSupport::TestCase def test_should_have_a_valid_factory - assert Factory.build(:tenant).valid? + assert FactoryGirl.build(:tenant).valid? end def test_should_have_unique_name - tenant = Factory.create(:tenant) - assert !Factory.build(:tenant, :name => tenant.name).valid? - assert Factory.build(:tenant, :name => "different_#{tenant.name}").valid? + tenant = FactoryGirl.create(:tenant) + assert !FactoryGirl.build(:tenant, :name => tenant.name).valid? + assert FactoryGirl.build(:tenant, :name => "different_#{tenant.name}").valid? end def test_that_the_initial_state_should_be_active - @tenant = Factory.create(:tenant) + @tenant = FactoryGirl.create(:tenant) assert_equal 'active', @tenant.state assert @tenant.active? end def test_not_active_state_will_not_be_displayed - @tenant = Factory.create(:tenant) + @tenant = FactoryGirl.create(:tenant) assert_equal 1, Tenant.count @tenant.deactivate! |