dorsale 3.8.1 → 3.9.0

data/config/routes.rb

@@ -31,7 +31,6 @@ Dorsale::Engine.routes.draw do
   # Billing Machine
 
   namespace :billing_machine do
-    resources :id_cards, except: [:destroy, :show]
     resources :payment_terms, except: [:destroy, :show]
 
     resources :invoices, except: [:destroy] do

data/db/migrate/20161119064536_delete_id_cards.rb

@@ -0,0 +1,9 @@
+class DeleteIdCards < ActiveRecord::Migration[5.0]
+  def change
+    # Comment this migration or only this line to keep or delete id cards
+    raise "Hi ! Do you want to delete id cards ?"
+    drop_table :dorsale_billing_machine_id_cards
+    remove_column :dorsale_billing_machine_invoices, :id_card_id
+    remove_column :dorsale_billing_machine_quotations, :id_card_id
+  end
+end

data/features/billing_machine_invoices.feature

@@ -6,7 +6,6 @@ Feature: Invoice Management
 
   Background:
     Given an authenticated user
-    Given an existing id card
     Given billing machine in single vat mode
 
   Scenario: Existing invoice displayed in invoices page

data/features/billing_machine_multiple_vat.feature

@@ -6,7 +6,6 @@ Feature: Invoice Management
 
   Background:
     Given an authenticated user
-    Given an existing id card
     Given billing machine in multiple vat mode
     And an existing customer
     And an existing payment term

data/features/billing_machine_quotations.feature

@@ -6,7 +6,6 @@ Feature: Quotation Management
 
   Background:
     Given an authenticated user
-    Given an existing id card
     Given billing machine in single vat mode
 
   Scenario: Existing quotation displayed in quotations page

data/features/step_definitions/billing_machine_invoices_steps.rb

@@ -1,25 +1,25 @@
 Given(/^an existing emtpy invoice$/) do
-  @invoice = create(:billing_machine_invoice, label: nil, customer: nil, payment_term_id: nil, id_card: @id_card)
+  @invoice = create(:billing_machine_invoice, label: nil, customer: nil, payment_term_id: nil)
   @invoice.due_date = nil
   @invoice.save
 end
 
 Given(/^(\d+) existing invoices$/) do |count|
-  create_list(:billing_machine_invoice, count.to_i, id_card: @id_card)
+  create_list(:billing_machine_invoice, count.to_i)
 end
 
 Given(/^an existing invoice$/) do
-  @invoice = create(:billing_machine_invoice, id_card: @id_card, customer: @customer)
+  @invoice = create(:billing_machine_invoice, customer: @customer)
   @invoice.lines.create(quantity: 1, unit_price: 9.99)
 end
 
 Given(/^an existing invoice with a "(.*?)"% VAT rate$/) do |rate|
-  @invoice = create(:billing_machine_invoice, id_card: @id_card)
+  @invoice = create(:billing_machine_invoice)
   create(:billing_machine_invoice_line, vat_rate: rate, invoice: @invoice)
 end
 
 Given(/^an existing paid invoice$/) do
-  @invoice = create(:billing_machine_invoice, id_card: @id_card, paid: true)
+  @invoice = create(:billing_machine_invoice, paid: true)
 end
 
 Given(/^billing machine in single vat mode$/) do
@@ -27,57 +27,51 @@ Given(/^billing machine in single vat mode$/) do
 end
 
 Given(/^a bunch of existing invoices$/) do
-  c1 = create(:customer_vault_corporation, name: 'Bidule')
-  c2 = create(:customer_vault_corporation, name: 'Machin')
-  c3 = create(:customer_vault_corporation, name: 'Chose')
+  c1 = create(:customer_vault_corporation, name: "Bidule")
+  c2 = create(:customer_vault_corporation, name: "Machin")
+  c3 = create(:customer_vault_corporation, name: "Chose")
 
-  i1 = create(:customer_vault_individual, first_name: 'Oh')
-  i2 = create(:customer_vault_individual, first_name: 'Ah')
-  i3 = create(:customer_vault_individual, first_name: 'Eh')
+  i1 = create(:customer_vault_individual, first_name: "Oh")
+  i2 = create(:customer_vault_individual, first_name: "Ah")
+  i3 = create(:customer_vault_individual, first_name: "Eh")
 
-  create(:billing_machine_invoice, id_card: @id_card, customer: c1, date: Time.zone.now.to_date, paid: true)
-  create(:billing_machine_invoice, id_card: @id_card, customer: c2, date: Time.zone.now.to_date)
-  create(:billing_machine_invoice, id_card: @id_card, customer: c3, date: Time.zone.now.to_date)
-  create(:billing_machine_invoice, id_card: @id_card, customer: c1, date: Time.zone.now.to_date - 2.days)
+  create(:billing_machine_invoice, customer: c1, date: Date.current, paid: true)
+  create(:billing_machine_invoice, customer: c2, date: Date.current)
+  create(:billing_machine_invoice, customer: c3, date: Date.current)
+  create(:billing_machine_invoice, customer: c1, date: Date.current - 2.days)
 
-  create(:billing_machine_invoice, id_card: @id_card, customer: i1, date: Time.zone.now.to_date - 3.days)
-  create(:billing_machine_invoice, id_card: @id_card, customer: i2, date: Time.zone.now.to_date - 3.days)
-  create(:billing_machine_invoice, id_card: @id_card, customer: i3, date: Time.zone.now.to_date - 3.days)
+  create(:billing_machine_invoice, customer: i1, date: Date.current - 3.days)
+  create(:billing_machine_invoice, customer: i2, date: Date.current - 3.days)
+  create(:billing_machine_invoice, customer: i3, date: Date.current - 3.days)
 end
 
 Given(/^an existing unpaid invoice$/) do
-  @invoice = create(:billing_machine_invoice, id_card: @id_card, paid: false)
+  @invoice = create(:billing_machine_invoice, paid: false)
 end
 
 Given(/^its due date is not yet passed$/) do
-  @invoice.update!(due_date: (Time.zone.now.to_date + 1))
+  @invoice.update!(due_date: (Date.current + 1))
 end
 
 Given(/^its due date is the same day$/) do
-  @invoice.update!(due_date: (Time.zone.now.to_date))
+  @invoice.update!(due_date: Date.current)
 end
 
 Given(/^its due date is yesterday$$/) do
-  @invoice.update!(due_date: (Time.zone.now.to_date - 1))
+  @invoice.update!(due_date: (Date.current - 1))
 end
 
 Given(/^its due date is (\d+) days ago$/) do |days|
-  @invoice.update!(due_date: (Time.zone.now.to_date - days.to_i))
+  @invoice.update!(due_date: (Date.current - days.to_i))
 end
 
 Given(/^existing "(.*?)" invoices with "(.*?)" amount$/) do |n, amount|
   n.to_i.times do
-    invoice = create(:billing_machine_invoice, advance: 0)
-    invoice_line = create(:billing_machine_invoice_line,
-      invoice: invoice,
-      quantity: 1,
-      unit_price: amount,
-      total: nil
-    )
+    create(:billing_machine_invoice_line, quantity: 1, unit_price: amount)
   end
 end
 
-When(/^(the user|he) goes to the invoices page$/) do |arg1|
+When(/^(?:the user|he) goes to the invoices page$/) do
   visit dorsale.billing_machine_invoices_path
 end
 
@@ -86,9 +80,9 @@ When(/^he creates a new invoice$/) do
 end
 
 When(/^he fills the reference, the date, the vat rate and the payment terms$/) do
-  fill_in 'invoice_label', with: @label = 'My reference'
-  fill_in 'invoice_date', with: @date = '01/01/2014'
-  fill_in 'invoice_vat_rate', with: '20'
+  fill_in "invoice_label", with: @label = "My reference"
+  fill_in "invoice_date", with: @date = "01/01/2014"
+  fill_in "invoice_vat_rate", with: "20"
   select @payment_term.label
 end
 
@@ -107,10 +101,10 @@ end
 When(/^he fills a line with "(.*?)", "(.*?)", "(.*?)", "(.*?)"$/) do |label, quantity, unit, unit_price|
   expect(page).to have_selector(".line")
 
-  within all('.line').last do
+  within all(".line").last do
     find(".line-label textarea").set label
-    find(".line-quantity input").set  quantity
-    find(".line-unit input").set  unit
+    find(".line-quantity input").set quantity
+    find(".line-unit input").set unit
     find(".line-unit_price input").set unit_price
   end
 end
@@ -121,19 +115,19 @@ end
 
 When(/^changes the label$/) do
   @new_label=  @invoice.label + " Edited"
-  fill_in 'invoice_label', with: @new_label
+  fill_in "invoice_label", with: @new_label
 end
 
 When(/^he changes the VAT rate to "(.*?)"$/) do |new_rate|
-  fill_in 'invoice_vat_rate', with: new_rate
+  fill_in "invoice_vat_rate", with: new_rate
 end
 
 When(/^he changes the commercial discount to "(.*?)"€$/) do |arg1|
-  fill_in 'invoice_commercial_discount', with: arg1
+  fill_in "invoice_commercial_discount", with: arg1
 end
 
 When(/^he adds a new line$/) do
-  click_link 'add-new-line'
+  click_link "add-new-line"
 end
 
 When(/^he saves the invoice$/) do
@@ -145,13 +139,13 @@ When(/^he set the invoice as paid$/) do
 end
 
 When(/^he marks the invoice as unpaid$/) do
-  within '.form-group.select.invoice_paid' do
-    select 'No'
+  within ".form-group.select.invoice_paid" do
+    select "No"
   end
 end
 
 When(/^he changes the advance to "(.*?)"€$/) do |value|
-  fill_in 'invoice_advance', with: value
+  fill_in "invoice_advance", with: value
 end
 
 When(/^he goes to the newly created invoice page$/) do
@@ -165,15 +159,15 @@ When(/^he filters by date on today$/) do
 end
 
 When(/^he filters by one customer$/) do
-  within('.filters') do
-    select('Bidule')
+  within(".filters") do
+    select("Bidule")
     find(".filter-submit").click
   end
 end
 
 When(/^he filters by status on paid$/) do
-  within('.filters') do
-    select('Payée')
+  within(".filters") do
+    select("Payée")
     find(".filter-submit").click
   end
 end
@@ -184,11 +178,11 @@ When(/^the user download the pdf$/) do
 end
 
 Then(/^he should see (\d+) invoices?$/) do |count|
-  expect(page).to have_selector '.invoice', count: count
+  expect(page).to have_selector ".invoice", count: count
 end
 
 Then(/^the invoice is displayed correctly$/) do
-  expect(page).to have_selector '.tracking_id', @invoice.tracking_id
+  expect(page).to have_selector ".tracking_id", @invoice.tracking_id
 end
 
 Then(/^the total excluding taxes is "(.*?)"$/) do |total|
@@ -208,36 +202,36 @@ Then(/^he fill the commercial discount with "(.*?)"$/) do |value|
 end
 
 Then(/^it's added to the invoice list$/) do
-  step('the user goes to the invoices page')
-  expect(page).to have_selector '.invoice .date', text: @date
+  step("the user goes to the invoices page")
+  expect(page).to have_selector ".invoice .date", text: @date
   # There are no other invoices for this test so we should get the right number
   tracking_id = ::Dorsale::BillingMachine::Invoice.first.tracking_id
-  expect(page).to have_selector '.invoice .tracking_id', text: tracking_id
-  expect(page).to have_selector '.invoice .customer_name', text: @customer.name
-  expect(page).to have_selector '.invoice .total_excluding_taxes', text: '180,00 €'
+  expect(page).to have_selector ".invoice .tracking_id", text: tracking_id
+  expect(page).to have_selector ".invoice .customer_name", text: @customer.name
+  expect(page).to have_selector ".invoice .total_excluding_taxes", text: "180,00 €"
 end
 
 Then(/^the commercial discount is "(.*?)"€$/) do |discount|
-   expect( find(".commercial_discount input").value).to eq discount
+  expect(find(".commercial_discount input").value).to eq discount
 end
 
 Then(/^the invoices's label has changed$/) do
   visit dorsale.edit_billing_machine_invoice_path(@invoice)
-  expect(page).to have_field('invoice_label', with: @new_label)
+  expect(page).to have_field("invoice_label", with: @new_label)
 end
 
 Then(/^the VAT rate is "(.*?)"$/) do |rate|
-  expect( find(".vat_rate input").value).to eq rate
+  expect(find(".vat_rate input").value).to eq rate
 end
 
 Then(/^the new line total is "(.*?)"$/) do |value|
-  within all('.line').last do
-    expect( find(".line-total input").value).to eq value
+  within all(".line").last do
+    expect(find(".line-total input").value).to eq value
   end
 end
 
 Then(/^the invoice is marked paid$/) do
-  expect(page).to have_selector '.paid'
+  expect(page).to have_selector ".paid"
 end
 
 Then(/^can't set the invoice as paid again$/) do
@@ -245,7 +239,7 @@ Then(/^can't set the invoice as paid again$/) do
 end
 
 Then(/^the invoice is marked unpaid$/) do
-  expect(page).to_not have_selector '.paid'
+  expect(page).to_not have_selector ".paid"
 end
 
 Then(/^the invoice status is set to unpaid$/) do
@@ -257,63 +251,63 @@ Then(/^the invoice status is set to paid$/) do
 end
 
 Then(/^a message signals the success of the update$/) do
-  expect(find('.alert-success')).to be_visible
+  expect(find(".alert-success")).to be_visible
 end
 
 Then(/^a message signals the success of the creation$/) do
-  expect(find('.alert-success')).to be_visible
+  expect(find(".alert-success")).to be_visible
 end
 
 Then(/^a message signals that the invoice is set to paid$/) do
-  expect(find('.alert-success')).to be_visible
+  expect(find(".alert-success")).to be_visible
 end
 
 Then(/^the advance is "(.*?)"€$/) do |advance|
-  expect( find(".advance input").value).to eq advance
+  expect(find(".advance input").value).to eq advance
 end
 
 Then(/^the balance is "(.*?)"$/) do |balance|
-  expect( find(".balance input").value).to eq balance
+  expect(find(".balance input").value).to eq balance
 end
 
 Then(/^the invoice line shows the right date$/) do
-  expect(page).to have_selector '.date' , text: I18n.l(@invoice.date)
+  expect(page).to have_selector ".date", text: I18n.l(@invoice.date)
 end
 
 Then(/^the invoice line shows the right traking-id$/) do
-  expect(page).to have_selector '.tracking_id' , text: @invoice.tracking_id
+  expect(page).to have_selector ".tracking_id", text: @invoice.tracking_id
 end
 
 Then(/^the invoice line shows the right total excluding taxes value$/) do
-  expect(page).to have_selector '.total_excluding_taxes' , text: "9,99 €"
+  expect(page).to have_selector ".total_excluding_taxes", text: "9,99 €"
 end
 
 Then(/^the invoice line shows the right total including taxes value$/) do
-  expect(page).to have_selector '.total_including_taxes' , text: "11,99 €" #@invoice.total_all_taxes pb d'arrondi
+  expect(page).to have_selector ".total_including_taxes", text: "11,99 €"
 end
 
 Then(/^the invoice line shows the right customer's name$/) do
-  expect(page).to have_selector '.customer_name', text: @customer.name
+  expect(page).to have_selector ".customer_name", text: @customer.name
 end
 
 Then(/^the invoice default date is set to today's date\.$/) do
-  expect(page).to have_field('invoice_date', with: I18n.l(Time.zone.now.to_date))
+  expect(page).to have_field("invoice_date", with: I18n.l(Date.current))
 end
 
 Then(/^the invoice default due date is set to today's date\.$/) do
-  expect(page).to have_field('invoice_due_date', with: I18n.l(Time.zone.now.to_date + 30.days))
+  expect(page).to have_field("invoice_due_date", with: I18n.l(Date.current + 30.days))
 end
 
 Then(/^a new invoice is displayed with the informations$/) do
-  expect(page).to have_field('invoice_label', with: @invoice.label)
+  expect(page).to have_field("invoice_label", with: @invoice.label)
 end
 
 Then(/^he can see all the informations$/) do
-  expect(page).to have_selector '.invoice-label', @invoice.label
+  expect(page).to have_selector ".invoice-label", @invoice.label
 end
 
 Then(/^only the invoices of this customer do appear$/) do
-  expect(page).to have_selector(".customer_name", text: 'Bidule', count: 2)
+  expect(page).to have_selector(".customer_name", text: "Bidule", count: 2)
 end
 
 Then(/^only the invoices of today do appear$/) do
@@ -360,7 +354,7 @@ Then(/^an invoice is sent to customer$/) do
 end
 
 When(/^he filters invoices between two date$/) do
-  fill_in :filters_bm_date_begin, with: I18n.l(Time.zone.now.to_date)
-  fill_in :filters_bm_date_end,   with: I18n.l(Time.zone.now.to_date)
+  fill_in :filters_bm_date_begin, with: I18n.l(Date.current)
+  fill_in :filters_bm_date_end,   with: I18n.l(Date.current)
   find(".filter-submit").click
 end

data/features/step_definitions/billing_machine_multiple_vat.rb

@@ -3,18 +3,17 @@ Given(/^billing machine in multiple vat mode$/) do
 end
 
 When(/^he fills the reference, the date and the payment terms$/) do
-  fill_in 'invoice_label', with: @label = 'My reference'
-  fill_in 'invoice_date', with: @date = '01/01/2014'
+  fill_in "invoice_label", with: @label = "My reference"
+  fill_in "invoice_date", with: @date = "01/01/2014"
   select @payment_term.label
 end
 
 When(/^he fills a multiple vat line with "(.*?)", "(.*?)", "(.*?)", "(.*?)", "(.*?)"$/) do |label, quantity, unit, vat_rate, unit_price|
-  within all('.line').last do
+  within all(".line").last do
     find(".line-label textarea").set label
-    find(".line-quantity input").set  quantity
-    find(".line-unit input").set  unit
+    find(".line-quantity input").set quantity
+    find(".line-unit input").set unit
     find(".line-vat_rate input").set vat_rate
     find(".line-unit_price input").set unit_price
   end
 end
-

data/features/step_definitions/billing_machine_payment_terms_steps.rb

@@ -4,7 +4,7 @@ Given(/^the user goes on the new payment_term page$/) do
 end
 
 When(/^he fills the payment_term's information$/) do
-  fill_in 'billing_machine_payment_term_label', with: "Payment Term Label"
+  fill_in "billing_machine_payment_term_label", with: "Payment Term Label"
 end
 
 When(/^creates a new payment_term$/) do
@@ -39,4 +39,4 @@ end
 
 Then(/^the payment_term's label is updated$/) do
   expect(page).to have_content "New Payment Term Label"
-end
+end

data/features/step_definitions/billing_machine_quotations_steps.rb

@@ -1,87 +1,53 @@
 Given(/^an existing quotation$/) do
-  @quotation = create(:billing_machine_quotation, id_card: @id_card, customer: @customer)
+  @quotation = create(:billing_machine_quotation, customer: @customer)
   @quotation.lines.create(quantity: 1, unit_price: 9.99)
 end
 
 Given(/^(\d+) existing quotations$/) do |nb|
-  create_list(:billing_machine_quotation, nb.to_i, id_card: @id_card)
+  create_list(:billing_machine_quotation, nb.to_i)
 end
 
 Given(/^an existing emtpy quotation$/) do
-  @quotation = create(:billing_machine_quotation, label: nil, customer: nil, id_card: @id_card)
+  @quotation = create(:billing_machine_quotation, label: nil, customer: nil)
 end
 
 Given(/^an existing quotation with a "(.*?)"% VAT rate$/) do |rate|
-  @quotation = create(:billing_machine_quotation, id_card: @id_card)
+  @quotation = create(:billing_machine_quotation)
   create(:billing_machine_quotation_line, vat_rate: rate, quotation: @quotation)
 end
 
-Given(/^(\d+) associated documents to this quotation$/) do |arg1|
-  @document1 = create(:alexandrie_attachment, attachable: @quotation)
-  @document2 = create(:alexandrie_attachment, attachable: @quotation)
+Given(/^(\d+) associated documents to this quotation$/) do |n|
+  n.to_i.times do |i|
+    instance_variable_set "@document#{i}", create(:alexandrie_attachment, attachable: @quotation)
+  end
 end
 
 Given(/^a bunch of existing quotations$/) do
-  c1 = create(:customer_vault_corporation, name: 'Bidule')
-  c2 = create(:customer_vault_corporation, name: 'Machin')
-  c3 = create(:customer_vault_corporation, name: 'Chose')
-
-  i1 = create(:customer_vault_individual, first_name: 'Oh')
-  i2 = create(:customer_vault_individual, first_name: 'Ah')
-  i3 = create(:customer_vault_individual, first_name: 'Eh')
-
-  create(:billing_machine_quotation,
-    :id_card  => @id_card,
-    :customer => c1,
-    :date     => Time.zone.now.to_date,
-  )
-  create(:billing_machine_quotation,
-    :id_card  => @id_card,
-    :customer => c2,
-    :date     => Time.zone.now.to_date,
-  )
-  create(:billing_machine_quotation,
-    :id_card  => @id_card,
-    :customer => c3,
-    :date     => Time.zone.now.to_date,
-  )
-  create(:billing_machine_quotation,
-    :id_card  => @id_card,
-    :customer => c1,
-    :date     => Time.zone.now.to_date - 2.days,
-  )
-
-  create(:billing_machine_quotation,
-    :id_card  => @id_card,
-    :customer => i1,
-    :date     => Time.zone.now.to_date - 3.days,
-  )
-  create(:billing_machine_quotation,
-    :id_card  => @id_card,
-    :customer => i2,
-    :date     => Time.zone.now.to_date - 3.days,
-  )
-  create(:billing_machine_quotation,
-    :id_card  => @id_card,
-    :customer => i3,
-    :date     => Time.zone.now.to_date - 3.days,
-  )
+  c1 = create(:customer_vault_corporation, name: "Bidule")
+  c2 = create(:customer_vault_corporation, name: "Machin")
+  c3 = create(:customer_vault_corporation, name: "Chose")
+
+  i1 = create(:customer_vault_individual, first_name: "Oh")
+  i2 = create(:customer_vault_individual, first_name: "Ah")
+  i3 = create(:customer_vault_individual, first_name: "Eh")
+
+  create(:billing_machine_quotation, customer: c1, date: Date.current)
+  create(:billing_machine_quotation, customer: c2, date: Date.current)
+  create(:billing_machine_quotation, customer: c3, date: Date.current)
+  create(:billing_machine_quotation, customer: c1, date: Date.current - 2.days)
+  create(:billing_machine_quotation, customer: i1, date: Date.current - 3.days)
+  create(:billing_machine_quotation, customer: i2, date: Date.current - 3.days)
+  create(:billing_machine_quotation, customer: i3, date: Date.current - 3.days)
 end
 
 Given(/^existing "(.*?)" quotations with "(.*?)" amount$/) do |n, amount|
   n.to_i.times do
-    quotation = create(:billing_machine_quotation)
-    quotation_line = create(:billing_machine_quotation_line,
-      quotation: quotation,
-      quantity: 1,
-      unit_price: amount,
-      total: nil
-    )
+    create(:billing_machine_quotation_line, quantity: 1, unit_price: amount)
   end
 end
 
 When(/^he changes the quotation VAT rate to "(.*?)"$/) do |arg1|
-  fill_in 'quotation_vat_rate', with: arg1
+  fill_in "quotation_vat_rate", with: arg1
 end
 
 When(/^the user goes to the quotations page$/) do
@@ -89,23 +55,23 @@ When(/^the user goes to the quotations page$/) do
 end
 
 When(/^the quotation line shows the right date$/) do
-  page.should have_selector '.date' , text: I18n.l(@quotation.date)
+  page.should have_selector ".date", text: I18n.l(@quotation.date)
 end
 
 When(/^the quotation line shows the right traking\-id$/) do
-  page.should have_selector '.tracking_id' , text: @quotation.tracking_id
+  page.should have_selector ".tracking_id", text: @quotation.tracking_id
 end
 
 When(/^the quotation line shows the right customer's name$/) do
-  page.should have_selector '.customer_name', text: @customer.name
+  page.should have_selector ".customer_name", text: @customer.name
 end
 
 When(/^the quotation line shows the right total excluding taxes value$/) do
-  page.should have_selector '.total_excluding_taxes' , text: "9,99 €"
+  page.should have_selector ".total_excluding_taxes", text: "9,99 €"
 end
 
 When(/^the quotation line shows the right total including taxes value$/) do
-  page.should have_selector '.total_including_taxes' , text: "11,99 €"
+  page.should have_selector ".total_including_taxes", text: "11,99 €"
 end
 
 When(/^the user goes to the quotation details$/) do
@@ -117,10 +83,10 @@ When(/^he creates a new quotation$/) do
 end
 
 When(/^he fills the reference and the date$/) do
-  fill_in 'quotation_label', with: @label = 'My reference'
-  fill_in 'quotation_date', with: @date = '01/01/2014'
+  fill_in "quotation_label", with: @label = "My reference"
+  fill_in "quotation_date", with: @date = "01/01/2014"
   select @payment_term.label
-  fill_in 'quotation_comments', with: "I-am-a-comment"
+  fill_in "quotation_comments", with: "I-am-a-comment"
 end
 
 When(/^he saves the quotation$/) do
@@ -133,7 +99,7 @@ end
 
 When(/^changes the quotation label$/) do
   @new_label=  @quotation.label + " Edited"
-  fill_in 'quotation_label', with: @new_label
+  fill_in "quotation_label", with: @new_label
 end
 
 When(/^he copy the quotation$/) do
@@ -153,20 +119,20 @@ end
 
 Then(/^the document is not in the quotation details$/) do
   visit dorsale.billing_machine_quotation_path(@quotation)
-  page.should have_link 'pdf.pdf', count: 1
+  page.should have_link "pdf.pdf", count: 1
 end
 
 Then(/^a message signals the success of the quotation update$/) do
-  page.should have_selector '.alert-success'
+  page.should have_selector ".alert-success"
 end
 
 Then(/^he fill the quotation commercial discount with "(.*?)"$/) do |arg1|
-  fill_in 'quotation_commercial_discount', with: arg1
+  fill_in "quotation_commercial_discount", with: arg1
 end
 
 Then(/^the quotation's label has changed$/) do
   visit dorsale.edit_billing_machine_quotation_path(@quotation)
-  page.should have_field('quotation_label', with: @new_label)
+  page.should have_field("quotation_label", with: @new_label)
 end
 
 Then(/^I am on the created quotation$/) do
@@ -175,29 +141,29 @@ Then(/^I am on the created quotation$/) do
 end
 
 Then(/^he can see all the quotation informations$/) do
-  expect(page).to have_selector '.quotation-label', @quotation.label
+  expect(page).to have_selector ".quotation-label", @quotation.label
 
   expect(page).to have_selector ".quotation-expires_at", "21/12/2012"
 end
 
 Then(/^the quotation default date is set to today's date\.$/) do
-  page.should have_field('quotation_date', with: I18n.l(Time.zone.now.to_date))
+  page.should have_field("quotation_date", with: I18n.l(Date.current))
 end
 
 Then(/^he should see (\d+) quotations?$/) do |arg1|
-  page.should have_selector '.quotation', count: arg1
+  page.should have_selector ".quotation", count: arg1
 end
 
 Then(/^the quotation is displayed correctly$/) do
-  expect(page).to have_selector '.tracking_id', @quotation.tracking_id
+  expect(page).to have_selector ".tracking_id", @quotation.tracking_id
 end
 
 Then(/^a message signals the success of the quotation creation$/) do
-  page.should have_selector '.alert-success'
+  page.should have_selector ".alert-success"
 end
 
 Then(/^he will see links to the documents$/) do
-  page.should have_link 'pdf.pdf', count: 2
+  page.should have_link "pdf.pdf", count: 2
 end
 
 Then(/^the quotation informations are visible on the quotation details$/) do
@@ -208,7 +174,7 @@ Then(/^the quotation informations are visible on the quotation details$/) do
 end
 
 Then(/^only the quotations of this customer do appear$/) do
-  expect(page).to have_selector(".customer_name", text: 'Bidule', count: 2)
+  expect(page).to have_selector(".customer_name", text: "Bidule", count: 2)
 end
 
 Then(/^only the quotations of today do appear$/) do
@@ -242,4 +208,3 @@ Then(/^only the "(.*?)" quotations appear$/) do |state|
   expect(page).to have_selector("tr.quotation", count: 1)
   expect(find("tr.quotation")).to have_content(state_i18n)
 end
-