Fix status change free-inapp (bug 892905)

koehlermichael · Jul 12, 2013 · 3f58800 · 3f58800
1 parent ab2da66
commit 3f58800
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/mkt/developers/forms_payments.py b/mkt/developers/forms_payments.py
@@ -278,9 +278,6 @@ def save(self):
                     log.debug('[1@%s] Removing upsell; switching to free '
                               'with in_app' % self.addon.pk)
                     upsell.delete()
-
-                if self.addon.status == amo.STATUS_NULL:
-                    _restore_app(self.addon, save=False)
             else:
                 # The dev is submitting updates for payment data about a paid
                 # app. This might also happen if he/she is associating a new

diff --git a/mkt/developers/tests/test_views_payments.py b/mkt/developers/tests/test_views_payments.py
@@ -384,15 +384,27 @@ def test_made_free_inapp_has_free_selected(self):
         pqr = pq(res.content)
         eq_(pqr('select[name=price] option[selected]').attr('value'), 'free')
 
-    def test_premium_to_free_with_inapp_is_pending(self):
-        self.webapp.update(premium_type=amo.ADDON_PREMIUM,
-                           status=amo.STATUS_NULL,
-                           highest_status=amo.STATUS_PENDING)
+    def test_free_with_inapp_without_account_is_incomplete(self):
+        self.webapp.update(premium_type=amo.ADDON_FREE)
+        # Toggle to paid
+        self.client.post(
+            self.url, self.get_postdata({'toggle-paid': 'paid'}))
         res = self.client.post(
             self.url, self.get_postdata({'price': 'free',
                                          'allow_inapp': 'True'}))
         self.assert3xx(res, self.url)
-        eq_(self.get_webapp().status, amo.STATUS_PENDING)
+        eq_(self.get_webapp().status, amo.STATUS_NULL)
+
+    def test_paid_app_without_account_is_incomplete(self):
+        self.webapp.update(premium_type=amo.ADDON_FREE)
+        # Toggle to paid
+        self.client.post(
+            self.url, self.get_postdata({'toggle-paid': 'paid'}))
+        res = self.client.post(
+            self.url, self.get_postdata({'price': self.price.pk,
+                                         'allow_inapp': 'False'}))
+        self.assert3xx(res, self.url)
+        eq_(self.get_webapp().status, amo.STATUS_NULL)
 
     def test_associate_acct_to_app_free_inapp(self):
         # Set up Solitude return values.