Merge pull request #42 from jetavator/issue-41-Update_property_behavi…

…our_so_default_and_default_function_don_t_set_a_value_persistently Issue 41 update property behaviour so default and default function don t set a value persistently
jetavator · Jun 12, 2020 · 66a9251 · 66a9251
2 parents 3fce591 + bc859f6
commit 66a9251
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 8 deletions.
diff --git a/features/dict.feature b/features/dict.feature
@@ -9,10 +9,10 @@ Feature: Test dictionary DOM objects
         "first_name": "Marge",
         "last_name": "Simpson",
         "current_address": {
-        "first_line": "123 Fake Street",
-        "second_line": "",
-        "city": "Springfield",
-        "postal_code": 58008
+          "first_line": "123 Fake Street",
+          "second_line": "",
+          "city": "Springfield",
+          "postal_code": 58008
         },
         "previous_addresses": [{
           "first_line": "742 Evergreen Terrace",
@@ -199,4 +199,32 @@ Feature: Test dictionary DOM objects
     And the following statement raises ValidationError
       """
       dict_module.Person(example_dict_input)
-      """
+      """
+
+  Scenario: Defaults should not be written as permanent values when accessed
+
+    Given the Python module dict_module.py
+    When we execute the following python code:
+      """
+      example_dict_input = {
+        "first_name": "Marge",
+        "last_name": "Simpson",
+        "previous_addresses": [{
+          "first_line": "742 Evergreen Terrace",
+          "city": "Springfield",
+          "postal_code": 58008
+        }]
+      }
+      example = dict_module.Person(example_dict_input)
+      original_address = example.current_address
+      example.previous_addresses[0] = {
+        "first_line": "123 Fake Street",
+        "city": "Springfield",
+        "postal_code": 58008
+      }
+      """
+    Then the following statements are true:
+      """
+      example.current_address.first_line == "123 Fake Street"
+      example.previous_addresses[0].first_line == "123 Fake Street"
+      """
diff --git a/wysdom/__version__.py b/wysdom/__version__.py
@@ -1,3 +1,3 @@
-VERSION = (0, 1, 3)
+VERSION = (0, 1, 4)
 
 __version__ = '.'.join(map(str, VERSION))
diff --git a/wysdom/user_objects/UserProperty.py b/wysdom/user_objects/UserProperty.py
@@ -72,9 +72,9 @@ def __get__(
                 "UserProperty is not valid as a class data descriptor")
         if self.name not in instance:
             if self.default_function:
-                instance[self.name] = self.default_function(instance)
+                return self.default_function(instance)
             else:
-                instance[self.name] = self.default
+                return self.default
         return instance[self.name]
 
     def __set__(