Taskme update

Gemfile

@@ -30,9 +30,9 @@ gem "active_storage_base64", "~> 1.0.0"
 gem "image_processing", "~> 1.2"
 
 # Use Amazon Web Services S3 for file uploads in production
-gem "aws-sdk-s3", "~> 1.48", require: false, group: [:production, :review]
+gem "aws-sdk-s3", "~> 1.31.0", require: false, group: [:production, :review]
 # Allow AWS API requests to be signed using IAM credentials
-gem "aws-sigv4", "~> 1.1"
+gem "aws-sigv4", "~> 1.0.2"
 
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.1.0", require: false

Gemfile.lock

@@ -117,22 +117,21 @@ GEM
     ast (2.4.0)
     autoprefixer-rails (9.7.3)
       execjs
-    aws-eventstream (1.1.0)
-    aws-partitions (1.337.0)
-    aws-sdk-core (3.102.1)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
-      aws-sigv4 (~> 1.1)
+    aws-eventstream (1.0.3)
+    aws-partitions (1.210.0)
+    aws-sdk-core (3.46.2)
+      aws-eventstream (~> 1.0)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.35.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.72.0)
-      aws-sdk-core (~> 3, >= 3.102.1)
+    aws-sdk-kms (1.13.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-s3 (1.31.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.1)
-      aws-eventstream (~> 1, >= 1.0.2)
+      aws-sigv4 (~> 1.0)
+    aws-sigv4 (1.0.3)
     axlsx (3.0.0.pre)
       htmlentities (~> 4.3, >= 4.3.4)
       mimemagic (~> 0.3)
@@ -515,8 +514,8 @@ DEPENDENCIES
   activeresource (= 5.1.0)
   acts-as-taggable-on!
   analytics-ruby
-  aws-sdk-s3 (~> 1.48)
-  aws-sigv4 (~> 1.1)
+  aws-sdk-s3 (~> 1.31.0)
+  aws-sigv4 (~> 1.0.2)
   axlsx (~> 3.0.0.pre)
   axlsx_rails (~> 0.5.2)
   axlsx_styler (~> 0.2.0)

app/controllers/accounts_controller.rb

@@ -17,7 +17,7 @@ class AccountsController < ApplicationController
 
         if sign_in(user)
           TrackAnalyticsJob.perform_later(user, user.primary_account, :track_guest_sign_up, user_agent: request.user_agent, user_ip: request.remote_ip)
-          SubmitHubspotFormJob.perform_later(user.first_name, user.last_name, user.email, account.name, i_m_interested_in: user.interested_product_name)
+          SubmitHubspotFormJob.perform_later(user.email, account.name, i_m_interested_in: user.interested_product_name)
           redirect_to signed_in_root_path
         else
           redirect_to new_session_path, alert: t(".notice")

app/controllers/api/appearance_releases_controller.rb

@@ -19,11 +19,5 @@ class Api::AppearanceReleasesController < Api::ReleasesController
       guardian_photo[:io] = StringIO.new(Base64.decode64(guardian_photo[:io]))
       release.guardian_photo.attach(io: guardian_photo[:io], filename: guardian_photo[:filename])
     end
-
-    guardian_2_photo = release_create_params[:guardian_2_photo]
-    if guardian_2_photo
-      guardian_2_photo[:io] = StringIO.new(Base64.decode64(guardian_2_photo[:io]))
-      release.guardian_2_photo.attach(io: guardian_2_photo[:io], filename: guardian_2_photo[:filename])
-    end
   end
 end

app/controllers/api/releases_controller.rb

@@ -103,16 +103,10 @@ class Api::ReleasesController < Api::ApiController
       if ["appearance_release", "talent_release"].include?(name)
         has_many :guardian_photos do
           data do
-            [
-              @object.guardian_photo.try(:attachment),
-              @object.guardian_2_photo.try(:attachment)
-            ].compact
+            [@object.guardian_photo.try(:attachment)].compact
           end
           meta do
-            { count:
-              (@object.try(:guardian_photo).try(:attached?) ? 1 : 0) +
-              (@object.try(:guardian_2_photo).try(:attached?) ? 1 : 0)
-            }
+            { count: @object.try(:guardian_photo).try(:attached?) ? 1 : 0  }
           end
         end
       end
@@ -176,7 +170,7 @@ class Api::ReleasesController < Api::ApiController
 
   def release_create_params
     parameters = params.require(model_name).permit!
-    keys = model_constant.new.attributes.keys + [:guardian_photo, :guardian_2_photo, :person_photo, :photos, :signature, :signature_base64, :file_infos_attributes]
+    keys = model_constant.new.attributes.keys + [:guardian_photo, :person_photo, :photos, :signature, :signature_base64, :file_infos_attributes]
     parameters[:signature_base64] = parameters[:signature]
     parameters = parameters.slice(*keys).except(:created_at, :updated_at, :id, :user_id, :signature)
     parameters

app/controllers/api/talent_releases_controller.rb

@@ -17,11 +17,5 @@ class Api::TalentReleasesController < Api::ReleasesController
       guardian_photo[:io] = StringIO.new(Base64.decode64(guardian_photo[:io]))
       release.guardian_photo.attach(io: guardian_photo[:io], filename: guardian_photo[:filename])
     end
-
-    guardian_2_photo = release_create_params[:guardian_2_photo]
-    if guardian_2_photo
-      guardian_2_photo[:io] = StringIO.new(Base64.decode64(guardian_2_photo[:io]))
-      release.guardian_2_photo.attach(io: guardian_2_photo[:io], filename: guardian_2_photo[:filename])
-    end
   end
 end

app/controllers/stream_notifications_controller.rb

@@ -60,14 +60,9 @@ class StreamNotificationsController < ApplicationController
   def set_broadcast
     if notification_type == "video.asset.static_renditions.ready"
       live_stream_id = notification.dig(:stream_notification, :data, :live_stream_id)
-      @broadcast = Broadcast.find_by(stream_uid: live_stream_id)
+      @broadcast = Broadcast.find_by!(stream_uid: live_stream_id)
     else
-      @broadcast = Broadcast.find_by(stream_uid: notification_object_id)
-    end
-
-    if @broadcast.nil?
-      logger.info "Ignoring broadcast from other environment. Type = #{notification_type}. Id = #{live_stream_id} / #{notification_object_id}"
-      head :ok
+      @broadcast = Broadcast.find_by!(stream_uid: notification_object_id)
     end
   end
 

app/controllers/task_requests_controller.rb

@@ -4,7 +4,6 @@ class TaskRequestsController < ApplicationController
   before_action :set_project
   before_action :build_task_request, only: [:new, :create]
   before_action :set_task_request, only: [:show, :edit, :update, :cancel]
-  before_action :show_splash_screen, only: :index
 
   def index
     @task_requests = task_requests.order_by_recent.paginate(page: params[:page])
@@ -47,10 +46,6 @@ class TaskRequestsController < ApplicationController
 
   private
 
-  def show_splash_screen
-    render :splash if task_requests.count.zero?
-  end
-
   def task_request_params
     params.require(:task_request).permit(:description, :deadline, :time_allowed, :additional_notes, files: [])
   end

app/helpers/wordmark_helper.rb

@@ -13,13 +13,10 @@ module WordmarkHelper
     css += options[:class].to_s
 
     content_tag(:div, class: css) do
-      elements = [
+      safe_join [
         content_tag(:span, t("shared.#{product_name}")),
         content_tag(:span, t("shared.me"))
       ]
-      prefix = options[:prefix]
-      elements.unshift content_tag(:span, "#{prefix} ") unless prefix.blank?
-      safe_join elements
     end
   end
 end

app/jobs/submit_hubspot_form_job.rb

@@ -1,14 +1,12 @@
 class SubmitHubspotFormJob < ApplicationJob
   queue_as :default
 
-  def perform(first_name, last_name, email, company_name, additional_params = {})
+  def perform(email, company_name, additional_params = {})
     hubspot_form_guid = ENV["HUBSPOT_FORM_GUID"]
     return unless hubspot_form_guid.present?
 
     submission_params = {
-      first_name: first_name,
-      last_name: last_name,
-      email: email,
+      email: email, 
       company: company_name
     }.merge(additional_params)
 

app/views/task_requests/splash.html.erb

@@ -1,58 +0,0 @@
-<div class="d-flex flex-row">
-  <div class="d-flex flex-column">
-    <%= product_wordmark :task_me, prefix: t('.headings.welcome'), class: "h2" %>
-    <p class="text-muted"><%= t '.headings.subtitle' %>
-  </div>
-
-  <%= link_to t(".actions.book_demo"), 'https://meetings.hubspot.com/bray2', class: "btn btn-primary border align-self-center h-50 ml-auto mr-2 pb-2", target: '_blank' %>
-  <% if policy(TaskRequest).new? %>
-    <%= link_to t(".actions.create_task_request"), [:new, @project, :task_request], class: "btn btn-success border align-self-center h-50 pb-2" %>
-  <% end %>
-</div>
-
-<hr>
-
-<div class="pt-2">
-  <div class="row">
-    <div class="col">
-      <div class="card-body p-0">
-        <div class="embed-responsive embed-responsive-16by9">
-          <div class="embed-responsive-item">
-            <table class="w-100 h-100 bg-secondary">
-              <tbody>
-              <tr>
-                <td class="text-center align-middle text-white">
-                  Video tutorial will be available soon
-                </td>
-              </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="col">
-      <div class="row">
-        <div class="col">
-          <h3><%= t '.headings.how_it_works' %></h3>
-          <ol>
-            <li><%= t '.list_items.enter_task_request' %></li>
-            <li><%= t '.list_items.state_deadline' %></li>
-            <li><%= t '.list_items.enter_number_of_hours' %></li>
-            <li><%= t '.list_items.virtual_assistant_delivers_task' %></li>
-          </ol>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col">
-          <h3><%= t '.headings.benefits' %></h3>
-          <ul class="fa-ul ml-5">
-            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.reduces_need_for_full_time_staff'))) %>
-            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.reduces_workload'))) %>
-            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.spend_per_task'))) %>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>

config/locales/en.yml

@@ -324,11 +324,11 @@ en:
       notice: The release has been updated
   helpers:
     help:
+      task_request:
+        time_allowed: Minimum of 2 hours, no partial hours allowed
       contract_template:
         fee: Leave at $0.00 for no-fee
         guardian_clause: Leave blank if not required for this contract
-      task_request:
-        time_allowed: Minimum of 2 hours, no partial hours allowed
       video:
         audio_only_edl_file: If you do not upload an Audio Only EDL, the software will not generate a BiG Music Cue Sheet.
         edl_file: Please follow our directions on exporting the All Tracks EDL. Failure to do so could result in inaccurate and incomplete reporting.
@@ -1202,23 +1202,6 @@ en:
       heading: New Task Request
     show:
       empty: Attached files will appear here.
-    splash:
-      actions:
-        book_demo: Schedule a Demo
-        create_task_request: Create Task Request
-      headings:
-        benefits: Benefits
-        how_it_works: How It Works
-        subtitle: Pay-by-the-hour, digitally-enabled remote assistants
-        welcome: Welcome to
-      list_items:
-        enter_number_of_hours: Enter the number of hours you want the task worked on
-        enter_task_request: Enter your task request
-        reduces_need_for_full_time_staff: Reduces need to hire full-time staff
-        reduces_workload: Reduces workload for current staff
-        spend_per_task: Spend as little as $60 per task
-        state_deadline: State your deadline
-        virtual_assistant_delivers_task: Virtual assistant delivers task via TaskME portal
     task_request:
       actions:
         manage: Manage

config/locales/es.yml

@@ -358,23 +358,6 @@ es:
     index:
       table_headers:
         task_request_description: Description (ES)
-    splash:
-      actions:
-        book_demo: Schedule a Demo (ES)
-        create_task_request: Create Task Request
-      headings:
-        benefits: Benefits (ES)
-        how_it_works: How It Works (ES)
-        subtitle: Pay-by-the-hour, digitally-enabled remote assistants (ES)
-        welcome: Welcome to (ES)
-      list_items:
-        enter_number_of_hours: Enter the number of hours you want the task worked on (ES)
-        enter_task_request: Enter your task request (ES)
-        reduces_need_for_full_time_staff: Reduces need to hire full-time staff (ES)
-        reduces_workload: Reduces workload for current staff (ES)
-        spend_per_task: Spend as little as $60 per task (ES)
-        state_deadline: State your deadline (ES)
-        virtual_assistant_delivers_task: Virtual assistant delivers task via TaskME portal (ES)
     task_request:
       actions:
         manage: Manage (ES)

db/structure.sql

@@ -9,6 +9,20 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
+--
+-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
+--
+
+CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
+
+
+--
+-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
+--
+
+COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
+
+
 --
 -- Name: fuzzystrmatch; Type: EXTENSION; Schema: -; Owner: -
 --
@@ -317,8 +331,8 @@ CREATE TABLE public.appearance_releases (
     person_last_name character varying,
     guardian_first_name character varying,
     guardian_last_name character varying,
-    identifier character varying,
     guardian_email character varying,
+    identifier character varying,
     person_address_street2 character varying,
     person_address_city character varying,
     person_address_state character varying,
@@ -652,6 +666,15 @@ CREATE SEQUENCE public.contract_templates_id_seq
 ALTER SEQUENCE public.contract_templates_id_seq OWNED BY public.contract_templates.id;
 
 
+--
+-- Name: data_migrations; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.data_migrations (
+    version character varying NOT NULL
+);
+
+
 --
 -- Name: directories; Type: TABLE; Schema: public; Owner: -
 --
@@ -1378,7 +1401,6 @@ CREATE TABLE public.settings (
 --
 
 CREATE SEQUENCE public.settings_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -1414,7 +1436,6 @@ CREATE TABLE public.taggings (
 --
 
 CREATE SEQUENCE public.taggings_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -1445,7 +1466,6 @@ CREATE TABLE public.tags (
 --
 
 CREATE SEQUENCE public.tags_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -1806,9 +1826,9 @@ CREATE TABLE public.zoom_meetings (
     api_meeting_id character varying,
     created_at timestamp(6) without time zone NOT NULL,
     updated_at timestamp(6) without time zone NOT NULL,
+    status integer DEFAULT 0,
     zoom_user_id bigint,
-    project_id bigint,
-    status integer DEFAULT 0
+    project_id bigint
 );
 
 
@@ -2285,6 +2305,14 @@ ALTER TABLE ONLY public.contract_templates
     ADD CONSTRAINT contract_templates_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: data_migrations data_migrations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.data_migrations
+    ADD CONSTRAINT data_migrations_pkey PRIMARY KEY (version);
+
+
 --
 -- Name: directories directories_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --

spec/controllers/accounts_controller_spec.rb

@@ -57,8 +57,6 @@ RSpec.describe AccountsController, type: :controller do
         expect {
           post :create, params: params
         }.to have_enqueued_job(SubmitHubspotFormJob).with(
-          "John",
-          "Doe",
           "test_user+1@test.com", 
           "Test Dev account", 
           i_m_interested_in: "DirectME"

spec/controllers/api/appearance_releases_controller_spec.rb

@@ -37,26 +37,23 @@ RSpec.describe Api::AppearanceReleasesController, type: :controller do
 
     it 'includes photos' do
       project = create(:project, account_id: current_user.primary_account.id)
-      appearance_release = create(:appearance_release,
-                                  :with_person_photo, :with_guardian_photo, :with_guardian_2_photo,
-                                  project: project)
+      appearance_release = create(:appearance_release, person_first_name: 'Release', person_last_name: 'Name', project: project)
 
       sign_in_to_api(current_user)
       get :show, params: { id: appearance_release.id }
 
-      [appearance_release.person_photo, appearance_release.guardian_photo, appearance_release.guardian_2_photo].each do |photo|
-        data = {
-          'id' => photo.id.to_s,
-          'type' => 'active_storage_attachment',
-          'attributes' => {
-            'content_type' => photo.content_type,
-            'filename' => photo.filename.to_s,
-            'url' => photo_path_for(photo),
-            'thumbnail_url' => photo_variant_path_for(photo, '150x150')
-          }
+      photo = appearance_release.person_photo
+      data = {
+        'id' => photo.id.to_s,
+        'type' => 'active_storage_attachment',
+        'attributes' => {
+          'content_type' => photo.content_type,
+          'filename' => photo.filename.to_s,
+          'url' => photo_path_for(photo),
+          'thumbnail_url' => photo_variant_path_for(photo, '150x150')
         }
-        expect(response_body_included_attributes).to include(data)
-      end
+      }
+      expect(response_body_included_attributes).to include(data)
     end
   end
 
@@ -187,46 +184,7 @@ RSpec.describe Api::AppearanceReleasesController, type: :controller do
       expect(appearance_release.guardian_photo).to be_attached
     end
 
-    it 'returns 201 for minor without second guardian photo' do
-      post :create, params: @parameters.deep_merge(appearance_release: {
-        minor: true,
-        guardian_2_name: 'Guardian 2 Name',
-        guardian_2_phone: '101010',
-      })
 
-      expect(response.status).to eq 201
-      expect(AppearanceRelease.last.signature).to be_attached
-      expect(AppearanceRelease.last.guardian_2_photo).not_to be_attached
-    end
-
-    it 'returns 201 for minor with second guardian photo' do
-      post :create, params: @parameters.deep_merge(appearance_release: {
-        minor: true,
-        guardian_2_name: 'Guardian 2 Name',
-        guardian_2_phone: '101010',
-        guardian_2_photo: {
-          io: guardian_photo_base64,
-          filename: 'guardian_2_photo.jpeg'
-        }
-      })
-      expect(response.status).to eq 201
-
-      appearance_release = AppearanceRelease.last
-      photo = appearance_release.guardian_2_photo
-      data = {
-        'id' => photo.id.to_s,
-        'type' => 'active_storage_attachment',
-        'attributes' => {
-          'content_type' => photo.content_type,
-          'filename' => photo.filename.to_s,
-          'url' => photo_path_for(photo),
-          'thumbnail_url' => photo_variant_path_for(photo, '150x150')
-        }
-      }
-      expect(response_body_included_attributes).to include(data)
-      expect(appearance_release.signature).to be_attached
-      expect(appearance_release.guardian_2_photo).to be_attached
-    end
   end
 
   private

spec/controllers/api/talent_releases_controller_spec.rb

@@ -32,28 +32,26 @@ RSpec.describe Api::TalentReleasesController, type: :controller do
     end
 
     it 'includes photos' do
-      project = create(:project, account_id: current_user.primary_account.id)
-      talent_release = create(:talent_release,
-                              :with_guardian_photo, :with_guardian_2_photo,
-                              project: project)
+          tested_release = create("talent_release_with_photo", person_name: 'Release 1', project: project)
 
-      sign_in_to_api(current_user)
-      get :show, params: { id: talent_release.id }
+          sign_in_to_api(current_user)
+          get :show, params: { id: tested_release.id }
 
-      [talent_release.photos, talent_release.guardian_photo, talent_release.guardian_2_photo].flatten.each do |photo|
-        data = {
-          'id' => photo.id.to_s,
-          'type' => 'active_storage_attachment',
-          'attributes' => {
-            'content_type' => photo.content_type,
-            'filename' => photo.filename.to_s,
-            'url' => photo_path_for(photo),
-            'thumbnail_url' => photo_variant_path_for(photo, '150x150')
-          }
-        }
-        expect(response_body_included_attributes).to include(data)
-      end
-    end
+          tested_release.photos.each do |photo|
+            data = {
+              'id' => photo.id.to_s,
+              'type' => 'active_storage_attachment',
+              'attributes' => {
+                'content_type' => photo.content_type,
+                'filename' => photo.filename.to_s,
+                'url' => photo_path_for(photo),
+                'thumbnail_url' => photo_variant_path_for(photo, '150x150')
+              }
+            }
+
+            expect(response_body_included_attributes).to include(data)
+          end
+        end
   end
 
   describe '#create' do
@@ -182,47 +180,6 @@ RSpec.describe Api::TalentReleasesController, type: :controller do
       expect(talent_release.signature).to be_attached
       expect(talent_release.guardian_photo).to be_attached
     end
-
-    it 'returns 201 for minor without second guardian photo' do
-      post :create, params: @parameters.deep_merge(talent_release: {
-        minor: true,
-        guardian_2_name: 'Guardian 2 Name',
-        guardian_2_phone: '101010',
-      })
-
-      expect(response.status).to eq 201
-      expect(TalentRelease.last.signature).to be_attached
-      expect(TalentRelease.last.guardian_2_photo).not_to be_attached
-    end
-
-    it 'returns 201 for minor with second guardian photo' do
-      post :create, params: @parameters.deep_merge(talent_release: {
-        minor: true,
-        guardian_2_name: 'Guardian 2 Name',
-        guardian_2_phone: '101010',
-        guardian_2_photo: {
-          io: guardian_photo_base64,
-          filename: 'guardian_2_photo.jpeg'
-        }
-      })
-      expect(response.status).to eq 201
-
-      talent_release = TalentRelease.last
-      photo = talent_release.guardian_2_photo
-      data = {
-        'id' => photo.id.to_s,
-        'type' => 'active_storage_attachment',
-        'attributes' => {
-          'content_type' => photo.content_type,
-          'filename' => photo.filename.to_s,
-          'url' => photo_path_for(photo),
-          'thumbnail_url' => photo_variant_path_for(photo, '150x150')
-        }
-      }
-      expect(response_body_included_attributes).to include(data)
-      expect(talent_release.signature).to be_attached
-      expect(talent_release.guardian_2_photo).to be_attached
-    end
   end
 
   private

spec/controllers/stream_notifications_controller_spec.rb

@@ -7,7 +7,6 @@ RSpec.describe StreamNotificationsController, type: :controller do
   let(:active_status) { {type: "video.live_stream.active", object: { id: "mux_stream" }} }
   let(:disconnected_status) { {type: "video.live_stream.disconnected", object: { id: "mux_stream" }} }
   let(:idle_status) { {type: "video.live_stream.idle", object: { id: "mux_stream" }} }
-  let(:idle_status_for_unknown_broadcast) { {type: "video.live_stream.idle", object: { id: "unknown-id" }} }
   let(:asset_ready) { {
     type: "video.asset.static_renditions.ready",
     object: { id: "asset_uid" },
@@ -60,12 +59,6 @@ RSpec.describe StreamNotificationsController, type: :controller do
 
       expect(BroadcastsChannel).to have_received(:stream_recording_ready)
     end
-
-    it "returns OK response even for non-existing broadcast" do
-      post :create, params: idle_status_for_unknown_broadcast
-
-      expect(response).to be_successful
-    end
   end
 
   after do

spec/controllers/task_requests_controller_spec.rb

@@ -18,14 +18,7 @@ RSpec.describe TaskRequestsController, type: :controller do
       expect(response).to be_successful
     end
 
-    it "renders splash page if there are no task requests" do
-      get :index, params: { project_id: project }
-
-      expect(response.body).to have_link "Create Task Request"
-      expect(response.body).to have_link schedule_demo
-    end
-
-    it "renders task requests table if there are task requests" do
+    it "renders content" do
       create(:task_request, project: project, description: "Another Request")
 
       get :index, params: { project_id: project }
@@ -133,8 +126,4 @@ RSpec.describe TaskRequestsController, type: :controller do
   def update_params
     { description: "This is updated description" }
   end
-
-  def schedule_demo
-    t 'task_requests.splash.actions.book_demo'
-  end
 end

spec/factories/appearance_releases.rb

@@ -58,7 +58,10 @@ FactoryBot.define do
       guardian_address_state "State"
       guardian_address_zip "ZIP"
       guardian_address_country "Country"
-      with_guardian_photo
+      guardian_photo do
+        path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
+        Rack::Test::UploadedFile.new(path, "image/jpeg")
+      end
     end
 
     trait :without_person_photo do
@@ -71,20 +74,6 @@ FactoryBot.define do
       end
     end
 
-    trait :with_guardian_photo do
-      guardian_photo do
-        path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
-        Rack::Test::UploadedFile.new(path, "image/jpeg")
-      end
-    end
-
-    trait :with_guardian_2_photo do
-      guardian_2_photo do
-        path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
-        Rack::Test::UploadedFile.new(path, "image/jpeg")
-      end
-    end
-
     trait :with_person_photo_only do
     end
 

spec/factories/talent_releases.rb

@@ -35,23 +35,12 @@ FactoryBot.define do
       guardian_first_name "Jamie"
       guardian_last_name "Doe"
       guardian_phone "123-555-1234"
-      with_guardian_photo
-    end
-
-    trait :with_guardian_photo do
       guardian_photo do
         path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
         Rack::Test::UploadedFile.new(path, "image/jpeg")
       end
     end
 
-    trait :with_guardian_2_photo do
-      guardian_2_photo do
-        path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
-        Rack::Test::UploadedFile.new(path, "image/jpeg")
-      end
-    end
-
     factory :talent_release_with_contract_template do
       after(:build) do |talent_release, _|
         talent_release.contract_template = build(:talent_release_contract_template)

spec/features/user_managing_task_requests_spec.rb

@@ -8,14 +8,7 @@ feature "User managing task requests" do
     sign_in current_user
   end
 
-  scenario "splash page is shown if there are no task requests" do
-    visit project_task_requests_path(project)
-
-    expect(page).to have_content schedule_demo
-  end
-
   scenario "task requests table is visible" do
-    create(:task_request, project: project, description: 'Short Desc')
     visit project_task_requests_path(project)
 
     expect(page).to have_content "Created On"
@@ -26,6 +19,10 @@ feature "User managing task requests" do
   end
 
   scenario "sees list of task requests" do
+    visit project_task_requests_path(project)
+
+    expect(page).to have_content no_task_requests_label
+
     task_request = create(:task_request, project: project)
 
     visit project_task_requests_path(project)
@@ -116,8 +113,4 @@ feature "User managing task requests" do
   def long_description_text
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
   end
-
-  def schedule_demo
-    t 'task_requests.splash.actions.book_demo'
-  end
 end

spec/jobs/submit_hubspot_form_job_spec.rb

@@ -11,12 +11,10 @@ RSpec.describe SubmitHubspotFormJob, type: :job do
       allow(Hubspot::Form).to receive(:new).and_return(form)
       allow(form).to receive(:submit).and_return(true)
 
-      SubmitHubspotFormJob.perform_now("John", "Doe", "email@test.com", "My Account")
+      SubmitHubspotFormJob.perform_now("email@test.com", "My Account")
 
       expect(Hubspot::Form).to have_received(:new).with("guid" => "hubspot_form_guid")
       expect(form).to have_received(:submit).with(
-        first_name: "John",
-        last_name: "Doe",
         email: "email@test.com",
         company: "My Account"
       )
@@ -27,11 +25,9 @@ RSpec.describe SubmitHubspotFormJob, type: :job do
       allow(Hubspot::Form).to receive(:new).and_return(form)
       allow(form).to receive(:submit).and_return(true)
 
-      SubmitHubspotFormJob.perform_now("John", "Doe", "email@test.com", "My Account", additional_param_one: "Foo", additional_param_two: "Bar")
+      SubmitHubspotFormJob.perform_now("email@test.com", "My Account", additional_param_one: "Foo", additional_param_two: "Bar")
 
       expect(form).to have_received(:submit).with(
-        first_name: "John",
-        last_name: "Doe",
         email: "email@test.com",
         company: "My Account",
         additional_param_one: "Foo",
@@ -46,7 +42,7 @@ RSpec.describe SubmitHubspotFormJob, type: :job do
         allow(Hubspot::Form).to receive(:new).and_return(form)
         allow(form).to receive(:submit)
 
-        SubmitHubspotFormJob.perform_now("John", "Doe", "email@test.com", "My Account")
+        SubmitHubspotFormJob.perform_now("email@test.com", "My Account")
 
         expect(form).not_to have_received(:submit)
       end