dorsale 3.8.1 → 3.9.0

data/spec/models/dorsale/billing_machine_spec.rb

@@ -32,5 +32,4 @@ RSpec.describe Dorsale::BillingMachine do
     bm.default_currency = "$"
     expect(bm.default_currency).to eq "$"
   end
-
 end

data/spec/models/dorsale/comment_spec.rb

@@ -1,6 +1,5 @@
 require "rails_helper"
 
-
 RSpec.describe Dorsale::Comment, type: :model do
   it { is_expected.to belong_to :author }
   it { is_expected.to validate_presence_of :author }

data/spec/models/dorsale/customer_vault/corporation_spec.rb

@@ -1,27 +1,27 @@
-require 'rails_helper'
+require "rails_helper"
 
 RSpec.describe ::Dorsale::CustomerVault::Corporation, type: :model do
-    it { is_expected.to have_one(:address).dependent(:destroy) }
-    it { is_expected.to have_many :comments }
-    it { is_expected.to have_many :taggings }
-    it { is_expected.to have_many :tags }
-    it { is_expected.to have_many :individuals }
-    it { is_expected.to have_many(:tasks).dependent(:destroy) }
-    it { is_expected.to have_many(:events).dependent(:destroy) }
+  it { is_expected.to have_one(:address).dependent(:destroy) }
+  it { is_expected.to have_many :comments }
+  it { is_expected.to have_many :taggings }
+  it { is_expected.to have_many :tags }
+  it { is_expected.to have_many :individuals }
+  it { is_expected.to have_many(:tasks).dependent(:destroy) }
+  it { is_expected.to have_many(:events).dependent(:destroy) }
 
-    it { is_expected.to respond_to :legal_form }
-    it { is_expected.to respond_to :capital }
-    it { is_expected.to respond_to :immatriculation_number }
-    it { is_expected.to respond_to :naf }
-    it { is_expected.to respond_to :revenue }
-    it { is_expected.to respond_to :context }
-    it { is_expected.to respond_to :number_of_employees }
-    it { is_expected.to respond_to :societe_com }
+  it { is_expected.to respond_to :legal_form }
+  it { is_expected.to respond_to :capital }
+  it { is_expected.to respond_to :immatriculation_number }
+  it { is_expected.to respond_to :naf }
+  it { is_expected.to respond_to :revenue }
+  it { is_expected.to respond_to :context }
+  it { is_expected.to respond_to :number_of_employees }
+  it { is_expected.to respond_to :societe_com }
 
-    it { is_expected.to belong_to :activity_type }
-    it { is_expected.to belong_to :origin }
+  it { is_expected.to belong_to :activity_type }
+  it { is_expected.to belong_to :origin }
 
-    it { is_expected.to have_many(:comments).dependent(:destroy) }
+  it { is_expected.to have_many(:comments).dependent(:destroy) }
 
-    it { is_expected.to validate_presence_of :corporation_name }
+  it { is_expected.to validate_presence_of :corporation_name }
 end

data/spec/models/dorsale/customer_vault/event_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require "rails_helper"
 
 RSpec.describe ::Dorsale::CustomerVault::Event, type: :model do
   it { is_expected.to belong_to :author }

data/spec/models/dorsale/customer_vault/individual_spec.rb

@@ -40,6 +40,4 @@ RSpec.describe ::Dorsale::CustomerVault::Individual, :type => :model do
       expect(individual.activity_type).to eq nil
     end
   end
-
-
 end

data/spec/models/dorsale/customer_vault/link_spec.rb

@@ -12,4 +12,3 @@ RSpec.describe ::Dorsale::CustomerVault::Link, type: :model do
   it { should validate_presence_of :alice }
   it { should validate_presence_of :bob }
 end
-

data/spec/models/dorsale/customer_vault/person_spec.rb

@@ -1,10 +1,10 @@
 require "rails_helper"
 
 RSpec.describe ::Dorsale::CustomerVault::Person, type: :model do
-  describe '#links' do
+  describe "#links" do
     let!(:c)     { create(:customer_vault_corporation) }
     let!(:i)     { create(:customer_vault_individual)  }
-    let!(:link) { create(:customer_vault_link, alice: c, bob: i, title: 'a') }
+    let!(:link) { create(:customer_vault_link, alice: c, bob: i, title: "a") }
 
     it "should return links" do
       expect(c.links).to eq [link]
@@ -18,9 +18,9 @@ RSpec.describe ::Dorsale::CustomerVault::Person, type: :model do
       expect(link.other_person).to eq c
     end
 
-    describe '#destroy' do
+    describe "#destroy" do
       it "should destroy links" do
-        c.destroy
+        c.destroy!
         expect { link.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
@@ -32,14 +32,15 @@ RSpec.describe ::Dorsale::CustomerVault::Person, type: :model do
     corporation_event = create(:customer_vault_event, person: corporation)
     individual_event  = create(:customer_vault_event, person: individual)
 
-    expect(corporation.self_and_related_events).to contain_exactly(corporation_event, individual_event)
+    expect(corporation.self_and_related_events).to \
+      contain_exactly(corporation_event, individual_event)
     expect(individual.self_and_related_events).to contain_exactly(individual_event)
   end
 
   describe "address" do
     let(:person_without_address) {
       corporation = Dorsale::CustomerVault::Corporation.create!(name: "agilidée")
-      corporation.address.destroy
+      corporation.address.destroy!
       corporation
     }
 

data/spec/models/dorsale/expense_gun/category_spec.rb

@@ -1,6 +1,6 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe ::Dorsale::ExpenseGun::Category, type: :model  do
+RSpec.describe ::Dorsale::ExpenseGun::Category, type: :model do
   it { is_expected.to validate_presence_of :name }
 
   it "category factory should be valid?" do

data/spec/models/dorsale/expense_gun/expense_line_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require "rails_helper"
 
 RSpec.describe ::Dorsale::ExpenseGun::ExpenseLine, type: :model do
   it { is_expected.to belong_to :expense }
@@ -8,7 +8,10 @@ RSpec.describe ::Dorsale::ExpenseGun::ExpenseLine, type: :model do
   it { is_expected.to validate_presence_of :date }
   it { is_expected.to validate_presence_of :total_all_taxes }
   it { is_expected.to validate_presence_of :vat }
+  it { is_expected.to validate_presence_of :company_part }
   it { is_expected.to validate_numericality_of(:total_all_taxes).is_greater_than_or_equal_to(0) }
+  it { is_expected.to validate_numericality_of(:company_part).is_greater_than_or_equal_to(0) }
+  it { is_expected.to validate_numericality_of(:company_part).is_less_than_or_equal_to(100.0) }
 
   it "expense line factory should be valid?" do
     expense_line = build :expense_gun_expense_line, expense: build(:expense_gun_expense)
@@ -21,33 +24,30 @@ RSpec.describe ::Dorsale::ExpenseGun::ExpenseLine, type: :model do
     expect(expense_line.vat).to eq 123.0
   end
 
-  it "#company_part should be present" do
-    expect(build(:expense_gun_expense_line)).to validate_presence_of :company_part
-  end
-
-  it "#company_part should be >=0 and <= 100" do
-    expect(build(:expense_gun_expense_line)).to validate_numericality_of(:company_part).is_greater_than_or_equal_to(0).is_less_than_or_equal_to(100.0)
-  end
-
   it "#company_part should be 100 as default" do
-    expense_line = ::Dorsale::ExpenseGun::ExpenseLine.new
+    expense_line = described_class.new
     expect(expense_line.company_part).to eq 100.0
   end
 
   it "#employee_payback should be correct" do
-    expense_line = ::Dorsale::ExpenseGun::ExpenseLine.new(total_all_taxes: 100, company_part: 100)
+    expense_line = described_class.new(total_all_taxes: 100, company_part: 100)
     expect(expense_line.employee_payback).to eq 100.0
 
-    expense_line = ::Dorsale::ExpenseGun::ExpenseLine.new(total_all_taxes: 250, company_part: 50)
+    expense_line = described_class.new(total_all_taxes: 250, company_part: 50)
     expect(expense_line.employee_payback).to eq 125.0
 
-    expense_line = ::Dorsale::ExpenseGun::ExpenseLine.new(total_all_taxes: 200, company_part: 80)
+    expense_line = described_class.new(total_all_taxes: 200, company_part: 80)
     expect(expense_line.employee_payback).to eq 160.0
   end
 
   it "#total_vat_deductible should be proportional to #company_part}" do
     category     = build(:expense_gun_category, vat_deductible: true)
-    expense_line = build(:expense_gun_expense_line, category: category, total_all_taxes: 200, vat: 40, company_part: 50)
+    expense_line = build(:expense_gun_expense_line,
+      :category        => category,
+      :total_all_taxes => 200,
+      :vat             => 40,
+      :company_part    => 50,
+    )
     expect(expense_line.total_vat_deductible).to eq 20.0
   end
 

data/spec/models/dorsale/expense_gun/expense_spec.rb

@@ -1,6 +1,6 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe ::Dorsale::ExpenseGun::Expense, type: :model do
+RSpec.describe Dorsale::ExpenseGun::Expense, type: :model do
   it { is_expected.to have_many(:expense_lines).dependent(:destroy) }
   it { is_expected.to validate_presence_of :name }
   it { is_expected.to validate_presence_of :date }
@@ -10,11 +10,11 @@ RSpec.describe ::Dorsale::ExpenseGun::Expense, type: :model do
   end
 
   it "default #date should be tody" do
-    expect(::Dorsale::ExpenseGun::Expense.new.date).to eq Time.zone.now.to_date
+    expect(described_class.new.date).to eq Date.current
   end
 
   it "new expense should have new state" do
-    expect(::Dorsale::ExpenseGun::Expense.new.current_state).to be :draft
+    expect(described_class.new.current_state).to be :draft
   end
 
   describe "new state" do
@@ -142,25 +142,35 @@ RSpec.describe ::Dorsale::ExpenseGun::Expense, type: :model do
 
   it "#total_employee_payback should return sum of lines" do
     expense = build(:expense_gun_expense, expense_lines: [])
-    expense.expense_lines << build(:expense_gun_expense_line, total_all_taxes: 10, company_part: 100)
-    expense.expense_lines << build(:expense_gun_expense_line, total_all_taxes: 10, company_part: 50)
+
+    line1 = build(:expense_gun_expense_line, total_all_taxes: 10, company_part: 100)
+    expense.expense_lines << line1
+
+    line2 = build(:expense_gun_expense_line, total_all_taxes: 10, company_part: 50)
+    expense.expense_lines << line2
+
     expect(expense.total_employee_payback).to eq 15.0
   end
 
   it "#total_vat_deductible should return sum of lines" do
     expense = build(:expense_gun_expense, expense_lines: [])
+
     category1 = build(:expense_gun_category, vat_deductible: true)
+    line1 = build(:expense_gun_expense_line, vat: 10, category: category1, company_part: 50)
+    expense.expense_lines << line1
+
     category2 = build(:expense_gun_category, vat_deductible: false)
-    expense.expense_lines << build(:expense_gun_expense_line, vat: 10, category: category1, company_part: 50)
-    expense.expense_lines << build(:expense_gun_expense_line, vat: 10, category: category2, company_part: 50)
+    line2 = build(:expense_gun_expense_line, vat: 10, category: category2, company_part: 50)
+    expense.expense_lines << line2
+
     expect(expense.total_vat_deductible).to eq 5.0
   end
 
   it "#may_edit? should return false unless expense is not submitted" do
-    expect(::Dorsale::ExpenseGun::Expense.new(state: :draft).may_edit?).to be true
-    expect(::Dorsale::ExpenseGun::Expense.new(state: :submitted).may_edit?).to be false
-    expect(::Dorsale::ExpenseGun::Expense.new(state: :acceped).may_edit?).to be false
-    expect(::Dorsale::ExpenseGun::Expense.new(state: :refused).may_edit?).to be false
-    expect(::Dorsale::ExpenseGun::Expense.new(state: :canceled).may_edit?).to be false
+    expect(described_class.new(state: :draft).may_edit?).to be true
+    expect(described_class.new(state: :submitted).may_edit?).to be false
+    expect(described_class.new(state: :acceped).may_edit?).to be false
+    expect(described_class.new(state: :refused).may_edit?).to be false
+    expect(described_class.new(state: :canceled).may_edit?).to be false
   end
 end

data/spec/models/dorsale/flyboy/task_comment_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require "rails_helper"
 
 describe Dorsale::Flyboy::TaskComment do
   it { is_expected.to belong_to(:task) }
@@ -10,23 +10,23 @@ describe Dorsale::Flyboy::TaskComment do
   it { is_expected.to belong_to :author }
   it { is_expected.to validate_presence_of :author }
 
-  it 'should have a valid factory' do
+  it "should have a valid factory" do
     expect(build(:flyboy_task_comment)).to be_valid
   end
 
-  it 'should update the task progress upon creation' do
+  it "should update the task progress upon creation" do
     task    = create(:flyboy_task, progress: 10)
     comment = create(:flyboy_task_comment, progress: 20, task: task)
     expect(task.reload.progress).to eq(20)
   end
 
-  it 'should mark task as complete when progress == 100' do
+  it "should mark task as complete when progress == 100" do
     task    = create(:flyboy_task, progress: 10, done: false)
     comment = create(:flyboy_task_comment, progress: 100, task: task)
     expect(task.reload.done).to be true
   end
 
-  it 'should mark task as un complete when progress < 100' do
+  it "should mark task as un complete when progress < 100" do
     task    = create(:flyboy_task, progress: 100, done: true)
     comment = create(:flyboy_task_comment, progress: 90, task: task)
     expect(task.reload.done).to be false
@@ -50,6 +50,5 @@ describe Dorsale::Flyboy::TaskComment do
       expect(comment1.reload.progress).to eq 30
       expect(comment2.reload.progress).to eq 50
     end
-
   end
 end

data/spec/models/dorsale/flyboy/task_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require "rails_helper"
 
 describe Dorsale::Flyboy::Task do
   it { is_expected.to belong_to(:taskable) }
@@ -36,8 +36,8 @@ describe Dorsale::Flyboy::Task do
     end
   end
 
-  describe '#validation' do
-    it 'factory should be #valid?' do
+  describe "#validation" do
+    it "factory should be #valid?" do
       expect(create(:flyboy_task)).to be_valid
     end
   end # describe '#validation'
@@ -60,28 +60,52 @@ describe Dorsale::Flyboy::Task do
     end
 
     it "should auto reset reminder_date" do
-      task = described_class.new(term: "2017-04-12", reminder_type: "custom", reminder_date: "2017-04-11")
+      task = described_class.new(
+        :term          => "2017-04-12",
+        :reminder_type => "custom",
+        :reminder_date => "2017-04-11",
+      )
       task.reminder_type = nil
       expect(task.reminder_date).to eq nil
     end
 
     it "should auto set reminder_date by with days" do
-      task = described_class.new(term: "2017-04-12", reminder_type: "duration", reminder_duration: 1, reminder_unit: "days")
+      task = described_class.new(
+        :term              => "2017-04-12",
+        :reminder_type     => "duration",
+        :reminder_duration => 1,
+        :reminder_unit     => "days",
+      )
       expect(task.reminder_date).to eq Date.parse("2017-04-11")
     end
 
     it "should auto set reminder_date by with weeks" do
-      task = described_class.new(term: "2017-04-12", reminder_type: "duration", reminder_duration: 2, reminder_unit: "weeks")
+      task = described_class.new(
+        :term              => "2017-04-12",
+        :reminder_type     => "duration",
+        :reminder_duration => 2,
+        :reminder_unit     => "weeks",
+      )
       expect(task.reminder_date).to eq Date.parse("2017-03-29")
     end
 
     it "should auto set reminder_date by with months" do
-      task = described_class.new(term: "2017-04-12", reminder_type: "duration", reminder_duration: 1, reminder_unit: "months")
+      task = described_class.new(
+        :term              => "2017-04-12",
+        :reminder_type     => "duration",
+        :reminder_duration => 1,
+        :reminder_unit     => "months",
+      )
       expect(task.reminder_date).to eq Date.parse("2017-03-12")
     end
 
     it "update term should update reminder_date" do
-      task = described_class.new(term: "2017-04-12", reminder_type: "duration", reminder_duration: 1, reminder_unit: "days")
+      task = described_class.new(
+        :term              => "2017-04-12",
+        :reminder_type     => "duration",
+        :reminder_duration => 1,
+        :reminder_unit     => "days",
+      )
       expect(task.reminder_date).to eq Date.parse("2017-04-11")
       task.term = "2017-04-25"
       expect(task.reminder_date).to eq Date.parse("2017-04-24")
@@ -90,51 +114,51 @@ describe Dorsale::Flyboy::Task do
 
   describe "scopes" do
     it "should return delayed undone tasks" do
-      task = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+1)
-      task_1 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date-1, done: true)
-      task_2 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date-1, done: false)
-      task_3 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date-2, done: true)
-      task_4 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date-2, done: false)
+      task  = create(:flyboy_task, owner: @user1, term: Date.current+1)
+      task1 = create(:flyboy_task, owner: @user1, term: Date.current-1, done: true)
+      task2 = create(:flyboy_task, owner: @user1, term: Date.current-1, done: false)
+      task3 = create(:flyboy_task, owner: @user1, term: Date.current-2, done: true)
+      task4 = create(:flyboy_task, owner: @user1, term: Date.current-2, done: false)
       tasks = ::Dorsale::Flyboy::Task.delayed
-      expect(tasks).to contain_exactly(task_2, task_4)
+      expect(tasks).to contain_exactly(task2, task4)
     end
 
     it "should return today undone tasks" do
-      task = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+1)
-      task_1 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date, done: true)
-      task_2 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date, done: false)
+      task = create(:flyboy_task, owner: @user1, term: Date.current+1)
+      task1 = create(:flyboy_task, owner: @user1, term: Date.current, done: true)
+      task2 = create(:flyboy_task, owner: @user1, term: Date.current, done: false)
       tasks = ::Dorsale::Flyboy::Task.today
-      expect(tasks).to contain_exactly(task_2)
+      expect(tasks).to contain_exactly(task2)
     end
 
     it "should return tomorrow undone tasks" do
-      task = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date)
-      task_1 = create(:flyboy_task, owner: @user1, term: Date.tomorrow, done: true)
-      task_2 = create(:flyboy_task, owner: @user1, term: Date.tomorrow, done: false)
+      task = create(:flyboy_task, owner: @user1, term: Date.current)
+      task1 = create(:flyboy_task, owner: @user1, term: Date.tomorrow, done: true)
+      task2 = create(:flyboy_task, owner: @user1, term: Date.tomorrow, done: false)
       tasks = ::Dorsale::Flyboy::Task.tomorrow
-      expect(tasks).to contain_exactly(task_2)
+      expect(tasks).to contain_exactly(task2)
     end
 
     it "should return this week undone tasks" do
       Timecop.freeze(2015, 5, 21, 12, 0, 0)
-      task = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date-7, done: false)
-      task_1 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+2, done: true)
-      task_2 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+2, done: false)
-      task_3 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+3, done: false)
-      task_4 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+5, done: false)
+      task = create(:flyboy_task, owner: @user1, term: Date.current-7, done: false)
+      task1 = create(:flyboy_task, owner: @user1, term: Date.current+2, done: true)
+      task2 = create(:flyboy_task, owner: @user1, term: Date.current+2, done: false)
+      task3 = create(:flyboy_task, owner: @user1, term: Date.current+3, done: false)
+      task4 = create(:flyboy_task, owner: @user1, term: Date.current+5, done: false)
       tasks = ::Dorsale::Flyboy::Task.this_week
-      expect(tasks).to contain_exactly(task_2, task_3)
+      expect(tasks).to contain_exactly(task2, task3)
     end
 
     it "should return next week undone tasks" do
       Timecop.freeze(2015, 5, 21)
-      task = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date, done: false)
-      task_1 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+7, done: true)
-      task_2 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+7, done: false)
-      task_3 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+9, done: false)
-      task_4 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+12, done: false)
+      task = create(:flyboy_task, owner: @user1, term: Date.current, done: false)
+      task1 = create(:flyboy_task, owner: @user1, term: Date.current+7, done: true)
+      task2 = create(:flyboy_task, owner: @user1, term: Date.current+7, done: false)
+      task3 = create(:flyboy_task, owner: @user1, term: Date.current+9, done: false)
+      task4 = create(:flyboy_task, owner: @user1, term: Date.current+12, done: false)
       tasks = ::Dorsale::Flyboy::Task.next_week
-      expect(tasks).to contain_exactly(task_2, task_3)
+      expect(tasks).to contain_exactly(task2, task3)
     end
   end # describe "scopes"
 
@@ -144,8 +168,8 @@ describe Dorsale::Flyboy::Task do
     let(:task_ontime) {
       create(:flyboy_task,
         :reminder_type => "custom",
-        :reminder_date => Time.zone.now.to_date + 1.day,
-        :term          => Time.zone.now.to_date + 3.days,
+        :reminder_date => Date.current + 1.day,
+        :term          => Date.current + 3.days,
         :done          => false,
       )
     }
@@ -159,8 +183,8 @@ describe Dorsale::Flyboy::Task do
     let(:task_onwarning) {
       create(:flyboy_task,
         :reminder_type => "custom",
-        :reminder_date => Time.zone.now.to_date,
-        :term          => Time.zone.now.to_date + 3.days,
+        :reminder_date => Date.current,
+        :term          => Date.current + 3.days,
         :done          => false,
       )
     }
@@ -174,8 +198,8 @@ describe Dorsale::Flyboy::Task do
     let(:task_onalert) {
       create(:flyboy_task,
         :reminder_type => "custom",
-        :reminder_date => Time.zone.now.to_date - 3.days,
-        :term          => Time.zone.now.to_date,
+        :reminder_date => Date.current - 3.days,
+        :term          => Date.current,
         :done          => false,
       )
     }
@@ -189,8 +213,8 @@ describe Dorsale::Flyboy::Task do
     let(:task_done) {
       create(:flyboy_task,
         :reminder_type => "custom",
-        :reminder_date => Time.zone.now.to_date - 3.days,
-        :term          => Time.zone.now.to_date - 1.day,
+        :reminder_date => Date.current - 3.days,
+        :term          => Date.current - 1.day,
         :done          => true,
       )
     }