updated tests

Author: calumbell

api_v2/tests/responses/TestObjects.test_item_melee_weapon_example.approved.json

@@ -61,34 +61,28 @@
             "url": "http://localhost:8000/v2/damagetypes/slashing/"
         },
         "distance_unit": "feet",
-        "is_finesse": true,
-        "is_heavy": false,
         "is_improvised": false,
-        "is_lance": false,
-        "is_light": true,
         "is_martial": true,
-        "is_melee": true,
-        "is_net": false,
-        "is_reach": false,
         "is_simple": false,
-        "is_thrown": false,
-        "is_two_handed": false,
-        "is_versatile": false,
         "key": "srd_shortsword",
-        "long_range": 0.0,
         "name": "Shortsword",
         "properties": [
-            "finesse",
-            "light"
+            {
+                "detail": null,
+                "property": {
+                    "name": "Finesse",
+                    "url": "http://localhost:8000/v2/weaponproperties/srd-2014_finesse-wp/"
+                }
+            },
+            {
+                "detail": null,
+                "property": {
+                    "name": "Light",
+                    "url": "http://localhost:8000/v2/weaponproperties/srd-2014_light-wp/"
+                }
+            }
         ],
-        "range": 0.0,
-        "range_melee": 5.0,
-        "ranged_attack_possible": false,
-        "reach": 5.0,
-        "requires_ammunition": false,
-        "requires_loading": false,
-        "url": "http://localhost:8000/v2/weapons/srd_shortsword/",
-        "versatile_dice": "0"
+        "url": "http://localhost:8000/v2/weapons/srd_shortsword/"
     },
     "weight": "2.000",
     "weight_unit": "lb"

api_v2/tests/responses/TestObjects.test_item_ranged_weapon_example.approved.json

@@ -61,35 +61,28 @@
             "url": "http://localhost:8000/v2/damagetypes/piercing/"
         },
         "distance_unit": "feet",
-        "is_finesse": false,
-        "is_heavy": true,
         "is_improvised": false,
-        "is_lance": false,
-        "is_light": false,
         "is_martial": true,
-        "is_melee": false,
-        "is_net": false,
-        "is_reach": false,
         "is_simple": false,
-        "is_thrown": false,
-        "is_two_handed": true,
-        "is_versatile": false,
         "key": "srd_longbow",
-        "long_range": 600.0,
         "name": "Longbow",
         "properties": [
-            "ammuntion (range 150.0/600.0)",
-            "heavy",
-            "two-handed"
+            {
+                "detail": null,
+                "property": {
+                    "name": "Two-Handed",
+                    "url": "http://localhost:8000/v2/weaponproperties/srd-2014_two-handed-wp/"
+                }
+            },
+            {
+                "detail": "range 150/",
+                "property": {
+                    "name": "Ammunition",
+                    "url": "http://localhost:8000/v2/weaponproperties/srd-2014_ammunition-wp/"
+                }
+            }
         ],
-        "range": 150.0,
-        "range_melee": 5.0,
-        "ranged_attack_possible": true,
-        "reach": 5.0,
-        "requires_ammunition": true,
-        "requires_loading": false,
-        "url": "http://localhost:8000/v2/weapons/srd_longbow/",
-        "versatile_dice": "0"
+        "url": "http://localhost:8000/v2/weapons/srd_longbow/"
     },
     "weight": "2.000",
     "weight_unit": "lb"

api_v2/tests/responses/TestObjects.test_weapon_example.approved.json

@@ -21,32 +21,27 @@
             "url": "http://localhost:8000/v2/publishers/wizards-of-the-coast/"
         }
     },
-    "is_finesse": true,
-    "is_heavy": false,
     "is_improvised": false,
-    "is_lance": false,
-    "is_light": true,
-    "is_martial": true,
-    "is_melee": true,
-    "is_net": false,
-    "is_reach": false,
     "is_simple": false,
-    "is_thrown": false,
-    "is_two_handed": false,
-    "is_versatile": false,
     "key": "srd_shortsword",
     "long_range": 0.0,
     "name": "Shortsword",
     "properties": [
-        "finesse",
-        "light"
+        {
+            "detail": null,
+            "property": {
+                "name": "Finesse",
+                "url": "http://localhost:8000/v2/weaponproperties/srd-2014_finesse-wp/"
+            }
+        },
+        {
+            "detail": null,
+            "property": {
+                "name": "Light",
+                "url": "http://localhost:8000/v2/weaponproperties/srd-2014_light-wp/"
+            }
+        }
     ],
     "range": 0.0,
-    "range_melee": 5.0,
-    "ranged_attack_possible": false,
-    "reach": 5.0,
-    "requires_ammunition": false,
-    "requires_loading": false,
-    "url": "http://localhost:8000/v2/weapons/srd_shortsword/",
-    "versatile_dice": "0"
+    "url": "http://localhost:8000/v2/weapons/srd_shortsword/"
 }