1
=== modified file 'lib/lp/testing/publication.py'
2
--- lib/lp/testing/publication.py	2010-04-28 10:13:00 +0000
3
+++ lib/lp/testing/publication.py	2010-08-05 03:21:07 +0000
4
@@ -15,13 +15,17 @@
5
15
# Z3 doesn't make this available as a utility.
15
# Z3 doesn't make this available as a utility.
6
16
from zope.app import zapi
16
from zope.app import zapi
7
17
from zope.app.publication.requestpublicationregistry import factoryRegistry
17
from zope.app.publication.requestpublicationregistry import factoryRegistry
8
18
from zope.app.security.interfaces import IUnauthenticatedPrincipal
9
18
from zope.component import getUtility
19
from zope.component import getUtility
10
19
from zope.interface import providedBy
20
from zope.interface import providedBy
11
20
from zope.publisher.interfaces.browser import IDefaultSkin
21
from zope.publisher.interfaces.browser import IDefaultSkin
12
22
from zope.security.management import restoreInteraction
13
21
23
14
22
from canonical.launchpad.interfaces.launchpad import IOpenLaunchBag
24
from canonical.launchpad.interfaces.launchpad import IOpenLaunchBag
15
23
import canonical.launchpad.layers as layers
25
import canonical.launchpad.layers as layers
16
24
from canonical.launchpad.webapp import urlsplit
26
from canonical.launchpad.webapp import urlsplit
17
27
from canonical.launchpad.webapp.interaction import (
18
28
    get_current_principal, setupInteraction)
19
25
from canonical.launchpad.webapp.servers import ProtocolErrorPublication
29
from canonical.launchpad.webapp.servers import ProtocolErrorPublication
20
26
30
21
27
31
22
@@ -103,8 +107,13 @@
23
103
    if layer is not None:
107
    if layer is not None:
24
104
        layers.setAdditionalLayer(request, layer)
108
        layers.setAdditionalLayer(request, layer)
25
105
109
28
106
    principal = publication.getPrincipal(request)
110
    principal = get_current_principal()
29
107
    request.setPrincipal(principal)
111
30
112
    if IUnauthenticatedPrincipal.providedBy(principal):
31
113
        login = None
32
114
    else:
33
115
        login = principal.person
34
116
    setupInteraction(principal, login, request)
35
108
117
36
109
    getUtility(IOpenLaunchBag).clear()
118
    getUtility(IOpenLaunchBag).clear()
37
110
    app = publication.getApplication(request)
119
    app = publication.getApplication(request)
38
@@ -112,4 +121,7 @@
39
112
    # Since the last traversed object is the view, the second last should be
121
    # Since the last traversed object is the view, the second last should be
40
113
    # the object that the view is on.
122
    # the object that the view is on.
41
114
    obj = request.traversed_objects[-2]
123
    obj = request.traversed_objects[-2]
42
124
43
125
    restoreInteraction()
44
126
45
115
    return obj, view, request
127
    return obj, view, request
46
116
128
47
=== added file 'lib/lp/testing/tests/test_publication.py'
48
--- lib/lp/testing/tests/test_publication.py	1970-01-01 00:00:00 +0000
49
+++ lib/lp/testing/tests/test_publication.py	2010-08-05 03:21:07 +0000
50
@@ -0,0 +1,92 @@
51
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
52
2
# GNU Affero General Public License version 3 (see the file LICENSE).
53
3
54
4
"""Tests for the helpers in `lp.testing.publication`."""
55
5
56
6
__metaclass__ = type
57
7
58
8
from zope.app.pagetemplate.simpleviewclass import simple
59
9
from zope.component import getSiteManager, getUtility
60
10
from zope.interface import Interface
61
11
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
62
12
from zope.security.checker import CheckerPublic, Checker, defineChecker
63
13
64
14
from canonical.launchpad.interfaces.launchpad import ILaunchpadRoot
65
15
from canonical.launchpad.webapp.interfaces import ILaunchBag
66
16
from canonical.launchpad.webapp.publisher import get_current_browser_request
67
17
from canonical.launchpad.webapp.servers import LaunchpadTestRequest
68
18
from canonical.testing import DatabaseFunctionalLayer
69
19
from lp.testing import ANONYMOUS, login, login_person, TestCaseWithFactory
70
20
from lp.testing.publication import test_traverse
71
21
72
22
73
23
class TestTestTraverse(TestCaseWithFactory):
74
24
    # Tests for `test_traverse`
75
25
76
26
    layer = DatabaseFunctionalLayer
77
27
78
28
    def registerViewCallable(self, view_callable):
79
29
        """Return a URL traversing to which will call `view_callable`.
80
30
81
31
        :param view_callable: Will be called with no arguments during
82
32
            traversal.
83
33
        """
84
34
        # This method is completely out of control.  Thanks, Zope.
85
35
        name = '+' + self.factory.getUniqueString()
86
36
        class new_class(simple):
87
37
            def __init__(self, context, request):
88
38
                view_callable()
89
39
        required = {}
90
40
        for n in ('browserDefault', '__call__', 'publishTraverse'):
91
41
            required[n] = CheckerPublic
92
42
        defineChecker(new_class, Checker(required))
93
43
        getSiteManager().registerAdapter(
94
44
            new_class, (ILaunchpadRoot, IDefaultBrowserLayer), Interface, 
95
45
            name)
96
46
        self.addCleanup(
97
47
            getSiteManager().unregisterAdapter, new_class,
98
48
            (ILaunchpadRoot, IDefaultBrowserLayer), Interface, name)
99
49
        return 'https://launchpad.dev/' + name
100
50
101
51
    def test_traverse_simple(self):
102
52
        # test_traverse called with a product URL returns the product
103
53
        # as the traversed object.
104
54
        login(ANONYMOUS)
105
55
        product = self.factory.makeProduct()
106
56
        context, view, request = test_traverse(
107
57
            'https://launchpad.dev/' + product.name)
108
58
        self.assertEqual(product, context)
109
59
110
60
    def test_request_is_current_during_traversal(self):
111
61
        # The request that test_traverse creates is current during
112
62
        # traversal in the sense of get_current_browser_request.
113
63
        login(ANONYMOUS)
114
64
        requests = []
115
65
        def record_current_request():
116
66
            requests.append(get_current_browser_request())
117
67
        context, view, request = test_traverse(
118
68
            self.registerViewCallable(record_current_request))
119
69
        self.assertEqual(1, len(requests))
120
70
        self.assertIs(request, requests[0])
121
71
122
72
    def test_participation_restored(self):
123
73
        # test_traverse restores the interaction (and hence
124
74
        # participation) that was present before it was called.
125
75
        request = LaunchpadTestRequest()
126
76
        login(ANONYMOUS, request)
127
77
        product = self.factory.makeProduct()
128
78
        test_traverse('https://launchpad.dev/' + product.name)
129
79
        self.assertIs(request, get_current_browser_request())
130
80
131
81
    def test_uses_current_user(self):
132
82
        # test_traverse performs the traversal as the currently logged
133
83
        # in user.
134
84
        person = self.factory.makePerson()
135
85
        login_person(person)
136
86
        users = []
137
87
        def record_user():
138
88
            users.append(getUtility(ILaunchBag).user)
139
89
        context, view, request = test_traverse(
140
90
            self.registerViewCallable(record_user))
141
91
        self.assertEqual(1, len(users))
142
92
        self.assertEqual(person, users[0])
Reviewer	Review Type	Date Requested	Status
Gary Poster (community)		2010-08-04	Approve on 2010-08-04
Review via email: mp+31731@code.launchpad.net