From 3f6af54fe1a517b97082cd906c4d5a97f2474dc1 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 2 Oct 2019 14:28:18 +1000
Subject: [PATCH] DEV: minor fixes related to zeitwerk

A couple of specs stopped working post zeitwerk. Adding missing require
corrected inheritance to avoid a circular ref.
---
 app/controllers/tags_controller.rb               | 2 ++
 lib/import_export/category_structure_exporter.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index edf64024396..91439d66d1e 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -120,6 +120,8 @@ class TagsController < ::ApplicationController
   end
 
   def upload
+    require 'csv'
+
     guardian.ensure_can_admin_tags!
 
     file = params[:file] || params[:files].first
diff --git a/lib/import_export/category_structure_exporter.rb b/lib/import_export/category_structure_exporter.rb
index e3b1773cdb4..aa9e50c983e 100644
--- a/lib/import_export/category_structure_exporter.rb
+++ b/lib/import_export/category_structure_exporter.rb
@@ -3,7 +3,7 @@
 require "import_export/base_exporter"
 
 module ImportExport
-  class CategoryStructureExporter < ImportExport::BaseExporter
+  class CategoryStructureExporter < BaseExporter
 
     def initialize(include_group_users = false)
       @include_group_users = include_group_users