Merge branch 'master' into registry-791

spec/models/concerns/domain/deletable_spec.rb

@@ -1,19 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Domain, db: false do
-  it { is_expected.to alias_attribute(:delete_time, :delete_at) }
-
-  describe '#discarded?' do
-    context 'when :deleteCandidate status is present' do
-      let(:domain) { described_class.new(statuses: [DomainStatus::DELETE_CANDIDATE]) }
-
-      specify { expect(domain).to be_discarded }
-    end
-
-    context 'when :deleteCandidate status is absent' do
-      let(:domain) { described_class.new(statuses: []) }
-
-      specify { expect(domain).to_not be_discarded }
-    end
-  end
-end

spec/models/epp/domain_spec.rb

@@ -21,11 +21,7 @@ RSpec.describe Epp::Domain, db: false do
         expect(domain.registered_at).to eq(Time.zone.parse('05.07.2010'))
       end
 
-      it 'has :valid_from set to now' do
-        expect(domain.valid_from).to eq(Time.zone.parse('05.07.2010'))
-      end
-
-      it 'has :valid_to set to the beginning of next day after :valid_from' do
+      it 'has :valid_to set to the beginning of next day after :registered_at' do
         expect(domain.valid_to).to eq(Time.zone.parse('06.07.2011 00:00'))
       end
     end

spec/models/invoice_spec.rb

@@ -13,10 +13,8 @@ describe Invoice do
         "Currency is missing",
         "Due date is missing",
         "Invoice items is missing",
-        "Invoice type is missing",
         "Seller iban is missing",
         "Seller name is missing",
-        "Vat prc is missing"
       ])
     end
 
@@ -52,20 +50,6 @@ describe Invoice do
       @invoice.seller_address.should == 'Paldiski mnt. 123, Tallinn'
     end
 
-    it 'should calculate sums correctly' do
-      @invoice = create(:invoice)
-      @invoice.vat_prc.should == BigDecimal.new('0.2')
-      @invoice.sum_without_vat.should == BigDecimal.new('300.0')
-      @invoice.vat.should == BigDecimal.new('60.0')
-      @invoice.sum.should == BigDecimal.new('360.0')
-
-      ii = @invoice.items.first
-      ii.item_sum_without_vat.should == BigDecimal.new('150.0')
-
-      ii = @invoice.items.last
-      ii.item_sum_without_vat.should == BigDecimal.new('150.0')
-    end
-
     it 'should cancel overdue invoices' do
       create(:invoice, created_at: Time.zone.now - 35.days, due_date: Time.zone.now - 30.days)
       Invoice.cancel_overdue_invoices