Allow MAP_TYPE to be overridden by tests

2 files changed, 14 insertions, 1 deletions

diff --git a/perllib/FixMyStreet.pm b/perllib/FixMyStreet.pm
index 76760b967..76befb96a 100644
--- a/perllib/FixMyStreet.pm
+++ b/perllib/FixMyStreet.pm
@@ -124,11 +124,14 @@ sub override_config($&) {
         }
     );
 
+    FixMyStreet::Map::reload_allowed_maps() if $config->{MAP_TYPE};
+
     $code->();
 
     $override_guard1->restore();
     $override_guard2->restore();
-    mySociety::MaPit::configure() if $config->{MAPIT_URL};;
+    mySociety::MaPit::configure() if $config->{MAPIT_URL};
+    FixMyStreet::Map::reload_allowed_maps() if $config->{MAP_TYPE};
 }
 
 =head2 dbic_connect_info
diff --git a/perllib/FixMyStreet/Map.pm b/perllib/FixMyStreet/Map.pm
index b050592ba..81b81f656 100644
--- a/perllib/FixMyStreet/Map.pm
+++ b/perllib/FixMyStreet/Map.pm
@@ -35,6 +35,16 @@ sub allowed_maps {
     return grep { $avail{$_} } @allowed;
 }
 
+=head2 reload_allowed_maps
+
+Allows tests to override MAP_TYPE at run time.
+
+=cut
+
+sub reload_allowed_maps {
+    @ALL_MAP_CLASSES = allowed_maps();
+}
+
 =head2 map_class
 
 Set and return the appropriate class given a query parameter string.