Merge branch 'release/2013-05-27'

Author: Pike

apps/accounts/urls.py

@@ -4,7 +4,7 @@
 
 'Url mappings for accounts app'
 
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 urlpatterns = patterns('accounts.views',
     (r'^login', 'login'),

apps/accounts/views.py

@@ -14,7 +14,11 @@
 from django.utils import simplejson as json
 from django.contrib.auth.views import login as django_login
 from forms import AuthenticationForm
-from lib.auth.backends import AUTHENTICATION_SERVER_ERRORS
+try:
+    from lib.auth.backends import AUTHENTICATION_SERVER_ERRORS
+except ImportError:
+    # we don't have ldap installed, let's not catch any ldap errors
+    AUTHENTICATION_SERVER_ERRORS = tuple()
 from session_csrf import anonymous_csrf
 
 

apps/bugsy/urls.py

@@ -5,7 +5,7 @@
 '''URL mappings for the bugsy application.
 '''
 
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 urlpatterns = patterns('bugsy.views',
     (r'^$', 'index'),

apps/homepage/urls.py

@@ -5,7 +5,7 @@
 '''URL mappings for the l10n_site integration pages.
 '''
 
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 urlpatterns = patterns('homepage.views',
                        (r'^$', 'index'),

apps/l10nstats/urls.py

@@ -5,7 +5,7 @@
 '''URL mappings for l10nstats application.
 '''
 
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 urlpatterns = patterns('l10nstats.views',
     (r'^$', 'index'),

apps/privacy/urls.py

@@ -5,7 +5,7 @@
 '''URL mappings for the privacy app.
 '''
 
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 urlpatterns = patterns('privacy.views',
                        (r'^(?P<id>\d+)?$', 'show_policy'),

apps/pushes/urls.py

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 urlpatterns = patterns('pushes.views',
                        (r'^pushes/(?P<repo_name>.+)?$', 'pushlog'),

apps/shipping/tests/test_signoff.py

@@ -629,8 +629,40 @@ def test_5_pushes_3rd_rejected_4th_pending(self):
             self.av,
             count=1
         )
-        eq_(len(pushes), 3)
+        eq_(len(pushes), 4)
+
+        # the last (aka. first) one should have a signoff with an
+        # action on that is rejected
+        eq_(pushes[-2]['signoffs'][0]['action'].flag, Action.REJECTED)
+
+    def test_5_pushes_1st_pending(self):
+        view = SignoffView()
+        flags, actions = self._get_flags_and_actions()
+
+        # make a pending signoff on the 1st push
+        signoff = Signoff.objects.create(
+            push=self.pushes[0],
+            appversion=self.av,
+            author=self.axel,
+            locale=self.locale,
+        )
+        Action.objects.create(
+            signoff=signoff,
+            flag=Action.PENDING,
+            author=self.peter,
+        )
+
+        flags, actions = self._get_flags_and_actions()
+        pushes, suggested_signoff = view.annotated_pushes(
+            actions,
+            flags,
+            None,  # notice, no fallback
+            self.locale,
+            self.av,
+            count=1
+        )
+        eq_(len(pushes), 5)
 
         # the last (aka. first) one should have a signoff with an
         # action on that is rejected
-        eq_(pushes[-1]['signoffs'][0]['action'].flag, Action.REJECTED)
+        eq_(pushes[-1]['signoffs'][0]['action'].flag, Action.PENDING)

apps/shipping/tests/test_views.py

@@ -556,6 +556,17 @@ def get_query(content):
         eq_(response.status_code, 200)
         eq_(get_query(response.content), 'av=%s' % appver.code)
 
+        appver2 = AppVersion.objects.create(
+          app=appver.app,
+          version='2',
+          code='fx2',
+          codename='foxier'
+        )
+        response = self.client.get(url, {'av': [appver.code, appver2.code]})
+        eq_(response.status_code, 200)
+        eq_(get_query(response.content),
+            'av=%s&av=%s' % (appver.code, appver2.code))
+
         # combine them all
         data = {
           'locale': ['en-US', 'ta'],

apps/shipping/urls.py

@@ -5,7 +5,7 @@
 '''URL mappings for the shipping app.
 '''
 
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 urlpatterns = patterns('shipping.views',
     (r'^/?$', 'index'),