summaryrefslogtreecommitdiff
path: root/repoze/bfg/tests
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-01-18 05:49:41 +0000
committerChris McDonough <chrism@agendaless.com>2009-01-18 05:49:41 +0000
commit58afb33d70dece410b998a9c064eba42e3f843d7 (patch)
tree4b4a951eaf7efde99fe2ea889c86beb8e944c1e5 /repoze/bfg/tests
parenta1824a7cae05606029dd0df64faef17aa65f3f89 (diff)
downloadpyramid-58afb33d70dece410b998a9c064eba42e3f843d7.tar.gz
pyramid-58afb33d70dece410b998a9c064eba42e3f843d7.tar.bz2
pyramid-58afb33d70dece410b998a9c064eba42e3f843d7.zip
grok -> scan to prevent confusion.
Diffstat (limited to 'repoze/bfg/tests')
-rw-r--r--repoze/bfg/tests/grokkedapp/configure.zcml2
-rw-r--r--repoze/bfg/tests/test_integration.py12
-rw-r--r--repoze/bfg/tests/test_zcml.py6
3 files changed, 10 insertions, 10 deletions
diff --git a/repoze/bfg/tests/grokkedapp/configure.zcml b/repoze/bfg/tests/grokkedapp/configure.zcml
index be7226afd..6867046df 100644
--- a/repoze/bfg/tests/grokkedapp/configure.zcml
+++ b/repoze/bfg/tests/grokkedapp/configure.zcml
@@ -1,6 +1,6 @@
<configure xmlns="http://namespaces.repoze.org/bfg">
<include package="repoze.bfg.includes" />
- <grok package="."/>
+ <scan package="."/>
</configure>
diff --git a/repoze/bfg/tests/test_integration.py b/repoze/bfg/tests/test_integration.py
index 4630f0da8..4c5777738 100644
--- a/repoze/bfg/tests/test_integration.py
+++ b/repoze/bfg/tests/test_integration.py
@@ -35,13 +35,13 @@ class WGSIAppPlusBFGViewTests(unittest.TestCase):
result = wsgiapptest(context, request)
self.assertEqual(result, '123')
- def test_grokkage(self):
+ def test_scanned(self):
from repoze.bfg.interfaces import IRequest
from repoze.bfg.interfaces import IView
- from repoze.bfg.zcml import grok
+ from repoze.bfg.zcml import scan
context = DummyContext()
from repoze.bfg.tests import test_integration
- grok(context, test_integration)
+ scan(context, test_integration)
actions = context.actions
self.assertEqual(len(actions), 2)
action = actions[1]
@@ -75,13 +75,13 @@ class PushPagePlusBFGViewTests(unittest.TestCase):
result = pushtest(context, request)
self.assertEqual(result.status, '200 OK')
- def test_grokkage(self):
+ def test_scanned(self):
from repoze.bfg.interfaces import IRequest
from repoze.bfg.interfaces import IView
- from repoze.bfg.zcml import grok
+ from repoze.bfg.zcml import scan
context = DummyContext()
from repoze.bfg.tests import test_integration
- grok(context, test_integration)
+ scan(context, test_integration)
actions = context.actions
self.assertEqual(len(actions), 2)
action = actions[0]
diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py
index 1d7f42098..a59f88ae1 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/repoze/bfg/tests/test_zcml.py
@@ -492,7 +492,7 @@ class TestBFGViewFunctionGrokker(unittest.TestCase):
actions = context.actions
self.assertEqual(len(actions), 0)
-class TestZCMLGrokFunction(unittest.TestCase):
+class TestZCMLScanFunction(unittest.TestCase):
def setUp(self):
cleanUp()
@@ -500,8 +500,8 @@ class TestZCMLGrokFunction(unittest.TestCase):
cleanUp()
def _callFUT(self, context, package, martian):
- from repoze.bfg.zcml import grok
- return grok(context, package, martian)
+ from repoze.bfg.zcml import scan
+ return scan(context, package, martian)
def test_it(self):
martian = DummyMartianModule()