Merge c86efa2 into b637dbb

CHANGELOG.rst

@@ -6,21 +6,34 @@ Rasa Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to `Semantic Versioning`_ starting with version 1.0.
 
-[Unreleased 1.1.4] - `master`_
+
+[Unreleased 1.1.5] - `master`_
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Added
+-----
+
+Changed
+-------
+
+Removed
+-------
+
+Fixed
+-----
+
+[1.1.4] - 2019-06-18
+^^^^^^^^^^^^^^^^^^^^
+
 Added
 -----
 - unfeaturize single entities
 - added agent readiness check to the ``/status`` resource
 
 Changed
 -------
-
 - removed leading underscore from name of '_create_initial_project' function.
 
-Removed
--------
 
 Fixed
 -----

rasa/version.py

@@ -1 +1 @@
-__version__ = "1.1.3"
+__version__ = "1.1.4"

tests/core/test_channels.py

@@ -829,3 +829,24 @@ def test_register_channel_without_route():
 
     routes_list = utils.list_routes(app)
     assert routes_list.get("custom_webhook_RestInput.receive").startswith("/webhook")
+
+
+def test_channel_registration_with_absolute_url_prefix_overwrites_route():
+    from rasa.core.channels.channel import RestInput
+    import rasa.core
+
+    input_channel = RestInput()
+    test_route = "/absolute_route"
+    input_channel.url_prefix = lambda: test_route
+
+    app = Sanic(__name__)
+    ignored_base_route = "/should_be_ignored"
+    rasa.core.channels.channel.register(
+        [input_channel], app, route="/should_be_ignored"
+    )
+
+    # Assure that an absolute url returned by `url_prefix` overwrites route parameter
+    # given in `register`.
+    routes_list = utils.list_routes(app)
+    assert routes_list.get("custom_webhook_RestInput.health").startswith(test_route)
+    assert ignored_base_route not in routes_list.get("custom_webhook_RestInput.health")