Assorted tidying up

app/helpers/application_helper.rb

@@ -6,7 +6,7 @@ def navigation_items
       {
         text: "External links",
         href: recommended_links_path,
-        active: is_current?(recommended_links_path),
+        active: controller.controller_name == "recommended_links",
       },
       {
         text: current_user.name,
@@ -18,10 +18,4 @@ def navigation_items
       },
     ]
   end
-
-  def is_current?(link)
-    recognized = Rails.application.routes.recognize_path(link)
-    recognized[:controller] == params[:controller] &&
-      recognized[:action] == params[:action]
-  end
 end

app/helpers/forms_helper.rb

@@ -2,15 +2,15 @@ module FormsHelper
   def error_items(record, field)
     return unless record.errors[field].any?
 
-    record.errors[field].map do |error|
-      { text: "#{field.to_s.humanize} #{error}" }
+    record.errors.full_messages_for(field).map do |error|
+      { text: error }
     end
   end
 
   def error_summary_items(record)
     record.errors.map do |error|
       {
-        text: "#{error.attribute.to_s.humanize} #{error.message}",
+        text: error.full_message,
         href: "##{record.class.name.underscore}_#{error.attribute}",
       }
     end

spec/factories.rb

@@ -1,39 +1,4 @@
 FactoryBot.define do
-  sequence :numeric_position do |n|
-    n
-  end
-
-  factory :bet do
-    link { "/death-and-taxes" }
-    expiration_date { Time.zone.now + 1.day }
-
-    trait(:worst) do
-      is_best { false }
-    end
-
-    trait(:best) do
-      is_best { true }
-      position { generate :numeric_position }
-    end
-
-    trait(:permanent) do
-      permanent { true }
-    end
-
-    user
-  end
-
-  factory :query do
-    query { "tax" }
-    match_type { "exact" }
-
-    trait :with_best_bet do
-      after(:create) do |query|
-        create(:bet, :best, query:)
-      end
-    end
-  end
-
   factory :recommended_link do
     title { "Tax online" }
     link { "https://www.tax.service.gov.uk/" }

spec/spec_helper.rb

@@ -31,6 +31,15 @@
 
   config.include FactoryBot::Syntax::Methods
 
+  config.before(:all, type: :system) do
+    @user = create(:user)
+    GDS::SSO.test_user = @user
+  end
+
+  config.after(:all, type: :system) do
+    @user.destroy!
+  end
+
   config.before(:each, type: :system) do
     driven_by :rack_test
   end

spec/system/recommended_links_spec.rb

@@ -1,9 +1,5 @@
 RSpec.describe "Recommended links" do
   before do
-    # TODO: Refactor me out into a support file (once we have more system specs and old
-    # controller specs are gone that this might conflict with)
-    GDS::SSO.test_user = create(:user)
-
     stub_external_content_publisher
   end