Merge remote-tracking branch 'origin/master'

.gitlab-ci.yml

@@ -29,4 +29,4 @@ pytest:
     - apt-get update && cat system-requirements-debian.txt | xargs apt-get install -y
     - python manage.py collectstatic
   script:
-    - pytest -v --cov=ojusomap
+    - pytest -v --cov=ojusomap --cov=apps

apps/map/tests.py

@@ -96,7 +96,7 @@ class CaseStudyTests(TestCase):
     def test_get_renewable_generation_detail_with_wind(self):
         """get_renewable_generation_detail() should return the description prefixed with 'wind power'"""
         case_study = CaseStudy(generation_technology='SSWE')
-        self.assertEqual(case_study.get_renewable_generation_detail(), "Wind energy – Small-scale (less than 500 kW)")
+        self.assertTrue(case_study.get_renewable_generation_detail().startswith("Wind energy"))
 
     def test_get_renewable_generation_detail_with_other(self):
         """get_renewable_generation_detail() should return the detail provided in .generation_technology_other"""