fix(client): Firefox for Android Sync marketing material is only avai…

…lable to desktop sync users. fixes #1041
mozilla · Jun 25, 2014 · c5e62fa · c5e62fa
1 parent 8c0e091
commit c5e62fa
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/app/scripts/views/ready.js b/app/scripts/views/ready.js
@@ -88,21 +88,25 @@ function (_, BaseView, FormView, Template, Session, Xss, Strings, OAuthMixin) {
       return Math.random() <= (surveyPercentage / 100);
     },
 
-    _shouldShowSignUpMarketing: function (showSurvey) {
-      if (! this.is('sign_up') || showSurvey) {
-        return false;
-      }
+    _shouldShowSignUpMarketing: function (isSurveyVisible) {
+      var isSignUp = this.is('sign_up');
+      var isSync = Session.service === 'sync';
+      var isFirefoxMobile = this._isFirefoxMobile();
+
+      return ! isSurveyVisible && isSignUp && isSync && ! isFirefoxMobile;
+    },
 
+    _isFirefoxMobile: function () {
       // For UA information, see
       // https://developer.mozilla.org/docs/Gecko_user_agent_string_reference
 
       var ua = this.window.navigator.userAgent;
 
       // covers both B2G and Firefox for Android
-      var isMobileFirefox = ua.indexOf('Mobile') > -1 && ua.indexOf('Firefox') > -1;
-      var isTabletFirefox = ua.indexOf('Tablet') > -1 && ua.indexOf('Firefox') > -1;
+      var isMobileFirefox = /Mobile/.test(ua) && /Firefox/.test(ua);
+      var isTabletFirefox = /Tablet/.test(ua) && /Firefox/.test(ua);
 
-      return ! (isMobileFirefox || isTabletFirefox);
+      return isMobileFirefox || isTabletFirefox;
     },
 
     afterRender: function() {

diff --git a/app/tests/spec/views/ready.js b/app/tests/spec/views/ready.js
@@ -143,19 +143,33 @@ function (chai, View, Session, WindowMock) {
             });
       });
 
-      it('normally shows sign up marketing material', function () {
+      it('normally shows sign up marketing material to desktop sync users', function () {
         view.type = 'sign_up';
         windowMock.navigator.userAgent = 'Mozilla/5.0 (Windows NT x.y; rv:31.0) Gecko/20100101 Firefox/31.0';
+        Session.set('service', 'sync');
 
         return view.render()
             .then(function () {
+              assert.equal(view.$('.marketing.survey').length, 0);
               assert.equal(view.$('.marketing.default').length, 1);
             });
       });
 
+      it('does not show sign up marketing material to non-sync users', function () {
+        view.type = 'sign_up';
+        windowMock.navigator.userAgent = 'Mozilla/5.0 (Windows NT x.y; rv:31.0) Gecko/20100101 Firefox/31.0';
+
+        return view.render()
+            .then(function () {
+              assert.equal(view.$('.marketing.survey').length, 0);
+              assert.equal(view.$('.marketing.default').length, 0);
+            });
+      });
+
       it('does not show sign up marketing material if on Firefox for Android', function () {
         view.type = 'sign_up';
         windowMock.navigator.userAgent = 'Mozilla/5.0 (Android; Tablet; rv:26.0) Gecko/26.0 Firefox/26.0';
+        Session.set('service', 'sync');
 
         return view.render()
             .then(function () {
@@ -166,6 +180,7 @@ function (chai, View, Session, WindowMock) {
       it('does not show sign up marketing material if on B2G', function () {
         view.type = 'sign_up';
         windowMock.navigator.userAgent = 'Mozilla/5.0 (Mobile; rv:26.0) Gecko/26.0 Firefox/26.0';
+        Session.set('service', 'sync');
 
         return view.render()
             .then(function () {
@@ -186,8 +201,9 @@ function (chai, View, Session, WindowMock) {
             });
       });
 
-      it('still shows default marketing to non-english users', function () {
+      it('still shows default marketing to non-english desktop sync users', function () {
         Session.set('language', 'de');
+        Session.set('service', 'sync');
         createViewWithSurvey();
         view.type = 'sign_up';