dorsale 3.8.1 → 3.9.0

data/spec/factories/flyboy_task_comments.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :flyboy_task_comment, class: ::Dorsale::Flyboy::TaskComment do
     task { create(:flyboy_task) }
     date { Time.zone.now }

data/spec/factories/flyboy_tasks.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :flyboy_task, class: ::Dorsale::Flyboy::Task do
     name        { "I-am-a-task#{Kernel.rand(1_000..9_999)}"                }
     description { "I-am-the-task-description_#{Kernel.rand(1_000..9_999)}" }

data/spec/mailers/user_mailer.rb

@@ -1,22 +1,21 @@
-require 'rails_helper'
+require "rails_helper"
 
 describe ::Dorsale::UserMailer do
   describe "New Account" do
     let(:user) { create(:user) }
     let(:email) { ::Dorsale::UserMailer.new_account(user, user.password) }
 
-    it 'should send to the right person' do
+    it "should send to the right person" do
       expect(email.to).to eq([user.email])
     end
 
-    it 'should have the right sender' do
+    it "should have the right sender" do
       expect(email.from).to eq(["contact@example.org"])
     end
 
-    it 'should contain user_type, login and password' do
+    it "should contain user_type, login and password" do
       expect(email.body).to include user.email
       expect(email.body).to include user.password
     end
-
   end
-end
+end

data/spec/models/dorsale/address_spec.rb

@@ -1,45 +1,45 @@
-require 'rails_helper'
+require "rails_helper"
 
 module Dorsale
   RSpec.describe Address, :type => :model do
     it { should belong_to :addressable }
     it { should validate_presence_of :addressable }
 
-    describe '#one_line' do
-      it 'should build a one line address' do
-        address = Address.create(
-          street:     '3 Rue Marx Dormoy',
-          street_bis: 'L\'atelier',
-          zip:        '13004',
-          city:       'Marseille',
-          country:    'France'
+    describe "#one_line" do
+      it "should build a one line address" do
+        address = Address.new(
+          street:     "3 Rue Marx Dormoy",
+          street_bis: "L'atelier",
+          zip:        "13004",
+          city:       "Marseille",
+          country:    "France",
         )
 
-        expect(address.one_line).to eq('3 Rue Marx Dormoy, L\'atelier, 13004 Marseille, France')
+        expect(address.one_line).to eq("3 Rue Marx Dormoy, L'atelier, 13004 Marseille, France")
       end
 
-      it 'should remove useless commas' do
-        address = Address.create(
-          street:     '3 Rue Marx Dormoy',
-          street_bis: '',
-          zip:        '13004',
-          city:       'Marseille',
-          country:    ''
+      it "should remove useless commas" do
+        address = Address.new(
+          street:     "3 Rue Marx Dormoy",
+          street_bis: "",
+          zip:        "13004",
+          city:       "Marseille",
+          country:    "",
         )
 
-        expect(address.one_line).to eq('3 Rue Marx Dormoy, 13004 Marseille')
+        expect(address.one_line).to eq("3 Rue Marx Dormoy, 13004 Marseille")
       end
 
-      it 'should remove useless commas' do
-        address = Address.create(
-          street:     '3 Rue Marx Dormoy',
-          street_bis: '',
-          zip:        '',
-          city:       'Marseille',
-          country:    ''
+      it "should remove useless commas" do
+        address = Address.new(
+          street:     "3 Rue Marx Dormoy",
+          street_bis: "",
+          zip:        "",
+          city:       "Marseille",
+          country:    "",
         )
 
-        expect(address.one_line).to eq('3 Rue Marx Dormoy, Marseille')
+        expect(address.one_line).to eq("3 Rue Marx Dormoy, Marseille")
       end
     end
   end

data/spec/models/dorsale/billing_machine/invoice_line_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-describe ::Dorsale::BillingMachine::InvoiceLine, type: :model do
+describe Dorsale::BillingMachine::InvoiceLine, type: :model do
   it { is_expected.to belong_to :invoice }
   it { is_expected.to validate_presence_of :invoice }
 
@@ -17,26 +17,26 @@ describe ::Dorsale::BillingMachine::InvoiceLine, type: :model do
 
   describe "default values" do
     it "quantity should be 0" do
-      expect(::Dorsale::BillingMachine::InvoiceLine.new.quantity).to eq 0
+      expect(described_class.new.quantity).to eq 0
     end
 
     it "unit_price should be 0" do
-      expect(::Dorsale::BillingMachine::InvoiceLine.new.unit_price).to eq 0
+      expect(described_class.new.unit_price).to eq 0
     end
 
     it "vat_rate should be 0" do
-      expect(::Dorsale::BillingMachine::InvoiceLine.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+      expect(described_class.new.vat_rate).to eq Dorsale::BillingMachine::DEFAULT_VAT_RATE
     end
   end
 
   it "should be sorted by created_at" do
-    line1 = create(:billing_machine_invoice_line, :created_at => Time.zone.now + 1.minutes)
+    line1 = create(:billing_machine_invoice_line, :created_at => Time.zone.now + 1.minute)
     line2 = create(:billing_machine_invoice_line, :created_at => Time.zone.now + 2.minutes)
     line3 = create(:billing_machine_invoice_line, :created_at => Time.zone.now + 3.minutes)
     line4 = create(:billing_machine_invoice_line, :created_at => Time.zone.now + 4.minutes)
     line3.update!(:created_at => Time.zone.now + 5.minutes)
 
-    lines = ::Dorsale::BillingMachine::InvoiceLine.all
+    lines = described_class.all
     expect(lines).to eq [line1, line2, line4, line3]
   end
 

data/spec/models/dorsale/billing_machine/invoice_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-describe ::Dorsale::BillingMachine::Invoice, type: :model do
+describe Dorsale::BillingMachine::Invoice, type: :model do
   # Reset to default mode before each test
   before :each do
     ::Dorsale::BillingMachine.vat_mode = :single
@@ -10,7 +10,6 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
   it { is_expected.to belong_to :payment_term }
   it { is_expected.to have_many(:lines).dependent(:destroy) }
 
-  it { is_expected.to validate_presence_of :id_card }
   it { is_expected.to validate_presence_of :date }
 
   it { is_expected.to respond_to :date }
@@ -19,8 +18,8 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
   it { is_expected.to respond_to :unique_index }
   it { is_expected.to respond_to :commercial_discount }
 
-  it {is_expected.to respond_to :total_excluding_taxes}
-  it {is_expected.to respond_to :total_including_taxes}
+  it { is_expected.to respond_to :total_excluding_taxes }
+  it { is_expected.to respond_to :total_including_taxes }
 
   it { is_expected.to respond_to :advance }
 
@@ -39,7 +38,7 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
 
     context "when unique index is nil" do
       it "should be assigned upon creation" do
-        ::Dorsale::BillingMachine::Invoice.destroy_all
+        described_class.destroy_all
         invoice1 = create(:billing_machine_invoice, date: "2014-02-01")
         expect(invoice1.unique_index).to eq(1)
       end
@@ -55,33 +54,49 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
 
   describe "payment_status" do
     it "should be pending if nothing special" do
-      invoice = create(:billing_machine_invoice, due_date: Time.zone.now.to_date, date: Time.zone.now.to_date, paid: false)
+      invoice = create(:billing_machine_invoice,
+        :due_date => Date.current,
+        :date     => Date.current,
+        :paid     => false,
+      )
       expect(invoice.payment_status).to eq(:pending)
     end
 
     it "should be late if a bit late" do
-        invoice = create(:billing_machine_invoice, due_date: Time.zone.now.to_date-1, date: Time.zone.now.to_date-1, paid: false)
-        expect(invoice.payment_status).to eq(:late)
+      invoice = create(:billing_machine_invoice,
+        :due_date => Date.current-1,
+        :date     => Date.current-1,
+        :paid     => false,
+      )
+      expect(invoice.payment_status).to eq(:late)
     end
 
     it "should be on_alert if a too late" do
-        invoice = create(:billing_machine_invoice, due_date: Time.zone.now.to_date-16, date: Time.zone.now.to_date-16, paid: false)
-        expect(invoice.payment_status).to eq(:on_alert)
+      invoice = create(:billing_machine_invoice,
+        :due_date => Date.current-16,
+        :date     => Date.current-16,
+        :paid     => false,
+      )
+      expect(invoice.payment_status).to eq(:on_alert)
     end
 
     it "should be paid if paid" do
-        invoice = create(:billing_machine_invoice, due_date: Time.zone.now.to_date-16, date: Time.zone.now.to_date-16, paid: true)
-        expect(invoice.payment_status).to eq(:paid)
+      invoice = create(:billing_machine_invoice,
+        :due_date => Date.current-16,
+        :date     => Date.current-16,
+        :paid     => true,
+      )
+      expect(invoice.payment_status).to eq(:paid)
     end
 
     it "should be on_alert if no due date is defined" do
-        invoice = create(:billing_machine_invoice, due_date: nil, date: Time.zone.now.to_date, paid: false)
-        expect(invoice.payment_status).to eq(:on_alert)
+      invoice = create(:billing_machine_invoice, due_date: nil, date: Date.current, paid: false)
+      expect(invoice.payment_status).to eq(:on_alert)
     end
 
     it "should be on_alert if no due date is defined" do
-        invoice = create(:billing_machine_invoice, due_date: nil, date: Time.zone.now.to_date, paid: true)
-        expect(invoice.payment_status).to eq(:paid)
+      invoice = create(:billing_machine_invoice, due_date: nil, date: Date.current, paid: true)
+      expect(invoice.payment_status).to eq(:paid)
     end
 
     it "should work fine upon creation" do
@@ -101,7 +116,7 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
 
   describe "vat rate" do
     it "default vat rate should be 20" do
-      expect(::Dorsale::BillingMachine::Invoice.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+      expect(described_class.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
     end
 
     it "it should be specified vat rate" do
@@ -119,15 +134,15 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
       invoice = create(:billing_machine_invoice)
       line1   = create(:billing_machine_invoice_line, invoice: invoice, vat_rate: 10)
 
-      expect{
-        line2   = create(:billing_machine_invoice_line, invoice: invoice, vat_rate: 15)
+      expect {
+        line2 = create(:billing_machine_invoice_line, invoice: invoice, vat_rate: 15)
       }.to raise_error(RuntimeError)
     end
 
     it "it should raise when vat mode is multiple" do
       ::Dorsale::BillingMachine.vat_mode = :multiple
       invoice = build(:billing_machine_invoice)
-      expect{ invoice.vat_rate }.to raise_error(RuntimeError)
+      expect { invoice.vat_rate }.to raise_error(RuntimeError)
     end
   end
 
@@ -143,7 +158,7 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
         :unit_price => 5,
         :vat_rate   => 20,
         :invoice    => invoice,
-      ) #total 50
+      ) # total 50
 
       create(:billing_machine_invoice_line,
         :quantity   => 10,
@@ -168,7 +183,7 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
         :unit_price => 5,
         :vat_rate   => 20,
         :invoice    => invoice,
-      ) #total 50
+      ) # total 50
 
       create(:billing_machine_invoice_line,
         :quantity   => 10,
@@ -194,5 +209,4 @@ describe ::Dorsale::BillingMachine::Invoice, type: :model do
       expect(invoice.balance).to eq(0)
     end
   end
-
 end

data/spec/models/dorsale/billing_machine/quotation_line_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-describe ::Dorsale::BillingMachine::QuotationLine do
+describe Dorsale::BillingMachine::QuotationLine do
   it { is_expected.to belong_to :quotation }
   it { is_expected.to validate_presence_of :quotation }
 
@@ -17,25 +17,25 @@ describe ::Dorsale::BillingMachine::QuotationLine do
 
   describe "default values" do
     it "quantity should be 0" do
-      expect(::Dorsale::BillingMachine::QuotationLine.new.quantity).to eq 0
+      expect(described_class.new.quantity).to eq 0
     end
 
     it "unit_price should be 0" do
-      expect(::Dorsale::BillingMachine::QuotationLine.new.unit_price).to eq 0
+      expect(described_class.new.unit_price).to eq 0
     end
 
     it "vat_rate should be 0" do
-      expect(::Dorsale::BillingMachine::QuotationLine.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+      expect(described_class.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
     end
   end
 
   it "should be sorted by created_at" do
-    line1 = create(:billing_machine_quotation_line,:created_at => Time.zone.now + 1.minutes)
-    line2 = create(:billing_machine_quotation_line,:created_at => Time.zone.now + 2.minutes)
-    line3 = create(:billing_machine_quotation_line,:created_at => Time.zone.now + 3.minutes)
-    line4 = create(:billing_machine_quotation_line,:created_at => Time.zone.now + 4.minutes)
+    line1 = create(:billing_machine_quotation_line, :created_at => Time.zone.now + 1.minute)
+    line2 = create(:billing_machine_quotation_line, :created_at => Time.zone.now + 2.minutes)
+    line3 = create(:billing_machine_quotation_line, :created_at => Time.zone.now + 3.minutes)
+    line4 = create(:billing_machine_quotation_line, :created_at => Time.zone.now + 4.minutes)
     line3.update!(:created_at => Time.zone.now + 5.minutes)
-    lines = ::Dorsale::BillingMachine::QuotationLine.all
+    lines = described_class.all
     expect(lines).to eq [line1, line2, line4, line3]
   end
 
@@ -48,5 +48,4 @@ describe ::Dorsale::BillingMachine::QuotationLine do
     quotation = create(:billing_machine_quotation_line, quantity: nil, unit_price: nil, total: 0)
     expect(quotation.total).to eq(0)
   end
-
 end

data/spec/models/dorsale/billing_machine/quotation_spec.rb

@@ -1,14 +1,13 @@
 require "rails_helper"
 
-describe ::Dorsale::BillingMachine::Quotation do
+describe Dorsale::BillingMachine::Quotation do
   it { is_expected.to belong_to :customer }
   it { is_expected.to belong_to :payment_term }
   it { is_expected.to have_many(:lines).dependent(:destroy) }
 
-  it { is_expected.to validate_presence_of :id_card }
   it { is_expected.to validate_presence_of :date }
   it { is_expected.to validate_presence_of :state }
-  it { is_expected.to ensure_inclusion_of(:state).in_array(::Dorsale::BillingMachine::Quotation::STATES) }
+  it { is_expected.to ensure_inclusion_of(:state).in_array(described_class::STATES) }
   it { is_expected.to respond_to :date }
   it { is_expected.to respond_to :label }
   it { is_expected.to respond_to :vat_amount }
@@ -24,16 +23,16 @@ describe ::Dorsale::BillingMachine::Quotation do
 
   describe "default values" do
     it "default date should be today" do
-      expect(::Dorsale::BillingMachine::Quotation.new.date).to eq Time.zone.now.to_date
+      expect(described_class.new.date).to eq Date.current
     end
 
     it "default expires_at should be date + 1 month" do
-      quotation = ::Dorsale::BillingMachine::Quotation.new(date: "21/12/2012")
+      quotation = described_class.new(date: "21/12/2012")
       expect(quotation.expires_at).to eq Date.parse("21/01/2013")
     end
 
     it "default state should be pending" do
-      expect(::Dorsale::BillingMachine::Quotation.new.state).to eq "pending"
+      expect(described_class.new.state).to eq "pending"
     end
   end
 
@@ -44,34 +43,34 @@ describe ::Dorsale::BillingMachine::Quotation do
     quotation.save
   end
 
-  describe 'unique_index' do
-    context 'when unique index is 69' do
-      it 'should be assigned upon creation' do
-        quotation1 = create(:billing_machine_quotation, date: '2014-02-01', unique_index: 69)
-        quotation2 = create(:billing_machine_quotation, date: '2014-02-01')
+  describe "unique_index" do
+    context "when unique index is 69" do
+      it "should be assigned upon creation" do
+        quotation1 = create(:billing_machine_quotation, date: "2014-02-01", unique_index: 69)
+        quotation2 = create(:billing_machine_quotation, date: "2014-02-01")
         expect(quotation2.unique_index).to eq(70)
       end
     end
 
-    context 'when unique index is nil' do
-      it 'should be assigned upon creation' do
-        ::Dorsale::BillingMachine::Quotation.destroy_all
-        quotation1 = create(:billing_machine_quotation, date: '2014-02-01')
+    context "when unique index is nil" do
+      it "should be assigned upon creation" do
+        described_class.destroy_all
+        quotation1 = create(:billing_machine_quotation, date: "2014-02-01")
         expect(quotation1.unique_index).to eq(1)
       end
     end
   end
 
-  describe 'tracking_id' do
-    it 'should return correct tracking_id' do
-      quotation = create(:billing_machine_quotation, date: '2014-02-01')
-      expect(quotation.tracking_id).to eq('2014-01')
+  describe "tracking_id" do
+    it "should return correct tracking_id" do
+      quotation = create(:billing_machine_quotation, date: "2014-02-01")
+      expect(quotation.tracking_id).to eq("2014-01")
     end
   end
 
   describe "vat rate" do
     it "default vat rate should be 20" do
-      expect(::Dorsale::BillingMachine::Quotation.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
+      expect(described_class.new.vat_rate).to eq ::Dorsale::BillingMachine::DEFAULT_VAT_RATE
     end
 
     it "it should be specified vat rate" do
@@ -80,24 +79,24 @@ describe ::Dorsale::BillingMachine::Quotation do
 
     it "it should be first line vat rate" do
       quotation = create(:billing_machine_quotation)
-      line1   = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 10)
-      line2   = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 10)
+      line1 = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 10)
+      line2 = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 10)
       expect(quotation.vat_rate).to eq 10
     end
 
     it "it should raise if multiple vat_rates" do
       quotation = create(:billing_machine_quotation)
-      line1   = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 10)
+      line1     = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 10)
 
-      expect{
-        line2   = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 15)
+      expect {
+        line2 = create(:billing_machine_quotation_line, quotation: quotation, vat_rate: 15)
       }.to raise_error(RuntimeError)
     end
 
     it "it should raise when vat mode is multiple" do
       ::Dorsale::BillingMachine.vat_mode = :multiple
       quotation = build(:billing_machine_quotation)
-      expect{ quotation.vat_rate }.to raise_error(RuntimeError)
+      expect { quotation.vat_rate }.to raise_error(RuntimeError)
     end
   end
 
@@ -116,7 +115,7 @@ describe ::Dorsale::BillingMachine::Quotation do
         :vat_rate   => 20,
         :quantity   => 10,
         :unit_price => 5,
-        :quotation  => quotation
+        :quotation  => quotation,
       )
 
       expect(quotation.total_excluding_taxes).to eq(90.0)
@@ -165,5 +164,4 @@ describe ::Dorsale::BillingMachine::Quotation do
       expect(quotation.balance).to eq(0.0)
     end
   end
-
 end