Merged [1504226] and [1504317] from trunk to 0.6 branch.
git-svn-id: https://svn.apache.org/repos/asf/bloodhound/branches/0.6@1504381 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bloodhound_multiproduct/multiproduct/env.py b/bloodhound_multiproduct/multiproduct/env.py
index 38abc6b..ce0f791 100644
--- a/bloodhound_multiproduct/multiproduct/env.py
+++ b/bloodhound_multiproduct/multiproduct/env.py
@@ -405,7 +405,7 @@
"""
return ''
- base_url = Option('trac', 'base_url', '',
+ _base_url = Option('trac', 'base_url', '',
"""Reference URL for the Trac deployment.
This is the base URL that will be used when producing
@@ -413,7 +413,14 @@
context, like for example when inserting URLs pointing to Trac
resources in notification e-mails.""")
- base_url_for_redirect = BoolOption('trac', 'use_base_url_for_redirect',
+ @property
+ def base_url(self):
+ base_url = self._base_url
+ if base_url == self.parent.base_url:
+ return ''
+ return base_url
+
+ _base_url_for_redirect = BoolOption('trac', 'use_base_url_for_redirect',
False,
"""Optionally use `[trac] base_url` for redirects.
diff --git a/bloodhound_multiproduct/tests/env.py b/bloodhound_multiproduct/tests/env.py
index b5c4fb7..34b7244 100644
--- a/bloodhound_multiproduct/tests/env.py
+++ b/bloodhound_multiproduct/tests/env.py
@@ -42,6 +42,7 @@
from trac.ticket.report import ReportModule
from trac.ticket.web_ui import TicketModule
from trac.util.text import to_unicode
+from trac.web.href import Href
from multiproduct.api import MultiProductSystem
from multiproduct.env import ProductEnvironment
@@ -558,9 +559,11 @@
def setUp(self):
self._mp_setup()
self.env.path = '/path/to/env'
+ self.env.abs_href = Href('http://globalenv.com/trac.cgi')
url_pattern = getattr(getattr(self, self._testMethodName).im_func,
'product_base_url', '')
self.env.config.set('multiproduct', 'product_base_url', url_pattern)
+ self.env.config.set('trac', 'base_url', 'http://globalenv.com/trac.cgi')
self.product_env = ProductEnvironment(self.env, self.default_product)
def tearDown(self):
@@ -585,21 +588,28 @@
def test_href_sibling_paths(self):
"""Test product base URL at sibling paths
"""
- self.assertEqual('http://example.org/trac.cgi/path/to/bloodhound/tp1',
+ self.assertEqual('http://globalenv.com/trac.cgi/path/to/bloodhound/tp1',
self.product_env.abs_href())
@product_base_url('/$(envname)s/$(prefix)s')
def test_href_inherit_sibling_paths(self):
"""Test product base URL at sibling paths inheriting configuration.
"""
- self.assertEqual('http://example.org/trac.cgi/env/tp1',
+ self.assertEqual('http://globalenv.com/trac.cgi/env/tp1',
+ self.product_env.abs_href())
+
+ @product_base_url('')
+ def test_href_default(self):
+ """Test product base URL is to a default
+ """
+ self.assertEqual('http://globalenv.com/trac.cgi/products/tp1',
self.product_env.abs_href())
@product_base_url('/products/$(prefix)s')
def test_href_embed(self):
"""Test default product base URL /products/prefix
"""
- self.assertEqual('http://example.org/trac.cgi/products/tp1',
+ self.assertEqual('http://globalenv.com/trac.cgi/products/tp1',
self.product_env.abs_href())
@product_base_url('http://$(envname)s.tld/bh/$(prefix)s')
@@ -608,6 +618,46 @@
"""
self.assertEqual('http://env.tld/bh/tp1', self.product_env.abs_href())
+ @product_base_url('http://$(prefix)s.$(envname)s.tld/')
+ def test_product_href_uses_multiproduct_product_base_url(self):
+ """Test that [multiproduct] product_base_url is used to compute
+ abs_href for the product environment when [trac] base_url for
+ the product environment is an empty string (the default).
+ """
+ # Global URLs
+ self.assertEqual('http://globalenv.com/trac.cgi', self.env.base_url)
+ self.assertEqual('http://globalenv.com/trac.cgi', self.env.abs_href())
+
+ # Product URLs
+ self.assertEqual('', self.product_env.base_url)
+ self.assertEqual('http://tp1.env.tld', self.product_env.abs_href())
+
+ @product_base_url('http://$(prefix)s.$(envname)s.tld/')
+ def test_product_href_uses_products_base_url(self):
+ """Test that [trac] base_url for the product environment is used to
+ compute abs_href for the product environment when [trac] base_url
+ for the product environment is different than [trac] base_url for
+ the global environment.
+ """
+ self.product_env.config.set('trac', 'base_url', 'http://productenv.com')
+ self.product_env.config.save()
+
+ self.assertEqual('http://productenv.com', self.product_env.base_url)
+ self.assertEqual('http://productenv.com', self.product_env.abs_href())
+
+ @product_base_url('http://$(prefix)s.$(envname)s.tld/')
+ def test_product_href_global_and_product_base_urls_same(self):
+ """Test that [multiproduct] product_base_url is used to compute
+ abs_href for the product environment when [trac] base_url is the same
+ for the product and global environment.
+ """
+ self.product_env.config.set('trac', 'base_url',
+ self.env.config.get('trac', 'base_url'))
+ self.product_env.config.save()
+
+ self.assertEqual('', self.product_env.base_url)
+ self.assertEqual('http://tp1.env.tld', self.product_env.abs_href())
+
product_base_url = staticmethod(product_base_url)