Fix the regex for path segment capture (#44)

* Fix the regex for path segment capture * Add a test related to path segment capture conflict * Fix a flake8 error
up9inc · Jan 22, 2021 · f23b074 · f23b074
1 parent bfc113b
commit f23b074
Show file tree

Hide file tree

Showing 6 changed files with 188 additions and 1 deletion.
diff --git a/mockintosh/recognizers.py b/mockintosh/recognizers.py
@@ -64,7 +64,7 @@ def render_segment(self, text):
             match = re.search(r'{{(.*)}}', text)
             if match is not None:
                 name = match.group(1).strip()
-                compiled = '.*'
+                compiled = '[^/]+'
                 var = name
             else:
                 compiled = text

diff --git a/tests/configs/json/hbs/path/config.json b/tests/configs/json/hbs/path/config.json
@@ -86,6 +86,53 @@
             },
             "body": "@templates/5.json.hbs"
           }
+        },
+        {
+          "method": "delete",
+          "path": "/carts/{{customerId}}",
+          "response": {
+            "status": 202
+          }
+        },
+        {
+          "method": "post",
+          "path": "/carts/{{customerId}}/items",
+          "response": {
+            "body": "{\n \"id\": \"L8VEqJRB4R\",\n \"itemId\": \"{{request.body}}\",\n \"quantity\": 1,\n \"unitPrice\": 12.0\n}",
+            "headers": {
+                "Content-Type": "application/json"
+            },
+            "status": 201
+          }
+        },
+        {
+          "path": "/carts/{{customerId}}/merge",
+          "response": {
+            "status": 202
+          }
+        },
+        {
+          "path": "/carts/{{customerId}}/items",
+          "response": {
+            "body": "[]",
+            "headers": {
+                "Content-Type": "application/json"
+            }
+          }
+        },
+        {
+          "method": "patch",
+          "path": "/carts/{{customerId}}/items",
+          "response": {
+            "status": 202
+          }
+        },
+        {
+          "method": "delete",
+          "path": "/carts/{{customerId}}/items/{{itemId}}",
+          "response": {
+            "status": 202
+          }
         }
       ]
     }

diff --git a/tests/configs/json/j2/path/config.json b/tests/configs/json/j2/path/config.json
@@ -86,6 +86,53 @@
             },
             "body": "@templates/5.json.j2"
           }
+        },
+        {
+          "method": "delete",
+          "path": "/carts/{{customerId}}",
+          "response": {
+            "status": 202
+          }
+        },
+        {
+          "method": "post",
+          "path": "/carts/{{customerId}}/items",
+          "response": {
+            "body": "{\n \"id\": \"L8VEqJRB4R\",\n \"itemId\": \"{{request.body}}\",\n \"quantity\": 1,\n \"unitPrice\": 12.0\n}",
+            "headers": {
+                "Content-Type": "application/json"
+            },
+            "status": 201
+          }
+        },
+        {
+          "path": "/carts/{{customerId}}/merge",
+          "response": {
+            "status": 202
+          }
+        },
+        {
+          "path": "/carts/{{customerId}}/items",
+          "response": {
+            "body": "[]",
+            "headers": {
+                "Content-Type": "application/json"
+            }
+          }
+        },
+        {
+          "method": "patch",
+          "path": "/carts/{{customerId}}/items",
+          "response": {
+            "status": 202
+          }
+        },
+        {
+          "method": "delete",
+          "path": "/carts/{{customerId}}/items/{{itemId}}",
+          "response": {
+            "status": 202
+          }
         }
       ]
     }

diff --git a/tests/configs/yaml/hbs/path/config.yaml b/tests/configs/yaml/hbs/path/config.yaml
@@ -48,3 +48,36 @@ services:
       headers:
         Content-Type: "application/json; charset=UTF-8"
       body: "@templates/5.json.hbs"
+  - method: delete
+    path: /carts/{{customerId}}
+    response:
+      status: 202
+  - method: post
+    path: /carts/{{customerId}}/items
+    response:
+      body: |-
+        {
+         "id": "L8VEqJRB4R",
+         "itemId": "{{request.body}}",
+         "quantity": 1,
+         "unitPrice": 12.0
+        }
+      headers:
+        Content-Type: application/json
+      status: 201
+  - path: /carts/{{customerId}}/merge
+    response:
+      status: 202
+  - path: /carts/{{customerId}}/items
+    response:
+      body: '[]'
+      headers:
+        Content-Type: application/json
+  - method: patch
+    path: /carts/{{customerId}}/items
+    response:
+      status: 202
+  - method: delete
+    path: /carts/{{customerId}}/items/{{itemId}}
+    response:
+      status: 202
diff --git a/tests/configs/yaml/j2/path/config.yaml b/tests/configs/yaml/j2/path/config.yaml
@@ -48,3 +48,36 @@ services:
       headers:
         Content-Type: "application/json; charset=UTF-8"
       body: "@templates/5.json.j2"
+  - method: delete
+    path: /carts/{{customerId}}
+    response:
+      status: 202
+  - method: post
+    path: /carts/{{customerId}}/items
+    response:
+      body: |-
+        {
+         "id": "L8VEqJRB4R",
+         "itemId": "{{request.body}}",
+         "quantity": 1,
+         "unitPrice": 12.0
+        }
+      headers:
+        Content-Type: application/json
+      status: 201
+  - path: /carts/{{customerId}}/merge
+    response:
+      status: 202
+  - path: /carts/{{customerId}}/items
+    response:
+      body: '[]'
+      headers:
+        Content-Type: application/json
+  - method: patch
+    path: /carts/{{customerId}}/items
+    response:
+      status: 202
+  - method: delete
+    path: /carts/{{customerId}}/items/{{itemId}}
+    response:
+      status: 202
diff --git a/tests/test_features.py b/tests/test_features.py
@@ -1141,6 +1141,33 @@ def test_multiple_parameters_and_regex_capture_groups(self, config):
         assert data['var4'] == param4
         assert data['var5'] == param5
 
+    def test_path_segment_capture_conflict(self, config):
+        param1 = str(int(time.time()))
+        param2 = str(int(time.time()))
+        resp = requests.delete(SRV_8001 + '/carts/%s' % param1)
+        assert 202 == resp.status_code
+
+        resp = requests.post(SRV_8001 + '/carts/%s/items' % param1)
+        assert 201 == resp.status_code
+        assert resp.headers['Content-Type'] == 'application/json'
+        data = resp.json()
+        assert data['id'] == 'L8VEqJRB4R'
+
+        resp = requests.get(SRV_8001 + '/carts/%s/merge' % param1)
+        assert 202 == resp.status_code
+
+        resp = requests.get(SRV_8001 + '/carts/%s/items' % param1)
+        assert 200 == resp.status_code
+        assert resp.headers['Content-Type'] == 'application/json'
+        data = resp.json()
+        assert isinstance(data, list) and not data
+
+        resp = requests.patch(SRV_8001 + '/carts/%s/items' % param1)
+        assert 202 == resp.status_code
+
+        resp = requests.delete(SRV_8001 + '/carts/%s/items/%s' % (param1, param2))
+        assert 202 == resp.status_code
+
 
 @pytest.mark.parametrize(('config'), [
     'configs/json/hbs/query_string/config.json',