dorsale 3.5.2 → 3.6.0

data/config/locales/flyboy.fr.yml

@@ -50,6 +50,10 @@ fr:
         created_at: "Créée le"
         name: "Titre"
         reminder: "Rappel"
+        reminder_type: "Type de rappel"
+        reminder_date: "Date de rappel"
+        reminder_duration: "Durée du rappel"
+        reminder_unit: "Unité du rappel"
         term: "Echéance"
         done: "Fait"
         description: "Description"
@@ -59,3 +63,20 @@ fr:
         progress: "Progression"
         description: "Description"
         task: "Tâche"
+
+      dorsale/flyboy/task/reminder_type:
+        none: "Aucun"
+        duration: "Durée"
+        custom: "Date"
+
+      dorsale/flyboy/task/reminder_unit:
+        days: "Jour(s)"
+        weeks: "Semaine(s)"
+        months: "Mois"
+
+      dorsale/flyboy/task/term_value:
+        today: "Aujourd'hui"
+        tomorrow: "Demain"
+        this_week: "Cette semaine"
+        next_week: "La semaine prochaine"
+        custom: "Choisir une date"

data/db/migrate/20170413082819_dorsale_flyboy_tasks_new_reminder.rb

@@ -0,0 +1,9 @@
+class DorsaleFlyboyTasksNewReminder < ActiveRecord::Migration[5.0]
+  def change
+    rename_column :dorsale_flyboy_tasks, :reminder, :reminder_date
+    add_column :dorsale_flyboy_tasks, :reminder_type, :string
+    add_column :dorsale_flyboy_tasks, :reminder_duration, :integer
+    add_column :dorsale_flyboy_tasks, :reminder_unit, :string
+    Dorsale::Flyboy::Task.update_all(reminder_type: "custom")
+  end
+end

data/db/migrate/20170418070730_create_dorsale_customer_vault_events.rb

@@ -0,0 +1,31 @@
+class CreateDorsaleCustomerVaultEvents < ActiveRecord::Migration[5.0]
+  def change
+    create_table :dorsale_customer_vault_events do |t|
+      t.integer :author_id
+      t.integer :person_id
+      t.integer :comment_id
+      t.string :action
+      t.timestamps
+    end
+
+    Dorsale::CustomerVault::Person.all.each do |person|
+      event            = Dorsale::CustomerVault::Event.new
+      event.person     = person
+      event.action     = "create"
+      event.created_at = person.created_at
+      event.updated_at = person.created_at
+      event.save(validate: false)
+    end
+
+    Dorsale::Comment.where(commentable_type: Dorsale::CustomerVault::Person.to_s).all.each do |comment|
+      event            = Dorsale::CustomerVault::Event.new
+      event.author     = comment.author
+      event.person     = comment.commentable
+      event.comment    = comment
+      event.action     = "comment"
+      event.created_at = comment.created_at
+      event.updated_at = comment.created_at
+      event.save!
+    end
+  end
+end

data/features/customer_vault_corporations.feature

@@ -79,7 +79,7 @@ Feature: Manage corporations
     When I go on the people activity
     Then I see all these comments
 
-  Scenario: People activity
+  Scenario: People activity pagination
     Given an existing corporation with 150 comments
     When I go on the people activity
     Then I see these comments paginated

data/features/flyboy_tasks.feature

@@ -86,3 +86,37 @@ Feature: Manage tasks
     Given a closed task with an owner
     When the flyboy daily crons run
     Then no email is sent
+
+  Scenario: Task term JS
+    When I go on the new task page
+    Then I do not see "#task_term_custom" element
+    When I select "Aujourd'hui"
+    Then I do not see "#task_term_custom" element
+    When I submit
+    Then selected task term is "Aujourd'hui"
+    Then I do not see "#task_term_custom" element
+    When I select "Choisir une date"
+    Then I see "#task_term_custom" element
+    And I fill "task_term_custom" with "15/06/2016"
+    And I submit
+    Then selected task term is "Choisir une date"
+    And I see "#task_term_custom" element
+    And "task_term_custom" has value "15/06/2016"
+
+  Scenario: Task term JS
+    When I go on the new task page
+    Then I do not see "#task_reminder_duration" element
+    Then I do not see "#task_reminder_unit" element
+    Then I do not see "#task_reminder_date" element
+    When I select "Durée"
+    Then I see "#task_reminder_duration" element
+    Then I see "#task_reminder_unit" element
+    Then I do not see "#task_reminder_date" element
+    When I select "Date"
+    Then I do not see "#task_reminder_duration" element
+    Then I do not see "#task_reminder_unit" element
+    Then I see "#task_reminder_date" element
+    When I select "Aucun"
+    Then I do not see "#task_reminder_duration" element
+    Then I do not see "#task_reminder_unit" element
+    Then I do not see "#task_reminder_date" element

data/features/step_definitions/common_steps.rb

@@ -63,3 +63,28 @@ end
 When(/^I click on show more$/) do
   find("a[class*=show_more]").click
 end
+
+When(/^I select "([^"]*)"$/) do |value|
+  select value
+end
+
+When(/^I submit$/) do
+  find("#main [type=submit]").click
+end
+
+When(/^I fill "([^"]*)" with "([^"]*)"$/) do |field, value|
+  fill_in field, with: value
+end
+
+Then(/^"([^"]*)" has value "([^"]*)"$/) do |field, expected_value|
+  value = find_field(field).value
+  expect(value).to eq expected_value
+end
+
+Then(/^I do not see "([^"]*)" element$/) do |element_selector|
+  expect(page).to have_no_selector element_selector
+end
+
+Then(/^I see "([^"]*)" element$/) do |element_selector|
+  expect(page).to have_selector element_selector
+end

data/features/step_definitions/customer_vault_corporations_steps.rb

@@ -105,14 +105,14 @@ end
 
 Given(/^an existing individual with recent comments$/) do
   @individual = create(:customer_vault_individual)
-  @individual_comment1 = @individual.comments.create(text: "individual-comment-1", author: @user)
-  @individual_comment2 = @individual.comments.create(text: "individual-comment-2", author: @user)
+  create(:dorsale_comment, commentable: @individual, text: "individual-comment-1")
+  create(:dorsale_comment, commentable: @individual, text: "individual-comment-2")
 end
 
 Given(/^an existing corporation with recent comments$/) do
   @corporation = create(:customer_vault_corporation)
-  @corporation_comment1 = @corporation.comments.create(text: "corporation-comment-1", author: @user)
-  @corporation_comment2 = @corporation.comments.create(text: "corporation-comment-2", author: @user)
+  create(:dorsale_comment, commentable: @corporation, text: "corporation-comment-1")
+  create(:dorsale_comment, commentable: @corporation, text: "corporation-comment-2")
 end
 
 When(/^I go on the people activity$/) do
@@ -127,9 +127,10 @@ Then(/^I see all these comments$/) do
 end
 
 Given(/^an existing corporation with (\d+) comments$/) do |n|
+  step "an existing corporation"
+
   n.to_i.times do
-    @corporation = create(:customer_vault_corporation)
-    @corporation.comments.create(text: "abc", author: @user)
+    create(:dorsale_comment, commentable: @corporation)
   end
 end
 

data/features/step_definitions/flyboy_tasks_steps.rb

@@ -1,6 +1,3 @@
-# encoding: utf-8
-require "rake"
-
 Given(/^an existing done task$/) do
   @done_task = create(:flyboy_task, done: true)
 end
@@ -18,9 +15,8 @@ Given(/^an existing task$/) do
 end
 
 Given(/^an existing snoozable task$/) do
-  create(:flyboy_task,
-    :reminder => Date.yesterday,
-    :term     => Time.zone.now.to_date
+  @task = create(:flyboy_task,
+    :term => Time.zone.now.to_date,
   )
 end
 
@@ -32,27 +28,30 @@ end
 
 Given(/^a task with an owner that's the term is today$/) do
   @task = create(:flyboy_task,
-    :reminder => Date.yesterday,
-    :term     => Time.zone.now.to_date,
-    :owner    => create(:user),
+    :term          => Time.zone.now.to_date,
+    :reminder_type => "custom",
+    :reminder_date => Date.yesterday,
+    :owner         => create(:user),
   )
 end
 
 Given(/^a task without owner$/) do
   @task = create(:flyboy_task,
-    :reminder => Date.yesterday,
-    :term     => Time.zone.now.to_date,
-    :owner    => nil,
+    :term          => Time.zone.now.to_date,
+    :reminder_type => "custom",
+    :reminder_date => Date.yesterday,
+    :owner         => nil,
   )
 end
 
 Given(/^a closed task with an owner$/) do
   @task = create(:flyboy_task,
-    :reminder => Date.yesterday,
-    :term     => Time.zone.now.to_date,
-    :owner    => create(:user),
-    :progress => 100,
-    :done     => true,
+    :term          => Time.zone.now.to_date,
+    :reminder_type => "custom",
+    :reminder_date => Date.yesterday,
+    :owner         => create(:user),
+    :progress      => 100,
+    :done          => true,
   )
 end
 
@@ -147,7 +146,7 @@ Then(/^the task is completed$/) do
 end
 
 Then(/^the task is snoozed$/) do
-  expect(all("a[href*=snooze]").count).to eq 0
+  expect(page).to have_no_selector "a[href*=snooze]"
 end
 
 Then(/^I am on this task$/) do
@@ -189,3 +188,12 @@ Then(/^the owner receive an email$/) do
   email = ActionMailer::Base.deliveries.last
   expect(email.to).to include @task.owner.email
 end
+
+When(/^I go on the new task page$/) do
+  visit dorsale.new_flyboy_task_path
+end
+
+Then(/^selected task term is "([^"]*)"$/) do |expected_value|
+  value = find("#task_term option[selected]").text
+  expect(value).to eq expected_value
+end

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.5.2"
+  VERSION = "3.6.0"
 end

data/spec/controllers/dorsale/comments_controller_spec.rb

@@ -7,8 +7,8 @@ describe Dorsale::CommentsController, type: :controller do
 
   before(:each) { sign_in(user) }
 
+  let(:commentable) { create(:customer_vault_corporation) }
   let(:valid_params){
-    commentable = create(:customer_vault_corporation)
     {
       :comment => {
         :commentable_id   => commentable.id,
@@ -29,6 +29,20 @@ describe Dorsale::CommentsController, type: :controller do
       post :create, params: valid_params
       expect(response).to redirect_to("/")
     end
+
+    describe "on person" do
+      it "should create an event" do
+        expect {
+          post :create, params: valid_params
+        }.to change(Dorsale::CustomerVault::Event, :count).by(1)
+
+        event = Dorsale::CustomerVault::Event.last_created
+        expect(event.author).to eq user
+        expect(event.person).to eq commentable
+        expect(event.comment).to eq Dorsale::Comment.last_created
+        expect(event.action).to eq "comment"
+      end
+    end # describe "on person"
   end
 
   describe "update" do

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

@@ -65,20 +65,58 @@ RSpec.describe ::Dorsale::CustomerVault::PeopleController, type: :controller do
         expect(assigns(:people)).to eq [corporation2]
       end
     end # describe "search"
-  end # describe "#liwt"
+  end # describe "#list"
 
   describe "#activity" do
     before do
-      @person = create(:customer_vault_corporation)
-      @comment1 = @person.comments.create!(text: "ABC", created_at: Time.zone.now - 3.days, author: user)
-      @comment2 = @person.comments.create!(text: "DEF", created_at: Time.zone.now - 2.days, author: user)
-      @comment3 = @person.comments.create!(text: "DEF", created_at: Time.zone.now - 9.days, author: user)
+      @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")
     end
 
-    it "should assigns all comments ordered by created_at DESC" do
+    it "should assigns all events ordered by created_at DESC" do
       get :activity
-      expect(assigns(:comments)).to eq [@comment2, @comment1, @comment3]
+      expect(assigns(:events)).to eq [@event_2, @event_1]
     end
   end # describe "#activity"
 
+  describe "#create" do
+    before do
+      allow_any_instance_of(Dorsale::CustomerVault::PeopleController).to \
+      receive(:model) { Dorsale::CustomerVault::Corporation }
+    end
+
+    it "should generate an event" do
+      expect {
+        post :create, params: {person: {corporation_name: "agilidée"}}
+      }.to change(Dorsale::CustomerVault::Event, :count).by(1)
+
+      event = Dorsale::CustomerVault::Event.last_created
+      expect(event.author).to eq user
+      expect(event.person).to eq Dorsale::CustomerVault::Person.last_created
+      expect(event.action).to eq "create"
+    end
+  end # describe "#create"
+
+  describe "#update" do
+    before do
+      allow_any_instance_of(Dorsale::CustomerVault::PeopleController).to \
+      receive(:model) { Dorsale::CustomerVault::Corporation }
+    end
+
+    it "should generate an event" do
+      corporation = create(:customer_vault_corporation)
+
+      expect {
+        patch :update, params: {id: corporation, person: {corporation_name: "agilidée"}}
+      }.to change(Dorsale::CustomerVault::Event, :count).by(1)
+
+      event = Dorsale::CustomerVault::Event.last_created
+      expect(event.author).to eq user
+      expect(event.person).to eq corporation
+      expect(event.action).to eq "update"
+    end
+  end # describe "#update"
+
 end

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

@@ -12,9 +12,8 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
   }
 
   let(:valid_attributes) {{
-    :name          => "New Task" ,
-    :reminder      => (Time.zone.now.to_date - 3.days),
-    :term          => Time.zone.now.to_date,
+    :name => "New Task" ,
+    :term => Time.zone.now.to_date,
   }}
 
   describe "#complete" do
@@ -78,9 +77,9 @@ 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: "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")
+        @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
@@ -216,14 +215,14 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
 
   describe "DELETE destroy" do
     it "destroys the requested task" do
-      task = Dorsale::Flyboy::Task.create! valid_attributes
+      task = create(:flyboy_task)
       expect {
         delete :destroy, params: {:id => task.to_param}
       }.to change(Dorsale::Flyboy::Task, :count).by(-1)
     end
 
     it "redirects to the tasks list" do
-      task = Dorsale::Flyboy::Task.create! valid_attributes
+      task = create(:flyboy_task)
       delete :destroy, params: {:id => task.to_param}
       expect(response).to redirect_to(flyboy_tasks_path)
     end
@@ -231,7 +230,7 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
 
   describe "snooze" do
     it "should redirect to the task list to refresh it" do
-      task = Dorsale::Flyboy::Task.create! valid_attributes
+      task = create(:flyboy_task, term: 3.days.ago)
       patch :snooze, params: {:id => task.to_param}
       expect(response).to redirect_to(task)
     end
@@ -244,57 +243,53 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
       Dorsale::Flyboy::Task.destroy_all
       sign_in summary_user
 
-      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
-        @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
-      end
+      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
+      @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
     end
 
     it "should not assign tasks when owner is an other person" do
       other_user = create(:user)
       Dorsale::Flyboy::Task.update_all(owner_id: other_user.id, owner_type: other_user.class)
 
-      Timecop.travel "2016-03-09 15:00:00" do
-        controller.setup_tasks_summary
-        expect(assigns(:delayed_tasks)).to        eq []
-        expect(assigns(:today_tasks)).to          eq []
-        expect(assigns(:tomorrow_tasks)).to       eq []
-        expect(assigns(:this_week_tasks)).to      eq []
-        expect(assigns(:next_week_tasks)).to      eq []
-        expect(assigns(:next_next_week_tasks)).to eq []
-      end
+      Timecop.freeze "2016-03-09 15:00:00"
+      controller.setup_tasks_summary
+      expect(assigns(:delayed_tasks)).to        eq []
+      expect(assigns(:today_tasks)).to          eq []
+      expect(assigns(:tomorrow_tasks)).to       eq []
+      expect(assigns(:this_week_tasks)).to      eq []
+      expect(assigns(:next_week_tasks)).to      eq []
+      expect(assigns(:next_next_week_tasks)).to eq []
     end
 
     it "should assign tasks when owner is nil" do
       Dorsale::Flyboy::Task.update_all(owner_id: nil, owner_type: nil)
 
-      Timecop.travel "2016-03-09 15:00:00" do
-        controller.setup_tasks_summary
-        expect(assigns(:delayed_tasks)).to        eq [@delayed_task]
-        expect(assigns(:today_tasks)).to          eq [@today_task]
-        expect(assigns(:tomorrow_tasks)).to       eq [@tomorrow_task]
-        expect(assigns(:this_week_tasks)).to      eq [@this_week_task]
-        expect(assigns(:next_week_tasks)).to      eq [@next_week_task]
-        expect(assigns(:next_next_week_tasks)).to eq [@next_next_week_task]
-      end
+      Timecop.freeze "2016-03-09 15:00:00"
+      controller.setup_tasks_summary
+      expect(assigns(:delayed_tasks)).to        eq [@delayed_task]
+      expect(assigns(:today_tasks)).to          eq [@today_task]
+      expect(assigns(:tomorrow_tasks)).to       eq [@tomorrow_task]
+      expect(assigns(:this_week_tasks)).to      eq [@this_week_task]
+      expect(assigns(:next_week_tasks)).to      eq [@next_week_task]
+      expect(assigns(:next_next_week_tasks)).to eq [@next_next_week_task]
     end
 
     it "should assign tasks when owner is me" do
       Dorsale::Flyboy::Task.update_all(owner_id: summary_user.id, owner_type: summary_user.class)
 
-      Timecop.travel "2016-03-09 15:00:00" do
-        controller.setup_tasks_summary
-        expect(assigns(:delayed_tasks)).to        eq [@delayed_task]
-        expect(assigns(:today_tasks)).to          eq [@today_task]
-        expect(assigns(:tomorrow_tasks)).to       eq [@tomorrow_task]
-        expect(assigns(:this_week_tasks)).to      eq [@this_week_task]
-        expect(assigns(:next_week_tasks)).to      eq [@next_week_task]
-        expect(assigns(:next_next_week_tasks)).to eq [@next_next_week_task]
-      end
+      Timecop.freeze "2016-03-09 15:00:00"
+      controller.setup_tasks_summary
+      expect(assigns(:delayed_tasks)).to        eq [@delayed_task]
+      expect(assigns(:today_tasks)).to          eq [@today_task]
+      expect(assigns(:tomorrow_tasks)).to       eq [@tomorrow_task]
+      expect(assigns(:this_week_tasks)).to      eq [@this_week_task]
+      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