[bug 1392860] Remove /firstrun membership experiment

alexgibson · Nov 6, 2017 · 0e74e9f · 0e74e9f
1 parent 5ef356d
commit 0e74e9f
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 644 deletions.
diff --git a/bedrock/firefox/templates/firefox/firstrun/index.html b/bedrock/firefox/templates/firefox/firstrun/index.html
@@ -16,12 +16,6 @@
   {% stylesheet 'firefox_firstrun' %}
 {% endblock %}
 
-{% block experiments %}
-  {% if switch('experiment-firstrun-membership', ['en-US']) %}
-    {% javascript 'experiment-firstrun-membership' %}
-  {% endif %}
-{% endblock %}
-
 {% block js %}
   {% javascript 'firefox_firstrun' %}
 {% endblock %}

diff --git a/bedrock/firefox/templates/firefox/firstrun/membership-a.html b/bedrock/firefox/templates/firefox/firstrun/membership-a.html
diff --git a/bedrock/firefox/templates/firefox/firstrun/membership-b.html b/bedrock/firefox/templates/firefox/firstrun/membership-b.html
diff --git a/bedrock/firefox/tests/test_base.py b/bedrock/firefox/tests/test_base.py
@@ -366,35 +366,6 @@ def test_fx_firstrun_57_0(self, render_mock):
         template = render_mock.call_args[0][1]
         eq_(template, ['firefox/developer-quantum-firstrun.html'])
 
-    # start membership experiment tests (bug 1392860)
-
-    @override_settings(DEV=True)
-    def test_fx_membership_a_56_0(self, render_mock):
-        """Should use membership-a template as control"""
-        req = self.rf.get('/en-US/firefox/firstrun/?v=a')
-        self.view(req, version='56.0')
-        template = render_mock.call_args[0][1]
-        eq_(template, ['firefox/firstrun/membership-a.html'])
-
-    @override_settings(DEV=True)
-    def test_fx_membership_b_56_0(self, render_mock):
-        """Should use membership-b template for experiment"""
-        req = self.rf.get('/en-US/firefox/firstrun/?v=b')
-        self.view(req, version='56.0')
-        template = render_mock.call_args[0][1]
-        eq_(template, ['firefox/firstrun/membership-b.html'])
-
-    @override_settings(DEV=True)
-    def test_fx_membership_locales_56_0(self, render_mock):
-        """Should use regular firstrun template for other locales"""
-        req = self.rf.get('/firefox/firstrun/?v=b')
-        req.locale = 'de'
-        self.view(req, version='56.0')
-        template = render_mock.call_args[0][1]
-        eq_(template, ['firefox/firstrun/index.html'])
-
-    # end membership experiment tests (bug 1392860)
-
     # start cliqz funnelcake tests (bug 1392855)
 
     @override_settings(DEV=True)

diff --git a/bedrock/firefox/views.py b/bedrock/firefox/views.py
@@ -406,7 +406,6 @@ def get_context_data(self, **kwargs):
     def get_template_names(self):
         locale = l10n_utils.get_locale(self.request)
         version = self.kwargs.get('version') or ''
-        exp = self.request.GET.get('v')
         f = self.request.GET.get('f', None)
 
         if detect_channel(version) == 'alpha':
@@ -418,10 +417,7 @@ def get_template_names(self):
         elif show_56_cliqz_firstrun(locale, version, f):
             template = 'firefox/firstrun/cliqz-funnelcake-119-122.html'
         elif show_40_firstrun(version):
-            if locale == 'en-US' and exp in ['a', 'b']:
-                template = 'firefox/firstrun/membership-{0}.html'.format(exp)
-            else:
-                template = 'firefox/firstrun/index.html'
+            template = 'firefox/firstrun/index.html'
         elif show_38_0_5_firstrun(version):
             template = 'firefox/australis/fx38_0_5/firstrun.html'
         else:

diff --git a/bedrock/settings/static_media.py b/bedrock/settings/static_media.py
@@ -396,13 +396,6 @@
         ),
         'output_filename': 'css/firefox_firstrun-bundle.css',
     },
-    'firefox_firstrun_membership': {
-        'source_filenames': (
-            'css/firefox/firstrun/membership.less',
-            'css/base/mozilla-fxa-iframe.less',
-        ),
-        'output_filename': 'css/firefox_firstrun_membership-bundle.css',
-    },
     'firefox_firstrun_cliqz_funnelcake': {
         'source_filenames': (
             'css/firefox/firstrun/firstrun-cliqz-funnelcake.less',
@@ -1308,21 +1301,6 @@
         ),
         'output_filename': 'js/firefox_firstrun-bundle.js',
     },
-    'experiment-firstrun-membership': {
-        'source_filenames': (
-            'js/base/mozilla-traffic-cop.js',
-            'js/firefox/firstrun/experiment-firstrun-membership.js',
-        ),
-        'output_filename': 'js/experiment-firstrun-copy.js',
-    },
-    'firefox_firstrun_membership': {
-        'source_filenames': (
-            'js/libs/jquery.cycle2.min.js',
-            'js/base/mozilla-fxa-iframe.js',
-            'js/firefox/firstrun/membership.js',
-        ),
-        'output_filename': 'js/firefox_firstrun_membership-bundle.js',
-    },
     'firefox_firstrun_cliqz_funnelcake': {
         'source_filenames': (
             'js/firefox/firstrun/firstrun-cliqz-funnelcake.js',