diff --git a/spec/models/bank_transaction_spec.rb b/spec/models/bank_transaction_spec.rb index 27640453c..627427d57 100644 --- a/spec/models/bank_transaction_spec.rb +++ b/spec/models/bank_transaction_spec.rb @@ -34,17 +34,6 @@ describe BankTransaction do @bank_transaction.errors.full_messages.should match_array([]) end - it 'should bind transaction with invoice manually' do - r = Fabricate(:registrar_with_no_account_activities, reference_no: 'RF7086666663') - invoice = r.issue_prepayment_invoice(200, 'add some money') - - bt = Fabricate(:bank_transaction, { sum: 240 }) - bt.bind_invoice(invoice.number) - - invoice.receipt_date.should_not be_blank - r.cash_account.balance.should == 200.0 - end - it 'should not bind transaction with mismatching sums' do r = Fabricate(:registrar_with_no_account_activities, reference_no: 'RF7086666663') invoice = r.issue_prepayment_invoice(200, 'add some money') diff --git a/spec/models/domain_contact_spec.rb b/spec/models/domain_contact_spec.rb index 14a1aa258..783d7e69b 100644 --- a/spec/models/domain_contact_spec.rb +++ b/spec/models/domain_contact_spec.rb @@ -51,10 +51,12 @@ describe DomainContact do end it 'should have one version' do + @domain_contact = Fabricate.create(:domain_contact) + with_versioning do @domain_contact.versions.reload.should == [] - @domain_contact.updated_at = Time.zone.now # trigger new version - @domain_contact.save + @domain_contact.contact = Fabricate.create(:contact) + @domain_contact.save! @domain_contact.errors.full_messages.should match_array([]) @domain_contact.versions.size.should == 1 end @@ -82,10 +84,12 @@ describe DomainContact do end it 'should have one version' do + @domain_contact = Fabricate.create(:domain_contact) + with_versioning do @domain_contact.versions.reload.should == [] - @domain_contact.updated_at = Time.zone.now # trigger new version - @domain_contact.save + @domain_contact.contact = Fabricate.create(:contact) + @domain_contact.save! @domain_contact.errors.full_messages.should match_array([]) @domain_contact.versions.size.should == 1 end @@ -115,7 +119,7 @@ describe DomainContact do it 'should have one version' do with_versioning do @domain_contact.versions.reload.should == [] - @domain_contact.updated_at = Time.zone.now # trigger new version + @domain_contact.contact = Fabricate.create(:contact) @domain_contact.save @domain_contact.errors.full_messages.should match_array([]) @domain_contact.versions.size.should == 1 diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb index c6627d877..5b8752d8d 100644 --- a/spec/models/domain_spec.rb +++ b/spec/models/domain_spec.rb @@ -353,118 +353,6 @@ RSpec.describe Domain do domain.statuses.should == ['expired'] end - it 'should know its create price' do - Fabricate(:pricelist, { - category: 'ee', - operation_category: 'create', - duration: '1year', - price: 1.50, - valid_from: Time.zone.parse('2015-01-01'), - valid_to: nil - }) - - domain = Fabricate(:domain) - domain.pricelist('create').price.amount.should == 1.50 - - domain = Fabricate(:domain, period: 12, period_unit: 'm') - domain.pricelist('create').price.amount.should == 1.50 - - domain = Fabricate(:domain, period: 365, period_unit: 'd') - domain.pricelist('create').price.amount.should == 1.50 - - Fabricate(:pricelist, { - category: 'ee', - operation_category: 'create', - duration: '2years', - price: 3, - valid_from: Time.zone.parse('2015-01-01'), - valid_to: nil - }) - - domain = Fabricate(:domain, period: 2) - domain.pricelist('create').price.amount.should == 3.0 - - domain = Fabricate(:domain, period: 24, period_unit: 'm') - domain.pricelist('create').price.amount.should == 3.0 - - domain = Fabricate(:domain, period: 730, period_unit: 'd') - domain.pricelist('create').price.amount.should == 3.0 - - Fabricate(:pricelist, { - category: 'ee', - operation_category: 'create', - duration: '3years', - price: 6, - valid_from: Time.zone.parse('2015-01-01'), - valid_to: nil - }) - - domain = Fabricate(:domain, period: 3) - domain.pricelist('create').price.amount.should == 6.0 - - domain = Fabricate(:domain, period: 36, period_unit: 'm') - domain.pricelist('create').price.amount.should == 6.0 - - domain = Fabricate(:domain, period: 1095, period_unit: 'd') - domain.pricelist('create').price.amount.should == 6.0 - end - - it 'should know its renew price' do - Fabricate(:pricelist, { - category: 'ee', - operation_category: 'renew', - duration: '1year', - price: 1.30, - valid_from: Time.zone.parse('2015-01-01'), - valid_to: nil - }) - - domain = Fabricate(:domain) - domain.pricelist('renew').price.amount.should == 1.30 - - domain = Fabricate(:domain, period: 12, period_unit: 'm') - domain.pricelist('renew').price.amount.should == 1.30 - - domain = Fabricate(:domain, period: 365, period_unit: 'd') - domain.pricelist('renew').price.amount.should == 1.30 - - Fabricate(:pricelist, { - category: 'ee', - operation_category: 'renew', - duration: '2years', - price: 3.1, - valid_from: Time.zone.parse('2015-01-01'), - valid_to: nil - }) - - domain = Fabricate(:domain, period: 2) - domain.pricelist('renew').price.amount.should == 3.1 - - domain = Fabricate(:domain, period: 24, period_unit: 'm') - domain.pricelist('renew').price.amount.should == 3.1 - - domain = Fabricate(:domain, period: 730, period_unit: 'd') - domain.pricelist('renew').price.amount.should == 3.1 - - Fabricate(:pricelist, { - category: 'ee', - operation_category: 'renew', - duration: '3years', - price: 6.1, - valid_from: Time.zone.parse('2015-01-01'), - valid_to: nil - }) - - domain = Fabricate(:domain, period: 3) - domain.pricelist('renew').price.amount.should == 6.1 - - domain = Fabricate(:domain, period: 36, period_unit: 'm') - domain.pricelist('renew').price.amount.should == 6.1 - - domain = Fabricate(:domain, period: 1095, period_unit: 'd') - domain.pricelist('renew').price.amount.should == 6.1 - end - it 'should set pending update' do @domain.statuses = DomainStatus::OK # restore @domain.save