From dd78d1fe7fdb58e63e04e772b1f3b1c818a7ba3a Mon Sep 17 00:00:00 2001
From: Will Barton <william.barton@cfpb.gov>
Date: Wed, 24 May 2017 11:53:38 -0400
Subject: [PATCH] Remove feature flag for landing page

---
 complaintdatabase/tests.py | 8 ++------
 complaintdatabase/views.py | 7 +------
 setup.py                   | 2 +-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/complaintdatabase/tests.py b/complaintdatabase/tests.py
index b9b7f53..5ec442c 100644
--- a/complaintdatabase/tests.py
+++ b/complaintdatabase/tests.py
@@ -25,10 +25,8 @@ def setUp(self):
         """Every test needs access to the request factory."""
         self.factory = RequestFactory()
 
-    @patch('complaintdatabase.views.flag_enabled')
-    def test_get_context_data_exist(self, mock_flag_enabled):
+    def test_get_context_data_exist(self):
         """Create an instance of a GET request."""
-        mock_flag_enabled.return_value = True
         request = self.factory.get('/')
         response = LandingView.as_view()(request)
         self.assertEqual(response.status_code, 200)
@@ -40,10 +38,8 @@ def test_get_context_data_exist(self, mock_flag_enabled):
 
     @skipIf(not getattr(settings, 'STANDALONE', 'False'),
             "not running standlone")
-    @patch('complaintdatabase.views.flag_enabled')
-    def test_demo_json(self, mock_flag_enabled):
+    def test_demo_json(self):
         """Test demo version of landing page"""
-        mock_flag_enabled.return_value = True
         response = client.get(reverse("ccdb-demo",
                                       kwargs={'demo_json': 'demo.json'}))
         self.assertEqual(response.status_code, 200)
diff --git a/complaintdatabase/views.py b/complaintdatabase/views.py
index 356b80d..788ec07 100644
--- a/complaintdatabase/views.py
+++ b/complaintdatabase/views.py
@@ -5,8 +5,6 @@
 from django.views.generic import View, TemplateView
 from django.conf import settings
 
-from flags.template_functions import flag_enabled
-
 try:
     STANDALONE = settings.STANDALONE
 except:  # pragma: no cover
@@ -30,10 +28,7 @@ class LandingView(TemplateView):
 
     @property
     def template_name(self):
-        if flag_enabled(self.request, 'MOSAIC_CCDB'):
-            return "landing-page.html"
-        else:
-            return "landing-page-original.html"
+        return "landing-page.html"
 
     def get_context_data(self, **kwargs):
         context = super(LandingView, self).get_context_data(**kwargs)
diff --git a/setup.py b/setup.py
index 3ac1df0..19075b6 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ def read_file(filename):
 
 setup(
     name='complaintdatabase',
-    version='1.2.9',
+    version='1.3.3',
     author='CFPB',
     author_email='tech@cfpb.gov',
     maintainer='cfpb',