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

Commit c829719

Browse files
author
Allen Short
committed
move a couple more things into fireplace/ (bug 875536)
1 parent 1eba6b0 commit c829719

File tree

5 files changed

+35
-3
lines changed

5 files changed

+35
-3
lines changed

mkt/api/resources.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,11 @@ def get_privacy_policy(self, request, **kwargs):
283283
return PrivacyPolicyResource().dispatch('detail', request, **kwargs)
284284

285285

286+
class FireplaceAppResource(AppResource):
287+
class Meta(AppResource.Meta):
288+
pass
289+
290+
286291
class PrivacyPolicyResource(CORSResource, MarketplaceModelResource):
287292

288293
class Meta(MarketplaceResource.Meta):

mkt/api/tests/test_handlers.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def test_upsell(self):
159159
eq_(obj['app_slug'], upsell.app_slug)
160160
eq_(obj['name'], upsell.name)
161161
eq_(obj['icon_url'], upsell.get_icon_url(128))
162-
eq_(obj['resource_uri'], '/api/v1/apps/app/%s/' % upsell.id)
162+
eq_(obj['resource_uri'], self.client.get_absolute_url(get_url('app', pk=upsell.id), absolute=False))
163163

164164
def test_get(self):
165165
self.create_app()
@@ -629,6 +629,15 @@ def fakeauth(auth, req, **kw):
629629
res = self.anon.get(self.get_url)
630630
assert 'user' in res.json
631631

632+
633+
class TestFireplaceAppDetail(BaseOAuth, AMOPaths):
634+
fixtures = fixture('user_2519', 'webapp_337141')
635+
636+
def setUp(self):
637+
super(TestAppDetail, self).setUp(api_name='fireplace')
638+
self.get_url = get_url('app', pk=337141)
639+
640+
632641
class TestCategoryHandler(RestOAuth):
633642

634643
def setUp(self):

mkt/api/urls.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
from mkt.submit.api import PreviewResource, StatusResource, ValidationResource
77
from mkt.api.base import handle_500, SlugRouter
88
from mkt.api.resources import (AppResource, CarrierResource, CategoryViewSet,
9-
ConfigResource, error_reporter, RegionResource)
10-
from mkt.ratings.resources import RatingResource
9+
ConfigResource, FireplaceAppResource,
10+
error_reporter, RegionResource)
11+
from mkt.ratings.resources import FireplaceRatingResource, RatingResource
1112
from mkt.search.api import SearchResource, WithFeaturedResource
1213
from mkt.stats.api import GlobalStatsResource
1314

@@ -22,6 +23,8 @@
2223

2324
fireplace = Api(api_name='fireplace')
2425
fireplace.register(WithFeaturedResource())
26+
fireplace.register(FireplaceAppResource())
27+
fireplace.register(FireplaceRatingResource())
2528

2629
apps = SlugRouter()
2730
apps.register(r'category', CategoryViewSet, base_name='app-category')

mkt/ratings/resources.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,11 @@ def post_flag(self, request, **kwargs):
235235
review_id=kwargs['review_id'])
236236

237237

238+
class FireplaceRatingResource(RatingResource):
239+
class Meta(RatingResource.Meta):
240+
pass
241+
242+
238243
class RatingFlagResource(CORSResource, MarketplaceModelResource):
239244

240245
class Meta(MarketplaceModelResource.Meta):

mkt/ratings/tests/test_resources.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,16 @@ def test_delete_not_there(self):
337337
eq_(res.status_code, 404)
338338

339339

340+
class TestFireplaceRatingResource(BaseOAuth, AMOPaths):
341+
fixtures = fixture('user_2519', 'webapp_337141')
342+
343+
def setUp(self):
344+
super(TestFireplaceRatingResource, self).setUp(api_name='fireplace')
345+
self.app = Webapp.objects.get(pk=337141)
346+
self.user = UserProfile.objects.get(pk=2519)
347+
self.user2 = UserProfile.objects.get(pk=31337)
348+
349+
340350
class TestReviewFlagResource(BaseOAuth, AMOPaths):
341351
fixtures = fixture('user_2519', 'webapp_337141')
342352

0 commit comments

Comments
 (0)