dorsale 3.3.0 → 3.4.0

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.3.0"
+  VERSION = "3.4.0"
 end

data/spec/controllers/dorsale/billing_machine/invoices_controller_spec.rb

@@ -20,7 +20,10 @@ describe Dorsale::BillingMachine::InvoicesController, type: :controller do
     render_views
 
     it "should be ok" do
-      3.times { create(:billing_machine_invoice) }
+      3.times {
+        invoice = create(:billing_machine_invoice)
+        Dorsale::BillingMachine::PdfFileGenerator.(invoice)
+      }
       get :index, params: {format: :pdf}
       expect(response).to be_ok
     end

data/spec/controllers/dorsale/flyboy/tasks_controller_spec.rb

@@ -11,14 +11,8 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
     create(:flyboy_task, done: false)
   }
 
-  let!(:task2) {
-    create(:flyboy_task, taskable: task.taskable, done: true)
-  }
-
   let(:valid_attributes) {{
     :name          => "New Task" ,
-    :taskable_id   => task.taskable.id,
-    :taskable_type => task.taskable.class,
     :reminder      => (Time.zone.now.to_date - 3.days),
     :term          => Time.zone.now.to_date,
   }}
@@ -79,15 +73,14 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
 
     context "when sorting" do
       before do
-        Dorsale::Flyboy::Folder.destroy_all
         Dorsale::Flyboy::Task.destroy_all
-        @folder1 = create(:flyboy_folder, name: "Abc")
-        @folder2 = create(:flyboy_folder, name: "dEF")
-        @folder3 = create(:flyboy_folder, name: "xyz")
+        @corporation1 = create(:customer_vault_corporation, name: "Abc")
+        @corporation2 = create(:customer_vault_corporation, name: "dEF")
+        @corporation3 = create(:customer_vault_corporation, name: "xyz")
 
-        @task1 = create(:flyboy_task, taskable: @folder1, name: "Abc", progress: 100, term: "21/12/2012", reminder: "21/12/2012")
-        @task2 = create(:flyboy_task, taskable: @folder2, name: "dEF", progress: 0,   term: "23/12/2012", reminder: "23/12/2012")
-        @task3 = create(:flyboy_task, taskable: @folder3, name: "xyz", progress: 35,  term: "22/12/2012", reminder: "22/12/2012")
+        @task1 = create(:flyboy_task, taskable: @corporation1, name: "Abc", progress: 100, term: "21/12/2012", reminder: "21/12/2012")
+        @task2 = create(:flyboy_task, taskable: @corporation2, name: "dEF", progress: 0,   term: "23/12/2012", reminder: "23/12/2012")
+        @task3 = create(:flyboy_task, taskable: @corporation3, name: "xyz", progress: 35,  term: "22/12/2012", reminder: "22/12/2012")
       end
 
       it "sorting by taskable asc" do
@@ -139,13 +132,6 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
     end
   end
 
-  describe "GET new" do
-    it "assigns a new task as @task" do
-      get :new, params: {:folder_id => task.taskable.id}
-      expect(assigns(:task)).to be_a_new(Dorsale::Flyboy::Task)
-    end
-  end
-
   describe "GET edit" do
     it "assigns the requested task as @task" do
       get :edit, params: {:id => task.to_param}
@@ -197,14 +183,6 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
         expect(ActionMailer::Base.deliveries.count).to eq 0
       end
     end
-
-    describe "with invalid params" do
-      it "assigns a newly created but unsaved task as @task" do
-        post :create, params: {task: {name: nil, taskable_id: task.taskable.id, taskable_type: task.taskable.class}}
-        expect(assigns(:task)).to be_a_new(Dorsale::Flyboy::Task)
-      end
-    end
-
   end
 
   describe "PUT update" do
@@ -261,7 +239,6 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
 
   describe "summary" do
     let(:summary_user) { create :user }
-    let(:folder) { create(:flyboy_folder) }
 
     before(:each) do
       Dorsale::Flyboy::Task.destroy_all
@@ -269,7 +246,7 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
 
       Timecop.travel "2016-03-09 15:00:00" do
         @delayed_task        = create(:flyboy_task, term: Date.yesterday)           # tuesday
-        @today_task          = create(:flyboy_task, term: Time.zone.now.to_date)               # thursday - today
+        @today_task          = create(:flyboy_task, term: Time.zone.now.to_date)    # thursday - today
         @tomorrow_task       = create(:flyboy_task, term: Date.tomorrow)            # wednesday
         @this_week_task      = create(:flyboy_task, term: Date.parse("2016-03-12")) # sunday
         @next_week_task      = create(:flyboy_task, term: Date.parse("2016-03-14")) # monday next week

data/spec/factories/flyboy_tasks.rb

@@ -1,7 +1,5 @@
 FactoryGirl.define do
   factory :flyboy_task, class: ::Dorsale::Flyboy::Task do
-    taskable { create(:flyboy_folder) }
-
     name        { "I-am-a-task#{Kernel.rand(1_000..9_999)}"                }
     description { "I-am-the-task-description_#{Kernel.rand(1_000..9_999)}" }
     progress    { Kernel.rand(0..99) }

data/spec/helpers/dorsale/flyboy/application_helper_spec.rb

@@ -1,69 +1,6 @@
 require 'rails_helper'
 
 describe Dorsale::Flyboy::ApplicationHelper, type: :helper do
-
-  describe '#folder_color' do
-    let!(:folder) {
-      create(:flyboy_folder)
-    }
-
-    # ensure that tasks are filtered by group
-    let!(:task_other_group_onalert) {
-      create(:flyboy_task, reminder: Time.zone.now.to_date - 3.days, term: Time.zone.now.to_date - 1.day, done: false)
-    }
-
-    let!(:task_other_group_onwarning) {
-      create(:flyboy_task, reminder: Time.zone.now.to_date - 3.days, term: Time.zone.now.to_date + 1.day, done: false)
-    }
-
-    #ensure tasks are filtered by folder
-    let!(:other_folder) {
-      create(:flyboy_folder)
-    }
-    let!(:task_onalert_for_other_folder) {
-      create(:flyboy_task, taskable: other_folder, reminder: Time.zone.now.to_date - 3.days, term: Time.zone.now.to_date - 1.day, done: false)
-    }
-    let!(:task_onwarning_for_other_folder) {
-      create(:flyboy_task, taskable: other_folder, reminder: Time.zone.now.to_date - 3.days, term: Time.zone.now.to_date + 1.day, done: false)
-    }
-
-    let!(:task_ontime) {
-      create(:flyboy_task, taskable: folder, reminder: Time.zone.now.to_date + 1.day, term: Time.zone.now.to_date + 3.days, done: false)
-    }
-    let!(:task_finished) {
-      create(:flyboy_task, taskable: folder, reminder: Time.zone.now.to_date - 3.days, term: Time.zone.now.to_date - 1.day, done: true)
-    }
-
-    context 'when all tasks are ontime or finished' do
-      it 'should return ontime' do
-        expect(folder_color(folder)).to eq('ontime')
-      end
-
-    end
-
-    context 'when the folder is closed' do
-      it 'should return finished' do
-        folder_finished = create(:flyboy_folder, :status => "closed")
-        expect(folder_color(folder_finished)).to eq('finished')
-      end
-    end
-
-    context 'when at least one task is on warning' do
-      let!(:task_onwarning) {create(:flyboy_task, taskable: folder, reminder: Time.zone.now.to_date - 3.days, term: Time.zone.now.to_date + 1.day, done: false)}
-      it 'should return onwarning' do
-        expect(folder_color(folder)).to eq('onwarning')
-      end
-    end
-
-    context 'when at least one task is on alert' do
-      let!(:task_onwarning) {create(:flyboy_task, taskable: folder, reminder: Time.zone.now.to_date - 3.days, term: Time.zone.now.to_date - 1.day, done: false)}
-
-      it 'should return onalert' do
-        expect(folder_color(folder)).to eq('onalert')
-      end
-    end
-  end
-
   describe '#task_color' do
     # L’affichage de la couleur de la tâche dépend de son achèvement:
     # Si date jour < date relance alors noir
@@ -87,5 +24,4 @@ describe Dorsale::Flyboy::ApplicationHelper, type: :helper do
       expect(task_color(task)).to eq('finished')
     end
   end
-
 end

data/spec/helpers/dorsale/sorting_helper_spec.rb

@@ -0,0 +1,74 @@
+require 'rails_helper'
+
+describe Dorsale::SortingHelper, type: :helper do
+  describe "#sortable_column" do
+    let(:params) {{
+      :controller => "home",
+      :action     => "home",
+    }}
+
+    it "current sort is nil" do
+      link = sortable_column("text", :col)
+      expect(link).to eq %(<a class="sort" href="/?sort=col">text</a>)
+    end
+
+    it "current sort is col" do
+      params.merge!(sort: "col")
+      link = sortable_column("text", :col)
+      expect(link).to eq %(<a class="sort asc" href="/?sort=-col">text ↓</a>)
+    end
+
+    it "current sort is -col" do
+      params.merge!(sort: "-col")
+      link = sortable_column("text", :col)
+      expect(link).to eq %(<a class="sort desc" href="/?sort=col">text ↑</a>)
+    end
+
+    it "current sort is other" do
+      params.merge!(sort: "other")
+      link = sortable_column("text", :col)
+      expect(link).to eq %(<a class="sort" href="/?sort=col">text</a>)
+    end
+
+    it "current sort is -other" do
+      params.merge!(sort: "-other")
+      link = sortable_column("text", :col)
+      expect(link).to eq %(<a class="sort" href="/?sort=col">text</a>)
+    end
+
+    it "should raise on invalid column type" do
+      # old handles_sortable_columns syntax
+      expect {
+        sortable_column("text", {column: "col"})
+      }.to raise_error ArgumentError
+    end
+  end # describe "#sortable_column"
+
+  describe "#sortable_column_order" do
+    attr_reader :params
+
+    it "should parse asc column" do
+      @params = {sort: "col"}
+      expect(sortable_column_order).to eq ["col", :asc]
+    end
+
+    it "should parse desc column" do
+      @params = {sort: "-col"}
+      expect(sortable_column_order).to eq ["col", :desc]
+    end
+
+    it "should parse nil" do
+      @params = {}
+      expect(sortable_column_order).to eq [nil, nil]
+    end
+
+    it "should accept block" do
+      @params = {sort: "-col"}
+
+      sortable_column_order do |column, order|
+        expect(column).to eq "col"
+        expect(order).to eq :desc
+      end
+    end
+  end # describe "#sortable_column_order"
+end

data/spec/libs/{active_record_comma_type_cast_spec.rb → dorsale/active_record_comma_type_cast_spec.rb}

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-describe ActiveRecordCommaTypeCast, type: :model do
+describe Dorsale::ActiveRecordCommaTypeCast, type: :model do
   let(:line) { create(:billing_machine_invoice_line) }
 
   it "should accept , as decimal separator" do

data/spec/libs/dorsale/polymorphic_id_spec.rb

@@ -8,17 +8,18 @@ RSpec.describe Dorsale::PolymorphicId do
   end
 
   it "should return guid" do
-    folder = create(:flyboy_folder)
-    task   = build(:flyboy_task, taskable: nil)
+    corporation = create(:customer_vault_corporation)
+    task        = build(:flyboy_task, taskable: nil)
 
-    expect(folder.id).to be_present
     expect(task.taskable).to be_nil
     expect(task.taskable_id).to be_nil
     expect(task.taskable_type).to be_nil
-    task.taskable_guid = folder.guid
-    expect(task.taskable).to eq folder
-    expect(task.taskable_id).to eq folder.id
-    expect(task.taskable_type).to eq "Dorsale::Flyboy::Folder"
+
+    task.taskable_guid = corporation.guid
+
+    expect(task.taskable).to eq corporation
+    expect(task.taskable_id).to eq corporation.id
+    expect(task.taskable_type).to eq "Dorsale::CustomerVault::Person"
   end
 
   it "should return base_class in guid" do

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

@@ -14,7 +14,7 @@ RSpec.describe ::Dorsale::ExpenseGun::Expense, type: :model do
   end
 
   it "new expense should have new state" do
-    expect(::Dorsale::ExpenseGun::Expense.new.current_state).to be :new
+    expect(::Dorsale::ExpenseGun::Expense.new.current_state).to be :draft
   end
 
   describe "new state" do
@@ -22,19 +22,19 @@ RSpec.describe ::Dorsale::ExpenseGun::Expense, type: :model do
       @expense = build(:expense_gun_expense)
     end
 
-    it "new expense can be submited" do
-      expect(@expense.go_to_submited).to be true
-      expect(@expense.current_state).to be :submited
+    it "new expense can be submitted" do
+      expect(@expense.go_to_submitted).to be true
+      expect(@expense.current_state).to be :submitted
     end
 
     it "new expense can't be accepted" do
       expect(@expense.go_to_accepted).to be false
-      expect(@expense.current_state).to be :new
+      expect(@expense.current_state).to be :draft
     end
 
     it "new expense can't be refused" do
       expect(@expense.go_to_refused).to be false
-      expect(@expense.current_state).to be :new
+      expect(@expense.current_state).to be :draft
     end
 
     it "new expense can be canceled" do
@@ -43,10 +43,10 @@ RSpec.describe ::Dorsale::ExpenseGun::Expense, type: :model do
     end
   end
 
-  describe "submited state" do
+  describe "submitted state" do
     before :each do
       @expense = build(:expense_gun_expense)
-      @expense.go_to_submited
+      @expense.go_to_submitted
     end
 
     it "submitted expense can be accepted" do
@@ -68,12 +68,12 @@ RSpec.describe ::Dorsale::ExpenseGun::Expense, type: :model do
   describe "acceped state" do
     before :each do
       @expense = build(:expense_gun_expense)
-      @expense.go_to_submited
+      @expense.go_to_submitted
       @expense.go_to_accepted
     end
 
-    it "acceped expense can't be submited" do
-      expect(@expense.go_to_submited).to be false
+    it "acceped expense can't be submitted" do
+      expect(@expense.go_to_submitted).to be false
       expect(@expense.current_state).to be :accepted
     end
 
@@ -91,12 +91,12 @@ RSpec.describe ::Dorsale::ExpenseGun::Expense, type: :model do
   describe "refused state" do
     before :each do
       @expense = build(:expense_gun_expense)
-      @expense.go_to_submited
+      @expense.go_to_submitted
       @expense.go_to_refused
     end
 
-    it "refused expense can't be submited" do
-      expect(@expense.go_to_submited).to be false
+    it "refused expense can't be submitted" do
+      expect(@expense.go_to_submitted).to be false
       expect(@expense.current_state).to be :refused
     end
 
@@ -117,8 +117,8 @@ RSpec.describe ::Dorsale::ExpenseGun::Expense, type: :model do
       @expense.go_to_canceled
     end
 
-    it "canceled expense can't be submited" do
-      expect(@expense.go_to_submited).to be false
+    it "canceled expense can't be submitted" do
+      expect(@expense.go_to_submitted).to be false
       expect(@expense.current_state).to be :canceled
     end
 
@@ -156,9 +156,9 @@ RSpec.describe ::Dorsale::ExpenseGun::Expense, type: :model do
     expect(expense.total_vat_deductible).to eq 5.0
   end
 
-  it "#may_edit? should return false unless expense is not submited" do
-    expect(::Dorsale::ExpenseGun::Expense.new(state: :new).may_edit?).to be true
-    expect(::Dorsale::ExpenseGun::Expense.new(state: :submited).may_edit?).to be false
+  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

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

@@ -5,11 +5,12 @@ describe Dorsale::Flyboy::Task do
   it { is_expected.to belong_to :owner }
   it { is_expected.to have_many(:comments).dependent(:destroy) }
 
-  it { is_expected.to validate_presence_of :taskable}
   it { is_expected.to validate_presence_of :name}
   it { is_expected.to validate_presence_of :term}
   it { is_expected.to validate_presence_of :reminder}
 
+  it { is_expected.to_not validate_presence_of :taskable}
+
   describe "default values" do
     before do
       @task = Dorsale::Flyboy::Task.new

data/spec/pdfs/dorsale/billing_machine/invoice_multiple_vat_pdf_spec.rb

@@ -16,12 +16,14 @@ describe ::Dorsale::BillingMachine::InvoiceMultipleVatPdf, pdfs: true do
     i
   }
 
+  let(:generate!) {
+    Dorsale::BillingMachine::PdfFileGenerator.(invoice)
+    invoice.reload
+  }
+
   let(:content) {
-    tempfile = Tempfile.new("pdf")
-    tempfile.binmode
-    tempfile.write(invoice.to_pdf)
-    tempfile.flush
-    Yomu.new(tempfile.path).text
+    generate!
+    Yomu.new(invoice.pdf_file.path).text
   }
 
   it "should not display global vat rate" do
@@ -30,13 +32,16 @@ describe ::Dorsale::BillingMachine::InvoiceMultipleVatPdf, pdfs: true do
     expect(content).to include "TVA %"
   end
 
-  it "should work with empty invoice" do
-    id_card = Dorsale::BillingMachine::IdCard.new
-    invoice = ::Dorsale::BillingMachine::Invoice.new(id_card: id_card)
-
-    expect {
-      invoice.to_pdf
-    }.to_not raise_error
-  end
+  describe "empty invoice" do
+    let(:invoice) {
+      id_card = Dorsale::BillingMachine::IdCard.new
+      id_card.save(validate: false)
+      invoice = ::Dorsale::BillingMachine::Invoice.create!(id_card: id_card)
+    }
+
+    it "should work" do
+      expect { generate! }.to_not raise_error
+    end
+  end # describe "empty invoice"
 
 end