-
<%= project.summary_label(:urgency_title) %>
+ <%= project.summary_label(:urgency_title) %>
<% unless project.archived? %>
diff --git a/lib/pafs_core/calculator_maps/base.rb b/lib/pafs_core/calculator_maps/base.rb
index a755114dd..f27f54c2c 100644
--- a/lib/pafs_core/calculator_maps/base.rb
+++ b/lib/pafs_core/calculator_maps/base.rb
@@ -10,7 +10,7 @@ def initialize(sheet)
end
def data
- raise "Override #data in subclass"
+ raise NotImplementedError, "Override #data in subclass"
end
def binary_value?(value)
diff --git a/lib/pafs_core/carbon.rb b/lib/pafs_core/carbon.rb
index 9c0e0da5b..7d473538b 100644
--- a/lib/pafs_core/carbon.rb
+++ b/lib/pafs_core/carbon.rb
@@ -17,9 +17,7 @@ def carbon_required_information_present?
]
# check required fields
- required.each do |field_name|
- return false if project.send(field_name).nil?
- end
+ return false unless required.all? { |field_name| project.send(field_name).present? }
# check funding sources
return false unless PafsCore::ValidationPresenter.new(project).funding_sources_complete?
diff --git a/lib/pafs_core/errors.rb b/lib/pafs_core/errors.rb
index 20fd3060b..db8484305 100644
--- a/lib/pafs_core/errors.rb
+++ b/lib/pafs_core/errors.rb
@@ -22,4 +22,25 @@ class FileNotFoundError < RuntimeError
class MapServiceError < RuntimeError
end
+
+ class AreaImportError < StandardError
+ end
+
+ class AreaParentError < StandardError
+ end
+
+ class InvalidFileTypeError < StandardError
+ end
+
+ class CalculatorSheetNotFoundError < StandardError
+ end
+
+ class MissingRfccAreaCodeError < StandardError
+ end
+
+ class RisksNotSetError < StandardError
+ end
+
+ class SpreadsheetProcessingError < StandardError
+ end
end
diff --git a/lib/pafs_core/funding_calculator_version.rb b/lib/pafs_core/funding_calculator_version.rb
index 86349f51f..dabf4b3fa 100644
--- a/lib/pafs_core/funding_calculator_version.rb
+++ b/lib/pafs_core/funding_calculator_version.rb
@@ -21,11 +21,11 @@ def initialize(sheet)
end
def calculator_version
- VERSION_MAP.each do |k, v|
- return k if sheet.cell(v[:column], v[:row]).to_s.match(v[:version_text])
+ version_entry = VERSION_MAP.find do |_k, v|
+ sheet.cell(v[:column], v[:row]).to_s.match(v[:version_text])
end
- nil
+ version_entry&.first
end
end
diff --git a/lib/pafs_core/funding_sources.rb b/lib/pafs_core/funding_sources.rb
index ec320448e..b77486fa5 100644
--- a/lib/pafs_core/funding_sources.rb
+++ b/lib/pafs_core/funding_sources.rb
@@ -43,11 +43,11 @@ module FundingSources
end
def current_funding_values
- funding_values.select { |fv| fv.financial_year <= project_end_financial_year }.sort_by(&:financial_year)
# if this is a db query we lose inputted data when there are errors
# and we send the user back to fix it
# It also breaks validating that every column has at least one value overall
# funding_values.to_financial_year(project_end_financial_year)
+ funding_values.select { |fv| fv.financial_year <= project_end_financial_year }.sort_by(&:financial_year)
end
def selected_funding_sources
diff --git a/lib/pafs_core/mapper/funding_calculator_maps/base.rb b/lib/pafs_core/mapper/funding_calculator_maps/base.rb
index 82bf1e962..2a2ce11a3 100644
--- a/lib/pafs_core/mapper/funding_calculator_maps/base.rb
+++ b/lib/pafs_core/mapper/funding_calculator_maps/base.rb
@@ -11,7 +11,7 @@ def initialize(sheet)
end
def extract_data
- raise "Override #extract_data"
+ raise NotImplementedError, "Override #extract_data"
end
end
end
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
index 0deac6d62..aeff99c58 100644
--- a/spec/dummy/config/application.rb
+++ b/spec/dummy/config/application.rb
@@ -11,9 +11,9 @@
require "action_view/railtie"
require "sprockets/railtie"
# require "rails/test_unit/railtie"
+require "pafs_core"
Bundler.require(*Rails.groups)
-require "pafs_core"
module Dummy
class Application < Rails::Application
diff --git a/spec/dummy/config/boot.rb b/spec/dummy/config/boot.rb
index 59459d4ae..2bb3ccd80 100644
--- a/spec/dummy/config/boot.rb
+++ b/spec/dummy/config/boot.rb
@@ -1,7 +1,8 @@
# frozen_string_literal: true
+require "bundler/setup"
+
# Set up gems listed in the Gemfile.
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__)
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
$LOAD_PATH.unshift File.expand_path("../../../lib", __dir__)
diff --git a/spec/dummy/config/environments/production.rb b/spec/dummy/config/environments/production.rb
index b24adff1f..a7e12e855 100644
--- a/spec/dummy/config/environments/production.rb
+++ b/spec/dummy/config/environments/production.rb
@@ -24,7 +24,7 @@
# Disable serving static files from the `/public` folder by default since
# Apache or NGINX already handles this.
- config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
+ config.public_file_server.enabled = ENV.fetch("RAILS_SERVE_STATIC_FILES", nil).present?
# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier
diff --git a/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb
index e63a3d12f..87267c970 100644
--- a/spec/dummy/config/routes.rb
+++ b/spec/dummy/config/routes.rb
@@ -1,5 +1,6 @@
# frozen_string_literal: true
Rails.application.routes.draw do
+ root to: redirect("/pafs")
mount PafsCore::Engine => "/pafs"
end
diff --git a/spec/fixtures/areas/bad_headers.csv b/spec/fixtures/areas/bad_headers.csv
new file mode 100644
index 000000000..be98cd27d
--- /dev/null
+++ b/spec/fixtures/areas/bad_headers.csv
@@ -0,0 +1,2 @@
+area_name,"parent area","type","sub type"
+England,,Country,
diff --git a/spec/lib/tasks/pafs_core_tasks_spec.rb b/spec/lib/tasks/pafs_core_tasks_spec.rb
index 96829a8fd..4847aacc9 100644
--- a/spec/lib/tasks/pafs_core_tasks_spec.rb
+++ b/spec/lib/tasks/pafs_core_tasks_spec.rb
@@ -7,16 +7,15 @@
include_context "rake"
- original_stdout = $stdout
-
before do
# suppress noisy outputs during unit test
+ @original_stdout = $stdout
$stdout = StringIO.new
create(:full_project)
end
- after { $stdout = original_stdout }
+ after { $stdout = @original_stdout }
describe "pafs:bulk_export_to_pol" do
it { expect { Rake::Task["pafs:bulk_export_to_pol"].invoke }.not_to raise_error }
diff --git a/spec/models/pafs_core/area_spec.rb b/spec/models/pafs_core/area_spec.rb
index 636a86ca4..03df7555a 100644
--- a/spec/models/pafs_core/area_spec.rb
+++ b/spec/models/pafs_core/area_spec.rb
@@ -4,27 +4,30 @@
RSpec.describe PafsCore::Area do
describe "attributes" do
- area_levels = [
- {
- level: :country,
- parent_id: nil
- },
- {
- level: :ea_area,
- parent_id: 1
- },
- {
- level: :pso_area,
- parent_id: 1
- },
- {
- level: :rma_area,
- parent_id: 1
- }
- ]
- area = area_levels.sample
subject { create(area[:level], parent_id: area[:parent_id]) }
+ let(:area_levels) do
+ [
+ {
+ level: :country,
+ parent_id: nil
+ },
+ {
+ level: :ea_area,
+ parent_id: 1
+ },
+ {
+ level: :pso_area,
+ parent_id: 1
+ },
+ {
+ level: :rma_area,
+ parent_id: 1
+ }
+ ]
+ end
+ let(:area) { area_levels.sample }
+
it { is_expected.to validate_presence_of :name }
it { is_expected.to validate_presence_of :area_type }
it { is_expected.to validate_inclusion_of(:area_type).in_array(PafsCore::Area::AREA_TYPES) }
diff --git a/spec/presenters/pafs_core/project_summary_presenter_spec.rb b/spec/presenters/pafs_core/project_summary_presenter_spec.rb
index d1db39692..c9ba19d9b 100644
--- a/spec/presenters/pafs_core/project_summary_presenter_spec.rb
+++ b/spec/presenters/pafs_core/project_summary_presenter_spec.rb
@@ -257,7 +257,7 @@
context "when the project does not protect against coastal erosion" do
it "raises an error" do
expect { subject.standard_of_protection_step }
- .to raise_error(RuntimeError, "Risks not set prior to standard of protection")
+ .to raise_error(PafsCore::RisksNotSetError, "Risks not set prior to standard of protection")
end
end
end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index bf86779f8..f505d8f5f 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -4,10 +4,6 @@
require "spec_helper"
ENV["RAILS_ENV"] ||= "test"
require File.expand_path("dummy/config/environment", __dir__)
-
-# Prevent database truncation if the environment is production
-abort("The Rails environment is running in production mode!") if Rails.env.production?
-
require "rspec/rails"
# require "capybara/rspec"
require "factory_bot_rails"
@@ -15,6 +11,9 @@
require "vcr"
require "webmock/rspec"
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+
Rails.backtrace_cleaner.remove_silencers!
# Add additional requires below this line. Rails is not loaded until this point!
diff --git a/spec/services/pafs_core/area_importer_spec.rb b/spec/services/pafs_core/area_importer_spec.rb
index 56b1244ff..28d440b3a 100644
--- a/spec/services/pafs_core/area_importer_spec.rb
+++ b/spec/services/pafs_core/area_importer_spec.rb
@@ -11,11 +11,38 @@
expect(areas.size).to eq(4)
end
- it "does not import faulty data" do
- file_path = Rails.root.join("../fixtures/areas/faulty_areas_data.csv")
- described_class.new.full_import(file_path)
- areas = PafsCore::Area.all
- expect(areas.size).to eq(3)
+ describe "does not import faulty data" do
+ context "when CSV headers are incorrect" do
+ let(:file_path) { Rails.root.join("../fixtures/areas/bad_headers.csv") }
+
+ it "raises an AreaImportError" do
+ expect do
+ described_class.new.full_import(file_path)
+ end.to raise_error(PafsCore::AreaImportError, "Headers incorrect.")
+ end
+ end
+
+ context "when areas already exist" do
+ let(:file_path) { Rails.root.join("../fixtures/areas/areas.csv") }
+
+ before { described_class.new.full_import(file_path) }
+
+ it "raises an AreaImportError" do
+ expect do
+ described_class.new.full_import(file_path)
+ end.to raise_error(PafsCore::AreaImportError, "Areas already exist")
+ end
+ end
+
+ context "when areas data is faulty" do
+ let(:file_path) { Rails.root.join("../fixtures/areas/faulty_areas_data.csv") }
+
+ it "does not import faulty data" do
+ described_class.new.full_import(file_path)
+ areas = PafsCore::Area.all
+ expect(areas.size).to eq(3)
+ end
+ end
end
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a898c9351..3a6c20bec 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,7 @@
# Require and run our simplecov initializer as the very first thing we do.
# This is as per its docs https://github.com/colszowka/simplecov#getting-started
-require "./spec/support/simplecov"
+require_relative "support/simplecov"
require "rspec/retry"
# This file was generated by the `rails generate rspec:install` command. Conventionally, all