Merge ee586fb into 5bc965a

MasoniteFramework · Jul 19, 2018 · 4c6cf39 · 4c6cf39
2 parents 5bc965a + ee586fb
commit 4c6cf39
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/masonite/info.py b/masonite/info.py
@@ -1 +1 @@
-VERSION = '2.0.11'
+VERSION = '2.0.12'
diff --git a/masonite/routes.py b/masonite/routes.py
@@ -270,4 +270,5 @@ def _prefix(self, prefix):
 
     def _name(self, name):
         for route in self.routes:
-            route.named_route = name + route.named_route
+            if isinstance(route.named_route, str):
+                route.named_route = name + route.named_route
diff --git a/tests/test_routes.py b/tests/test_routes.py
@@ -99,8 +99,15 @@ def test_group_route_sets_name(self):
             Get().route('/test/2', 'TestController@show').name('edit')
         ], name='post.')
 
+    def test_group_route_sets_name_for_none_route(self):
+        look_for = []
+        routes = RouteGroup([
+            Get().route('/test/1', 'TestController@show').name('create'),
+            Get().route('/test/2', 'TestController@show')
+        ], name='post.')
+
         assert routes[0].named_route == 'post.create'
-        assert routes[1].named_route == 'post.edit'
+        assert routes[1].named_route == None
 
     def test_flatten_flattens_multiple_lists(self):
         routes = [