Use a cleaner way of forcing snapshot updates in the tests

snapshottest/module.py

@@ -197,18 +197,15 @@ def get_module_for_testpath(cls, test_filepath):
 class SnapshotTest(object):
     _current_tester = None
 
-    def __init__(self):
+    def __init__(self, should_update_snapshot):
         self.curr_snapshot = ''
         self.snapshot_counter = 1
+        self.should_update_snapshot = should_update_snapshot
 
     @property
     def module(self):
         raise NotImplementedError("module property needs to be implemented")
 
-    @property
-    def update(self):
-        return False
-
     @property
     def test_name(self):
         raise NotImplementedError("test_name property needs to be implemented")
@@ -242,10 +239,10 @@ def assert_value_matches_snapshot(self, test_value, snapshot_value):
     def assert_equals(self, value, snapshot):
         assert value == snapshot
 
-    def assert_match(self, value, name="", force_update_snapshot=False):
+    def assert_match(self, value, name=""):
         self.curr_snapshot = name or self.snapshot_counter
         self.visit()
-        if self.update or force_update_snapshot:
+        if self.should_update_snapshot:
             self.store(value)
         else:
             try:

snapshottest/pytest.py

@@ -28,16 +28,12 @@ class PyTestSnapshotTest(SnapshotTest):
 
     def __init__(self, request=None):
         self.request = request
-        super(PyTestSnapshotTest, self).__init__()
+        super(PyTestSnapshotTest, self).__init__(request.config.option.snapshot_update)
 
     @property
     def module(self):
         return SnapshotModule.get_module_for_testpath(self.request.node.fspath.strpath)
 
-    @property
-    def update(self):
-        return self.request.config.option.snapshot_update
-
     @property
     def test_name(self):
         cls_name = getattr(self.request.node.cls, '__name__', '')

snapshottest/unittest.py

@@ -14,17 +14,12 @@ def __init__(self, test_class, test_id, test_filepath, should_update, assertEqua
         self.test_id = test_id
         self.test_filepath = test_filepath
         self.assertEqual = assertEqual
-        self.should_update = should_update
-        super(UnitTestSnapshotTest, self).__init__()
+        super(UnitTestSnapshotTest, self).__init__(should_update)
 
     @property
     def module(self):
         return SnapshotModule.get_module_for_testpath(self.test_filepath)
 
-    @property
-    def update(self):
-        return self.should_update
-
     def assert_equals(self, value, snapshot):
         self.assertEqual(value, snapshot)
 

tests/test_pytest.py

@@ -21,36 +21,39 @@ def pytest_snapshot_test(request, _apply_options):
 
 class TestPyTestSnapShotTest:
     def test_property_test_name(self, pytest_snapshot_test):
-        pytest_snapshot_test.assert_match('counter', force_update_snapshot=True)
+        pytest_snapshot_test.should_update_snapshot = True
+        pytest_snapshot_test.assert_match('counter')
         assert pytest_snapshot_test.test_name == \
             'TestPyTestSnapShotTest.test_property_test_name 1'
 
-        pytest_snapshot_test.assert_match('named', 'named_test', force_update_snapshot=True)
+        pytest_snapshot_test.assert_match('named', 'named_test')
         assert pytest_snapshot_test.test_name == \
             'TestPyTestSnapShotTest.test_property_test_name named_test'
 
-        pytest_snapshot_test.assert_match('counter', force_update_snapshot=True)
+        pytest_snapshot_test.assert_match('counter')
         assert pytest_snapshot_test.test_name == \
             'TestPyTestSnapShotTest.test_property_test_name 2'
 
 
 def test_pytest_snapshottest_property_test_name(pytest_snapshot_test):
-    pytest_snapshot_test.assert_match('counter', force_update_snapshot=True)
+    pytest_snapshot_test.should_update_snapshot = True
+    pytest_snapshot_test.assert_match('counter')
     assert pytest_snapshot_test.test_name == \
         'test_pytest_snapshottest_property_test_name 1'
 
-    pytest_snapshot_test.assert_match('named', 'named_test', force_update_snapshot=True)
+    pytest_snapshot_test.assert_match('named', 'named_test')
     assert pytest_snapshot_test.test_name == \
         'test_pytest_snapshottest_property_test_name named_test'
 
-    pytest_snapshot_test.assert_match('counter', force_update_snapshot=True)
+    pytest_snapshot_test.assert_match('counter')
     assert pytest_snapshot_test.test_name == \
         'test_pytest_snapshottest_property_test_name 2'
 
 
 @pytest.mark.parametrize('arg', ['single line string'])
 def test_pytest_snapshottest_property_test_name_parametrize_singleline(pytest_snapshot_test, arg):
-    pytest_snapshot_test.assert_match('counter', force_update_snapshot=True)
+    pytest_snapshot_test.should_update_snapshot = True
+    pytest_snapshot_test.assert_match('counter')
     assert pytest_snapshot_test.test_name == \
         'test_pytest_snapshottest_property_test_name_parametrize_singleline[single line string] 1'
 
@@ -63,6 +66,7 @@ def test_pytest_snapshottest_property_test_name_parametrize_singleline(pytest_sn
     '''
 ])
 def test_pytest_snapshottest_property_test_name_parametrize_multiline(pytest_snapshot_test, arg):
-    pytest_snapshot_test.assert_match('counter', force_update_snapshot=True)
+    pytest_snapshot_test.should_update_snapshot = True
+    pytest_snapshot_test.assert_match('counter')
     assert pytest_snapshot_test.test_name == \
         'test_pytest_snapshottest_property_test_name_parametrize_multiline[ multi line string ] 1'

tests/test_snapshot_test.py

@@ -14,7 +14,7 @@ def __init__(self, snapshot_module, update=False, current_test_id=None):
             'snapshot_module': snapshot_module,
             'update': update,
             'current_test_id': current_test_id or "test_mocked"}
-        super(GenericSnapshotTest, self).__init__()
+        super(GenericSnapshotTest, self).__init__(update)
 
     @property
     def module(self):
@@ -32,7 +32,7 @@ def test_name(self):
 
     def reinitialize(self):
         """Reset internal state, as though starting a new test run"""
-        super(GenericSnapshotTest, self).__init__()
+        super(GenericSnapshotTest, self).__init__(False)
 
 
 def assert_snapshot_test_ran(snapshot_test, test_name=None):
@@ -87,7 +87,8 @@ def fixture_snapshot_test(tmpdir):
 @pytest.mark.parametrize("value", SNAPSHOTABLE_VALUES, ids=repr)
 def test_snapshot_matches_itself(snapshot_test, value):
     # first run stores the value as the snapshot
-    snapshot_test.assert_match(value, force_update_snapshot=True)
+    snapshot_test.should_update_snapshot = True
+    snapshot_test.assert_match(value)
     assert_snapshot_test_succeeded(snapshot_test)
 
     # second run should compare stored snapshot and also succeed
@@ -104,7 +105,8 @@ def test_snapshot_matches_itself(snapshot_test, value):
 ])
 def test_snapshot_does_not_match_other_values(snapshot_test, value, other_value):
     # first run stores the value as the snapshot
-    snapshot_test.assert_match(value, force_update_snapshot=True)
+    snapshot_test.should_update_snapshot = True
+    snapshot_test.assert_match(value)
     assert_snapshot_test_succeeded(snapshot_test)
 
     # second run tries to match other_value, should fail