diff options
Diffstat (limited to 'pyramid/tests/test_config.py')
| -rw-r--r-- | pyramid/tests/test_config.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/pyramid/tests/test_config.py b/pyramid/tests/test_config.py index 025eb595b..b6a04426c 100644 --- a/pyramid/tests/test_config.py +++ b/pyramid/tests/test_config.py @@ -226,22 +226,22 @@ class ConfiguratorTests(unittest.TestCase): result = config.maybe_dotted(pyramid.tests) self.assertEqual(result, pyramid.tests) - def test_absolute_resource_spec_already_absolute(self): + def test_absolute_asset_spec_already_absolute(self): import pyramid.tests config = self._makeOne(package=pyramid.tests) - result = config.absolute_resource_spec('already:absolute') + result = config.absolute_asset_spec('already:absolute') self.assertEqual(result, 'already:absolute') - def test_absolute_resource_spec_notastring(self): + def test_absolute_asset_spec_notastring(self): import pyramid.tests config = self._makeOne(package=pyramid.tests) - result = config.absolute_resource_spec(None) + result = config.absolute_asset_spec(None) self.assertEqual(result, None) - def test_absolute_resource_spec_relative(self): + def test_absolute_asset_spec_relative(self): import pyramid.tests config = self._makeOne(package=pyramid.tests) - result = config.absolute_resource_spec('templates') + result = config.absolute_asset_spec('templates') self.assertEqual(result, 'pyramid.tests:templates') def test_setup_registry_fixed(self): @@ -2541,7 +2541,7 @@ class ConfiguratorTests(unittest.TestCase): config.add_translation_dirs, '/wont/exist/on/my/system') - def test_add_translation_dirs_resource_spec(self): + def test_add_translation_dirs_asset_spec(self): import os from pyramid.interfaces import ITranslationDirectories config = self._makeOne(autocommit=True) @@ -2972,27 +2972,27 @@ class ConfiguratorTests(unittest.TestCase): inner_view, viewname='inner', wrapper_viewname='owrap') self.assertRaises(ValueError, wrapped, None, request) - def test_override_resource_samename(self): + def test_override_asset_samename(self): from pyramid.exceptions import ConfigurationError config = self._makeOne() - self.assertRaises(ConfigurationError, config.override_resource,'a', 'a') + self.assertRaises(ConfigurationError, config.override_asset,'a', 'a') - def test_override_resource_directory_with_file(self): + def test_override_asset_directory_with_file(self): from pyramid.exceptions import ConfigurationError config = self._makeOne() - self.assertRaises(ConfigurationError, config.override_resource, + self.assertRaises(ConfigurationError, config.override_asset, 'a:foo/', 'a:foo.pt') - def test_override_resource_file_with_directory(self): + def test_override_asset_file_with_directory(self): from pyramid.exceptions import ConfigurationError config = self._makeOne() - self.assertRaises(ConfigurationError, config.override_resource, + self.assertRaises(ConfigurationError, config.override_asset, 'a:foo.pt', 'a:foo/') - def test_override_resource_success(self): + def test_override_asset_success(self): config = self._makeOne(autocommit=True) override = DummyUnderOverride() - config.override_resource( + config.override_asset( 'pyramid.tests.fixtureapp:templates/foo.pt', 'pyramid.tests.fixtureapp.subpackage:templates/bar.pt', _override=override) @@ -3153,14 +3153,14 @@ class ConfiguratorTests(unittest.TestCase): self.assertEqual(ut.groupids, ('group1', 'group2')) self.assertEqual(ut.permissive, False) - def test_testing_models(self): - from pyramid.traversal import find_model + def test_testing_resources(self): + from pyramid.traversal import find_resource from pyramid.interfaces import ITraverser ob1 = object() ob2 = object() - models = {'/ob1':ob1, '/ob2':ob2} + resources = {'/ob1':ob1, '/ob2':ob2} config = self._makeOne(autocommit=True) - config.testing_models(models) + config.testing_resources(resources) adapter = config.registry.getAdapter(None, ITraverser) result = adapter({'PATH_INFO':'/ob1'}) self.assertEqual(result['context'], ob1) @@ -3179,7 +3179,7 @@ class ConfiguratorTests(unittest.TestCase): self.assertRaises(KeyError, adapter, {'PATH_INFO':'/ob3'}) try: config.begin() - self.assertEqual(find_model(None, '/ob1'), ob1) + self.assertEqual(find_resource(None, '/ob1'), ob1) finally: config.end() |