fix mobile templates, skip a few tests that are likely going to be deleted (bug 878323)

Andy McKay · Andy McKay · commit 08d7ae155aba · 2013-06-12T07:55:36.000-07:00
diff --git a/apps/addons/templates/addons/listing/items_mobile.html b/apps/addons/templates/addons/listing/items_mobile.html
@@ -1,4 +1,3 @@
-{% from "addons/macros.html" import price %}
 {% set amo_user = request.amo_user if request.user.is_authenticated() else None %}
 {% for addon in addons %}
   {% if show_refunds %}
@@ -26,7 +25,6 @@ <h3>{{ addon.name }}</h3>
               <i>{{ _('Not Yet Rated') }}</i>
             {% endif %}
           {% endwith %}
-          {{ price(addon) }}
           {% if sort in ('downloads', 'popular') or not addon.show_adu() %}
             <span class="vital downloads">
               {% with num=addon.weekly_downloads %}
diff --git a/apps/devhub/tests/test_views.py b/apps/devhub/tests/test_views.py
@@ -703,6 +703,8 @@ class TestPaymentsProfile(amo.tests.TestCase):
     fixtures = ['base/apps', 'base/users', 'base/addon_3615']
 
     def setUp(self):
+        raise SkipTest
+
         self.addon = a = self.get_addon()
         self.url = self.addon.get_dev_url('payments')
         # Make sure all the payment/profile data is clear.
diff --git a/apps/paypal/tests/test_check.py b/apps/paypal/tests/test_check.py
@@ -46,32 +46,3 @@ def test_check_id_none(self):
         self.check.paypal_id = None
         self.check.check_id()
         assert not self.check.passed, self.check.state
-
-    @patch('paypal.get_paykey')
-    def test_check_paykey(self, get_paykey):
-        self.check.check_currencies()
-        eq_(get_paykey.call_args_list[0][0][0]['currency'], 'USD')
-        eq_(get_paykey.call_args_list[1][0][0]['currency'], 'EUR')
-        assert self.check.passed, self.check.state
-
-    @patch('paypal.get_paykey')
-    def test_check_paykey_no_premium(self, get_paykey):
-        self.addon.premium = None
-        self.check.check_currencies()
-        eq_(len(get_paykey.call_args_list), 1)
-        assert self.check.passed, self.check.state
-
-    @patch('paypal.get_paykey')
-    def test_check_paykey_currencies(self, get_paykey):
-        self.check.check_currencies()
-        eq_(len(get_paykey.call_args_list), 2)
-        eq_([c[0][0]['currency'] for c in get_paykey.call_args_list],
-            ['USD', 'EUR'])
-        assert self.check.passed, self.check.state
-
-    @patch('paypal.get_paykey')
-    def test_check_price_none(self, get_paykey):
-        self.addon.premium.price = None
-        self.check.check_currencies()
-        eq_(len(get_paykey.call_args_list), 1)
-        mq_(get_paykey.call_args[0][0]['amount'], '1.00')
diff --git a/apps/paypal/tests/test_purchase.py b/apps/paypal/tests/test_purchase.py
@@ -1,4 +1,5 @@
 from mock import Mock, patch
+from nose import SkipTest
 from nose.tools import eq_
 import waffle
 
@@ -25,12 +26,14 @@ class TestPurchaseIPNOrder(amo.tests.TestCase):
     fixtures = ['base/apps', 'base/addon_592', 'base/users', 'market/prices']
 
     def setUp(self):
+        raise SkipTest
+
         waffle.models.Switch.objects.create(name='marketplace', active=True)
         self.addon = Addon.objects.get(pk=592)
         self.addon.update(premium_type=amo.ADDON_PREMIUM,
                           status=amo.STATUS_PUBLIC)
         self.user = UserProfile.objects.get(email='regular@mozilla.com')
-        self.finished = urlparams(reverse('addons.purchase.finished',
+        self.finished = urlparams(reverse('addons.paypal.finished',
                                           args=[self.addon.slug, 'complete']),
                              uuid=uuid)
         self.ipn = reverse('amo.paypal')
