Skip to content
This repository was archived by the owner on Mar 15, 2018. It is now read-only.

Commit ac328c0

Browse files
author
Andy McKay
committed
change variable name, string and premium search results (bug 774604)
1 parent ad2a887 commit ac328c0

8 files changed

Lines changed: 16 additions & 28 deletions

File tree

‎apps/addons/models.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,15 +1042,15 @@ def can_become_premium(self):
10421042
and self.type in amo.ADDON_BECOME_PREMIUM)
10431043

10441044
def is_premium(self):
1045-
return self.premium_type == amo.ADDON_PREMIUM
1045+
return self.premium_type in amo.ADDON_PREMIUMS
10461046

10471047
def is_free(self):
10481048
return not (self.is_premium() and self.premium and
10491049
self.premium.has_price())
10501050

10511051
def needs_paypal(self):
10521052
return (self.premium_type not in
1053-
(amo.ADDON_FREE, amo.ADDON_PREMIUM_OTHER))
1053+
(amo.ADDON_FREE, amo.ADDON_OTHER_INAPP))
10541054

10551055
def can_be_purchased(self):
10561056
return self.is_premium() and self.status in amo.REVIEWED_STATUSES

‎apps/addons/tests/test_models.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1890,7 +1890,7 @@ def test_does_not_need_paypal(self):
18901890
assert not self.addon.needs_paypal()
18911891

18921892
def test_other_payments(self):
1893-
self.addon.update(premium_type=amo.ADDON_PREMIUM_OTHER)
1893+
self.addon.update(premium_type=amo.ADDON_OTHER_INAPP)
18941894
assert not self.addon.needs_paypal()
18951895

18961896
def test_needs_paypal(self):

‎apps/constants/base.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,23 +196,25 @@
196196
ADDON_PREMIUM_INAPP = 2
197197
ADDON_FREE_INAPP = 3
198198
# The addon will have payments, but they aren't using our payment system.
199-
ADDON_PREMIUM_OTHER = 4
199+
ADDON_OTHER_INAPP = 4
200200

201201
ADDON_PREMIUM_TYPES = {
202202
ADDON_FREE: _('Free'),
203203
ADDON_PREMIUM: _('Premium'),
204204
ADDON_PREMIUM_INAPP: _('Premium with in-app payments'),
205205
ADDON_FREE_INAPP: _('Free with in-app payments'),
206-
ADDON_PREMIUM_OTHER: _("Premium, but I'll use my own payments system")
206+
ADDON_OTHER_INAPP: _("I'll use my own system for in-app payments")
207207
}
208208

209209
# Non-locale versions for the API.
210210
ADDON_PREMIUM_API = {
211211
ADDON_FREE: 'free',
212212
}
213213

214-
ADDON_PREMIUMS = (ADDON_PREMIUM, ADDON_PREMIUM_INAPP, ADDON_PREMIUM_OTHER)
215-
ADDON_FREES = (ADDON_FREE, ADDON_FREE_INAPP)
214+
# Apps that require some sort of payment prior to installing.
215+
ADDON_PREMIUMS = (ADDON_PREMIUM, ADDON_PREMIUM_INAPP)
216+
# Apps that do *not* require a payment prior to installing.
217+
ADDON_FREES = (ADDON_FREE, ADDON_FREE_INAPP, ADDON_OTHER_INAPP)
216218
ADDON_INAPPS = (ADDON_PREMIUM_INAPP, ADDON_FREE_INAPP)
217219
ADDON_BECOME_PREMIUM = (ADDON_EXTENSION, ADDON_THEME, ADDON_DICT,
218220
ADDON_LPAPP, ADDON_WEBAPP)

‎mkt/developers/tests/test_views.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ def test_admin(self):
880880
eq_(self.client.get(self.url).status_code, 200)
881881

882882
def test_not_premium(self):
883-
for status in [amo.ADDON_FREE, amo.ADDON_PREMIUM_OTHER]:
883+
for status in [amo.ADDON_FREE, amo.ADDON_OTHER_INAPP]:
884884
self.webapp.update(premium_type=status)
885885
r = self.client.get(self.url)
886886
eq_(r.status_code, 200)

‎mkt/receipts/tests/test_verify.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ def test_premium_addon_refund(self):
228228

229229
def test_other_premiums(self):
230230
for k in (amo.ADDON_FREE, amo.ADDON_PREMIUM_INAPP,
231-
amo.ADDON_FREE_INAPP, amo.ADDON_PREMIUM_OTHER):
231+
amo.ADDON_FREE_INAPP, amo.ADDON_OTHER_INAPP):
232232
Installed.objects.all().delete()
233233
self.addon.update(premium_type=k)
234234
self.make_install()

‎mkt/receipts/tests/test_views.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def test_paid(self, has_purchased):
107107
eq_(self.client.post(self.url).status_code, 200)
108108

109109
def test_own_payments(self):
110-
self.addon.update(premium_type=amo.ADDON_PREMIUM_OTHER)
110+
self.addon.update(premium_type=amo.ADDON_OTHER_INAPP)
111111
eq_(self.client.post(self.url).status_code, 200)
112112

113113
@mock.patch('mkt.webapps.models.Webapp.has_purchased')

‎mkt/search/tests/test_views.py‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ def test_page(self):
7575
eq_(r.status_code, 200)
7676
self.assertTemplateUsed(r, 'search/results.html')
7777

78-
7978
def test_case_insensitive(self):
8079
self.refresh()
8180
self.check_results({'q': 'steam'}, [self.webapp.pk])
@@ -178,29 +177,16 @@ def test_free_and_inapp_only(self):
178177
eq_(self.check_price_filter('free', 'Free Only',
179178
amo.ADDON_FREE_INAPP), self.free)
180179

181-
def test_free_and_premium_other(self):
182-
eq_(self.check_price_filter('', 'Any Price', amo.ADDON_PREMIUM_OTHER),
183-
self.both)
184-
185180
def test_premium_only(self):
186181
eq_(self.check_price_filter('paid', 'Premium Only'), self.paid)
187182

188183
def test_premium_inapp_only(self):
189184
eq_(self.check_price_filter('paid', 'Premium Only',
190185
amo.ADDON_PREMIUM_INAPP), self.paid)
191186

192-
def test_premium_other(self):
193-
eq_(self.check_price_filter('paid', 'Premium Only',
194-
amo.ADDON_PREMIUM_OTHER), self.paid)
195-
196-
def test_premium_other_zero(self):
197-
price = Price.objects.create(price=0)
198-
app = amo.tests.app_factory(weekly_downloads=1)
199-
AddonPremium.objects.create(price=price, addon=app)
200-
app.update(premium_type=amo.ADDON_PREMIUM_OTHER)
201-
eq_(self.check_price_filter('paid', 'Premium Only',
202-
amo.ADDON_PREMIUM_OTHER),
203-
self.paid + [app])
187+
def test_free_other(self):
188+
eq_(self.check_price_filter('free', 'Free Only',
189+
amo.ADDON_OTHER_INAPP), self.free)
204190

205191
def setup_devices(self):
206192
self._generate(3)

‎mkt/submit/tests/test_views.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ def test_free_inapp(self):
834834

835835
def test_premium_other(self):
836836
res = self.client.post(self.get_url('payments'),
837-
{'premium_type': amo.ADDON_PREMIUM_OTHER})
837+
{'premium_type': amo.ADDON_OTHER_INAPP})
838838
eq_(res.status_code, 302)
839839
self.assertRedirects(res, self.get_url('done'))
840840

0 commit comments

Comments
 (0)