dorsale 3.8.1 → 3.9.0

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.8.1"
+  VERSION = "3.9.0"
 end

data/spec/controllers/dorsale/alexandrie/attachments_controller_spec.rb

@@ -3,12 +3,12 @@ require "rails_helper"
 describe Dorsale::Alexandrie::AttachmentsController, type: :controller do
   routes { Dorsale::Engine.routes }
 
-  let(:uploaded_file){
-    path = Rails.root.join("../../spec/files/pdf.pdf").to_s
+  let(:uploaded_file) {
+    path = Rails.root.join("..", "..", "spec", "files", "pdf.pdf").to_s
     Rack::Test::UploadedFile.new(path, "application/pdf")
   }
 
-  let(:valid_attributes){
+  let(:valid_attributes) {
     attachable = DummyModel.create!(name: "A")
 
     {

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

@@ -122,5 +122,4 @@ describe Dorsale::BillingMachine::InvoicesController, type: :controller do
       )
     end
   end # describe "filters"
-
 end

data/spec/controllers/dorsale/comments_controller_spec.rb

@@ -8,7 +8,7 @@ describe Dorsale::CommentsController, type: :controller do
   before(:each) { sign_in(user) }
 
   let(:commentable) { create(:customer_vault_corporation) }
-  let(:valid_params){
+  let(:valid_params) {
     {
       :comment => {
         :commentable_id   => commentable.id,

data/spec/controllers/dorsale/customer_vault/events_controller_spec.rb

@@ -9,34 +9,34 @@ describe ::Dorsale::CustomerVault::EventsController, type: :controller do
 
   describe "#filters" do
     before do
-      @event_1 = create(:customer_vault_event, action: "create")
-      @event_2 = create(:customer_vault_event, action: "update")
+      @event1 = create(:customer_vault_event, action: "create")
+      @event2 = create(:customer_vault_event, action: "update")
     end
 
     it "should filter by event_action" do
       cookies[:filters] = {event_action: "create"}.to_json
       get :index
-      expect(assigns(:events)).to eq [@event_1]
+      expect(assigns(:events)).to eq [@event1]
     end
 
     it "should filter by multiple event_action" do
       cookies[:filters] = {event_action: "create update"}.to_json
       get :index
-      expect(assigns(:events)).to contain_exactly(@event_1, @event_2)
+      expect(assigns(:events)).to contain_exactly(@event1, @event2)
     end
   end # describe "#filters"
 
   describe "#index" do
     before do
-      @corporation_1 = create(:customer_vault_corporation)
-      @corporation_2 = create(:customer_vault_corporation)
-      @event_1       = create(:customer_vault_event, person: @corporation_1, created_at: "2012-02-15")
-      @event_2       = create(:customer_vault_event, person: @corporation_2, created_at: "2012-03-15")
+      @corporation1 = create(:customer_vault_corporation)
+      @corporation2 = create(:customer_vault_corporation)
+      @event1       = create(:customer_vault_event, person: @corporation1, created_at: "2012-02-15")
+      @event2       = create(:customer_vault_event, person: @corporation2, created_at: "2012-03-15")
     end
 
     it "should assigns all events ordered by created_at DESC" do
       get :index
-      expect(assigns(:events)).to eq [@event_2, @event_1]
+      expect(assigns(:events)).to eq [@event2, @event1]
     end
   end # describe "#index"
 end

data/spec/controllers/dorsale/customer_vault/people_controller_spec.rb

@@ -32,10 +32,10 @@ RSpec.describe ::Dorsale::CustomerVault::PeopleController, type: :controller do
   describe "#list" do
     describe "sorting" do
       it "should sort people by name by default" do
-        abc   = create(:customer_vault_corporation, name: 'Abc Corp')
-        bob   = create(:customer_vault_individual, last_name: 'Bob')
-        alice = create(:customer_vault_individual, last_name: 'Alice')
-        zorg  = create(:customer_vault_corporation, name: 'Zorg Corp')
+        abc   = create(:customer_vault_corporation, name: "Abc Corp")
+        bob   = create(:customer_vault_individual, last_name: "Bob")
+        alice = create(:customer_vault_individual, last_name: "Alice")
+        zorg  = create(:customer_vault_corporation, name: "Zorg Corp")
 
         get :index
 
@@ -56,28 +56,25 @@ RSpec.describe ::Dorsale::CustomerVault::PeopleController, type: :controller do
       end
 
       it "should filter by person origin" do
-        @origin = create(:customer_vault_origin)
-        individual  = create(:customer_vault_individual, origin: @origin)
-        corporation = create(:customer_vault_corporation)
-
-        cookies[:filters] = {person_origin: @origin.id}.to_json
+        origin      = create(:customer_vault_origin)
+        individual1 = create(:customer_vault_individual, origin: origin)
+        individual2 = create(:customer_vault_individual)
 
+        cookies[:filters] = {person_origin: origin.id}.to_json
         get :index
 
-        expect(assigns(:people)).to eq [individual]
+        expect(assigns(:people)).to eq [individual1]
       end
 
-      it "should filter by person activity" do
-        @activity = create(:customer_vault_activity_type)
-        corpo1 = create(:customer_vault_corporation, activity_type: @activity)
-        individual  = create(:customer_vault_individual, corporation: corpo1)
-        corpo2 = create(:customer_vault_corporation)
-
-        cookies[:filters] = {person_activity: @activity.id}.to_json
+      it "should filter by person activity_type" do
+        activity_type = create(:customer_vault_activity_type)
+        corporation1  = create(:customer_vault_corporation, activity_type: activity_type)
+        corporation2  = create(:customer_vault_corporation)
 
+        cookies[:filters] = {person_activity: activity_type.id}.to_json
         get :index
 
-        expect(assigns(:people)).to contain_exactly(corpo1, individual)
+        expect(assigns(:people)).to eq [corporation1]
       end
     end # describe "filters"
 
@@ -129,5 +126,4 @@ RSpec.describe ::Dorsale::CustomerVault::PeopleController, type: :controller do
       expect(event.action).to eq "update"
     end
   end # describe "#update"
-
 end

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

@@ -11,7 +11,7 @@ describe Dorsale::Flyboy::TaskCommentsController, type: :controller do
   let(:task_comment) { create(:flyboy_task_comment, task: task) }
 
   describe "#create" do
-    let(:valid_params) {{task_id: task.id, task_comment: task_comment.attributes}}
+    let(:valid_params) { {task_id: task.id, task_comment: task_comment.attributes} }
 
     it "should create the task_comment" do
       post :create, params: valid_params
@@ -29,5 +29,4 @@ describe Dorsale::Flyboy::TaskCommentsController, type: :controller do
       expect(response).to redirect_to flyboy_task_path(task)
     end
   end
-
 end

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

@@ -11,10 +11,12 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
     create(:flyboy_task, done: false)
   }
 
-  let(:valid_attributes) {{
-    :name => "New Task" ,
-    :term => Time.zone.now.to_date,
-  }}
+  let(:valid_attributes) {
+    {
+      :name => "New Task",
+      :term => Date.current,
+    }
+  }
 
   describe "#complete" do
     before(:each) do
@@ -52,19 +54,19 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
         @task2 = create(:flyboy_task, done: false)
       end
 
-      it 'should display both when not filtered' do
+      it "should display both when not filtered" do
         get :index
         expect(assigns(:tasks).to_a.sort).to eq [@task1, @task2].sort
       end
 
-      it 'should filter by status closed' do
-        cookies["filters"] = {'fb_state' => "done"}.to_json
+      it "should filter by status closed" do
+        cookies["filters"] = {"fb_state" => "done"}.to_json
         get :index
         expect(assigns(:tasks).to_a).to eq [@task1]
       end
 
-      it 'should filter by status opened' do
-        cookies["filters"] = {'fb_state' => "undone"}.to_json
+      it "should filter by status opened" do
+        cookies["filters"] = {"fb_state" => "undone"}.to_json
         get :index
         expect(assigns(:tasks).to_a).to eq [@task2]
       end
@@ -77,9 +79,32 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
         @corporation2 = create(:customer_vault_corporation, name: "dEF")
         @corporation3 = create(:customer_vault_corporation, name: "xyz")
 
-        @task1 = create(:flyboy_task, taskable: @corporation1, name: "Abc", progress: 100, term: "21/12/2012", reminder_type: "custom", reminder_date: "21/12/2012")
-        @task2 = create(:flyboy_task, taskable: @corporation2, name: "dEF", progress: 0,   term: "23/12/2012", reminder_type: "custom", reminder_date: "23/12/2012")
-        @task3 = create(:flyboy_task, taskable: @corporation3, name: "xyz", progress: 35,  term: "22/12/2012", reminder_type: "custom", reminder_date: "22/12/2012")
+        @task1 = create(:flyboy_task,
+          :taskable      => @corporation1,
+          :name          => "Abc",
+          :progress      => 100,
+          :term          => "21/12/2012",
+          :reminder_type => "custom",
+          :reminder_date => "21/12/2012",
+        )
+
+        @task2 = create(:flyboy_task,
+          :taskable      => @corporation2,
+          :name          => "dEF",
+          :progress      => 0,
+          :term          => "23/12/2012",
+          :reminder_type => "custom",
+          :reminder_date => "23/12/2012",
+        )
+
+        @task3 = create(:flyboy_task,
+          :taskable      => @corporation3,
+          :name          => "xyz",
+          :progress      => 35,
+          :term          => "22/12/2012",
+          :reminder_type => "custom",
+          :reminder_date => "22/12/2012",
+        )
       end
 
       it "sorting by taskable asc" do
@@ -140,7 +165,6 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
 
   describe "POST create" do
     describe "with valid params" do
-
       it "creates a new Task" do
         expect {
           post :create, params: {:task => valid_attributes}
@@ -205,7 +229,7 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
 
         patch :update, params: {
           :id   => task.to_param,
-          :task => {:name => nil}
+          :task => {:name => nil},
         }
 
         expect(assigns(:task)).to eq(task)
@@ -237,7 +261,9 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
 
     it "is expected to create a task comment" do
       task = create(:flyboy_task, term: 3.days.ago)
-      expect{patch :snooze, params: {:id => task.to_param}}.to change{Dorsale::Flyboy::TaskComment.count}.by(1)
+      expect {
+        patch :snooze, params: {:id => task.to_param}
+      }.to change(Dorsale::Flyboy::TaskComment, :count).by(1)
     end
   end
 
@@ -250,11 +276,11 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
 
       Timecop.freeze "2016-03-09 15:00:00"
       @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: Date.current)             # 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
-      @next_next_week_task = create(:flyboy_task, term: Date.parse("2016-03-22")) # tuesday next next week
+      @next_next_week_task = create(:flyboy_task, term: Date.parse("2016-03-22")) # tuesday 2 weeks
     end
 
     it "should not assign tasks when owner is an other person" do
@@ -296,7 +322,5 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
       expect(assigns(:next_week_tasks)).to      eq [@next_week_task]
       expect(assigns(:next_next_week_tasks)).to eq [@next_next_week_task]
     end
-
   end # describe summary
-
 end

data/spec/factories/alexandrie_attachment_types.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :alexandrie_attachment_type, class: ::Dorsale::Alexandrie::AttachmentType do
     name { Faker::Lorem.words.join(" ") }
   end

data/spec/factories/alexandrie_attachments.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :alexandrie_attachment, class: ::Dorsale::Alexandrie::Attachment do
     attachable {
       DummyModel.create!(name: "abc")

data/spec/factories/billing_machine_invoice_lines.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :billing_machine_invoice_line, class: ::Dorsale::BillingMachine::InvoiceLine do
     invoice    { create(:billing_machine_invoice) }
 

data/spec/factories/billing_machine_invoices.rb

@@ -1,8 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :billing_machine_invoice, class: ::Dorsale::BillingMachine::Invoice do
     customer     { create(:customer_vault_corporation) }
     payment_term { create(:billing_machine_payment_term) }
-    id_card      { create(:billing_machine_id_card) }
     date         { "2014-02-19" }
     label        { "Software service" }
     advance      { 0 }

data/spec/factories/billing_machine_payment_terms.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :billing_machine_payment_term, class: ::Dorsale::BillingMachine::PaymentTerm do
     label { "Payment term " + Faker::Lorem.words.join(" ") }
   end

data/spec/factories/billing_machine_quotation_lines.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :billing_machine_quotation_line, class: ::Dorsale::BillingMachine::QuotationLine do
     quotation  { create(:billing_machine_quotation) }
 
@@ -8,4 +8,3 @@ FactoryGirl.define do
     unit_price { 20 }
   end
 end
-

data/spec/factories/billing_machine_quotations.rb

@@ -1,8 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :billing_machine_quotation, class: ::Dorsale::BillingMachine::Quotation do
     customer     { create(:customer_vault_corporation) }
     payment_term { create(:billing_machine_payment_term) }
-    id_card      { create(:billing_machine_id_card) }
     date         { "2014-02-19" }
     label        { "Software service" }
     comments     { "This is the quotation for the software your companie want" }

data/spec/factories/customer_vault_activity_types.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :customer_vault_activity_type, class: ::Dorsale::CustomerVault::ActivityType do
     name { Faker::Lorem.word }
   end

data/spec/factories/customer_vault_corporations.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :customer_vault_corporation, class: ::Dorsale::CustomerVault::Corporation do
     activity_type { create(:customer_vault_activity_type)             }
     origin        { create(:customer_vault_origin)                    }

data/spec/factories/customer_vault_event.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :customer_vault_event, class: ::Dorsale::CustomerVault::Event do
     author { build(:user)                       }
     person { build(:customer_vault_corporation) }

data/spec/factories/customer_vault_individuals.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :customer_vault_individual, class: ::Dorsale::CustomerVault::Individual do
-    origin     { create(:customer_vault_origin)                    }
+    origin     { create(:customer_vault_origin)                      }
     first_name { Faker::Name.first_name                              }
     last_name  { Faker::Name.last_name                               }
     short_name { "SN"                                                }

data/spec/factories/customer_vault_links.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :customer_vault_link, class: ::Dorsale::CustomerVault::Link do
     association :alice, factory: :customer_vault_individual
     association :bob,   factory: :customer_vault_corporation

data/spec/factories/customer_vault_origins.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :customer_vault_origin, class: ::Dorsale::CustomerVault::Origin do
     name { Faker::Lorem.word }
   end

data/spec/factories/dorsale_addresses.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :dorsale_address, class: ::Dorsale::Address do
     street     { "3 Rue Marx Dormoy" }
     street_bis { "1er étage" }

data/spec/factories/dorsale_comments.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :dorsale_comment, class: ::Dorsale::Comment do
     commentable { create(:customer_vault_corporation) }
     author      { create(:user)                       }

data/spec/factories/expense_gun_categories.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :expense_gun_category, class: ::Dorsale::ExpenseGun::Category do
     name           { Faker::Lorem.word       }
     code           { Faker::Number.number(4) }
     vat_deductible { [true, false].sample    }
   end
-end
+end

data/spec/factories/expense_gun_expense_lines.rb

@@ -1,10 +1,10 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :expense_gun_expense_line, class: ::Dorsale::ExpenseGun::ExpenseLine do
-    name            { Faker::Lorem.sentence(3)      }
-    category        { FactoryGirl.create(:expense_gun_category) }
-    date            { Faker::Date.backward(30)      }
-    total_all_taxes { rand(100..1000)               }
-    vat             { rand(1..(total_all_taxes/5))  }
-    company_part    { [25, 50, 75, 100].sample      }
+    name            { Faker::Lorem.sentence(3)                 }
+    category        { FactoryBot.create(:expense_gun_category) }
+    date            { Faker::Date.backward(30)                 }
+    total_all_taxes { rand(100..1000)                          }
+    vat             { rand(1..(total_all_taxes/5))             }
+    company_part    { [25, 50, 75, 100].sample                 }
   end
-end
+end

data/spec/factories/expense_gun_expenses.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :expense_gun_expense, class: ::Dorsale::ExpenseGun::Expense do
     name { Faker::Lorem.sentence(3) }
-    date { Time.zone.now.to_date    }
+    date { Date.current             }
     user { create(:user)            }
 
     after(:create) { |expense|
@@ -9,6 +9,5 @@ FactoryGirl.define do
         create(:expense_gun_expense_line, expense: expense)
       }
     }
-
   end
 end