Merge branch 'qa'

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-- 2.5.3
+- 2.7.6
 services:
   - mysql
 branches:

Gemfile

@@ -14,7 +14,7 @@ gem 'active_record-acts_as', git: 'https://github.com/camsys/active_record-acts_
 
 # To use debugger
 # gem 'debugger'
-gem 'transam_core', git: 'https://github.com/camsys/transam_core', branch: :master
+gem 'transam_core', git: 'https://github.com/camsys/transam_core', branch: :qa
 gem 'mysql2', "~> 0.5.1" # lock gem for dummy app
 gem "capybara", '2.6.2' # lock gem for old capybara behavior on hidden element xpath
 gem 'sass-rails'

app/jobs/audit_update_job.rb

@@ -15,7 +15,7 @@ def run
     audit.auditor.audit
 
     event_url = Rails.application.routes.url_helpers.audit_results_path
-    audit_notification = Notification.create(text: "#{audit.name} has been run with new Data Update Start Date and End Date.", link: event_url)
+    audit_notification = Notification.create(text: "#{audit.name} has been run with new Date of Report Range Start Date and Date of Report Range End Date.", link: event_url)
     UserNotification.create(user: creator, notification: audit_notification)
 
   end

app/views/audits/_audit_activity_form.html.haml

@@ -4,13 +4,13 @@
     .row
       .col-sm-3
         = hidden_field_tag(:old_activity_start_date, format_as_date(i_f.object.start_date))
-        = i_f.input :start_date, :label => 'Audit Activity Start Date', :wrapper => :vertical_append do
+        = i_f.input :start_date, :label => 'CPT Audit Process Activity Start Date', :wrapper => :vertical_append do
           = i_f.input_field :start_date, :class => "form-control datepicker", :as => :string, :data => {'date-container' => '#page'}, :value => format_as_date(i_f.object.start_date)
           %span.input-group-addon
             %i.fa.fa-calendar
       .col-sm-3
         = hidden_field_tag(:old_activity_end_date, format_as_date(i_f.object.end_date))
-        = i_f.input :end_date, :label => 'Audit Activity End Date', :wrapper => :vertical_append do
+        = i_f.input :end_date, :label => 'CPT Audit Process Activity End Date', :wrapper => :vertical_append do
           = i_f.input_field :end_date, :class => "form-control datepicker", :as => :string, :data => {'date-container' => '#page'}, :value => format_as_date(i_f.object.end_date)
           %span.input-group-addon
             %i.fa.fa-calendar

app/views/audits/_form.html.haml

@@ -33,13 +33,13 @@
   .row
     .col-sm-4
       = hidden_field_tag(:old_start_date, format_as_date(f.object.start_date))
-      = f.input :start_date, :wrapper => :vertical_append, :label => "Data Update Start Date" do
+      = f.input :start_date, :wrapper => :vertical_append, :label => "Date of Report Range Start Date" do
         = f.input_field :start_date, :as => :string, :class => 'form-control datepicker', :data => {'date-container' => '#page'}, :value => format_as_date(f.object.start_date)
         %span.input-group-addon
           %i.fa.fa-calendar
     .col-sm-4
       = hidden_field_tag(:old_end_date, format_as_date(f.object.end_date))
-      = f.input :end_date, :wrapper => :vertical_append, :label => "Data Update End Date" do
+      = f.input :end_date, :wrapper => :vertical_append, :label => "Date of Report Range End Date" do
         = f.input_field :end_date, :as => :string, :class => 'form-control datepicker', :data => {'date-container' => '#page'}, :value => format_as_date(f.object.end_date)
         %span.input-group-addon
           %i.fa.fa-calendar

app/views/audits/_summary.html.haml

@@ -4,12 +4,12 @@
   = format_field("Auditor", audit.auditor_class_name)
   %hr
   = format_field("Active", format_as_boolean(audit.active))
-  = format_field("Data Update Start Date", format_as_date(audit.start_date))
-  = format_field("Data Update End Date", format_as_date(audit.end_date))
+  = format_field("Date of Report Range Start Date", format_as_date(audit.start_date))
+  = format_field("Date of Report Range End Date", format_as_date(audit.end_date))
   %hr
   = format_field("Operational", format_as_boolean(audit.operational?))
-  = format_field("Audit Activity Start Date", format_as_date(audit.activity.start_date))
-  = format_field("Audit Activity End Date", format_as_date(audit.activity.end_date))
+  = format_field("CPT Audit Process Activity Start Date", format_as_date(audit.activity.start_date))
+  = format_field("CPT Audit Process Activity End Date", format_as_date(audit.activity.end_date))
   %hr
   = format_field("Last Run", format_as_date(audit.last_run))
   = format_field("Created On", format_as_date(audit.created_at))

lib/transam_audit/version.rb

@@ -1,3 +1,3 @@
 module TransamAudit
-  VERSION = "2.17.0"
+  VERSION = "2.38.0"
 end

spec/dummy/config/environments/test.rb

@@ -38,4 +38,7 @@
   ENV["SYSTEM_SEND_FROM_ADDRESS"] = "[email protected]"
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  # Required for aws-sdk-core
+  ENV["AWS_REGION"] = "us-east-1"
 end