Merge branch 'release/2.30.0'

Author: vmalloc

backslash/contrib/slash_plugin.py

@@ -79,10 +79,22 @@ def rest_url(self):
 
     @property
     def webapp_url(self):
+        return self._url_with_fragment('/')
+
+    @property
+    def session_webapp_url(self):
+        session = slash.context.session
+        if session is None:
+            return None
+        return self._url_with_fragment('sessions/{}'.format(session.id))
+
+    def _url_with_fragment(self, fragment):
         returned = str(self._get_backslash_url())
         if not returned.endswith('/'):
             returned += '/'
-        returned += '#/'
+        if not fragment.startswith('/'):
+            fragment = '/' + fragment
+        returned += '#{}'.format(fragment)
         return returned
 
     def _handle_exception(self, exc_info):

docs/changelog.rst

@@ -1,7 +1,9 @@
 Changelog
 =========
 
-* :release:`2.29.0 <6-7-2017>`
+* :release: `2.30.0 <8-8-2017>`
+* :feature:`50` Added session_webapp_url property to the Slash plugin
+* :release:`2.29.0 <6-8-2017>`
 * :feature:`49` Add hook for intercepting keepalive thread exceptions
 * :feature:`-` Move to PBR
 * :bug:`31 major` Be more resilient to I/O errors when compressing tracebacks

tests/test_slash_plugin.py

@@ -40,6 +40,16 @@ def test_webapp_url(installed_plugin, server_url):
     expected += '#/'
     assert installed_plugin.webapp_url == expected
 
+def test_session_webapp_url_no_session(installed_plugin):
+    assert installed_plugin.session_webapp_url is None
+
+def test_session_webapp_url_with_session(installed_plugin, server_url):
+    with slash.Session() as s:
+        url = installed_plugin.session_webapp_url
+    assert url == '{}/#/sessions/{}'.format(server_url, s.id)
+
+
+
 
 
 @pytest.fixture