From 749aad3467f8583bf74253d3f2b3ac882bf2e958 Mon Sep 17 00:00:00 2001
From: Senad Uka <senaduka@gmail.com>
Date: Thu, 25 Jun 2020 08:47:10 +0200
Subject: [PATCH] Task me upstream sync

---
 app/models/task_request.rb              | 2 ++
 app/views/task_requests/_form.html.erb  | 2 +-
 app/views/task_requests/create.html.erb | 6 +++++-
 spec/factories/task_requests.rb         | 2 +-
 spec/models/task_request_spec.rb        | 4 ++++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/models/task_request.rb b/app/models/task_request.rb
index 458e86a..04345ac 100644
--- a/app/models/task_request.rb
+++ b/app/models/task_request.rb
@@ -5,4 +5,6 @@ class TaskRequest < ApplicationRecord
   enum status: [:pending, :completed, :cancelled]
 
   scope :order_by_recent, -> { order(created_at: :desc) }
+
+  validates :time_allowed, numericality: { only_integer: true, greater_than_or_equal_to: 2 }
 end
diff --git a/app/views/task_requests/_form.html.erb b/app/views/task_requests/_form.html.erb
index aa978e3..1606356 100644
--- a/app/views/task_requests/_form.html.erb
+++ b/app/views/task_requests/_form.html.erb
@@ -1,7 +1,7 @@
 <%= errors_summary_for task_request %>
 
 <%= bootstrap_form_with model: model, url: [@project, @task_request, show_chat: true], local: true do |form| %>
-  <div class="alert alert-notice text-center pl-0 text-md-left mt-4">
+  <div class="alert alert-info text-center text-md-left">
     <%= fa_icon "info-circle" %>
     <strong><%= t '.info_message' %></strong>
   </div>
diff --git a/app/views/task_requests/create.html.erb b/app/views/task_requests/create.html.erb
index 7968105..86a9ba9 100644
--- a/app/views/task_requests/create.html.erb
+++ b/app/views/task_requests/create.html.erb
@@ -2,7 +2,11 @@
   <%= javascript_include_tag "https://js.hs-scripts.com/7344617.js", defer: "defer", async: true, id: "hs-script-loader" %>
   <%= javascript_tag nonce: true do %>
     $(document).ready(function(){
-      window.HubSpotConversations.widget.open();
+      window.hsConversationsOnReady = [
+        function() {
+          window.HubSpotConversations.widget.open();
+        }
+      ]
     });
   <% end %>
 <% end %>
diff --git a/spec/factories/task_requests.rb b/spec/factories/task_requests.rb
index b533bdf..a085948 100644
--- a/spec/factories/task_requests.rb
+++ b/spec/factories/task_requests.rb
@@ -3,7 +3,7 @@ FactoryBot.define do
     association :project
     user_email 'test@email.com'
     deadline { 10.days.from_now }
-    time_allowed "10 days"
+    time_allowed 5
     description "Task request"
     additional_notes "Additional notes"
     status 0
diff --git a/spec/models/task_request_spec.rb b/spec/models/task_request_spec.rb
index cf5ea56..2e67c29 100644
--- a/spec/models/task_request_spec.rb
+++ b/spec/models/task_request_spec.rb
@@ -13,4 +13,8 @@ RSpec.describe TaskRequest, type: :model do
     subject { described_class }
     it { is_expected.to respond_to(:order_by_recent) }
   end
+
+  describe "#validations" do
+    it { should validate_numericality_of(:time_allowed).only_integer.is_greater_than_or_equal_to(2) }
+  end
 end