Merge pull request #27 from applitools/develop

Merge Develop to master

Author: eirenik0

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.0.4
+current_version = 4.0.5
 commit = True
 tag = True
 

eyes_common/applitools/common/__version__.py

@@ -1 +1 @@
-__version__ = "4.0.4"
+__version__ = "4.0.5"

eyes_common/applitools/common/config/configuration.py

@@ -2,13 +2,14 @@
 import uuid
 from copy import copy
 from datetime import datetime
-from typing import Optional, Text
+from typing import Optional, Text, Union
 
 import attr
+
 from applitools.common.geometry import RectangleSize
 from applitools.common.match import ImageMatchSettings, MatchLevel
 from applitools.common.server import FailureReports, SessionType
-from applitools.common.utils import general_utils, argument_guard
+from applitools.common.utils import argument_guard, general_utils
 from applitools.common.utils.json_utils import JsonInclude
 
 __all__ = ("BatchInfo", "Configuration")
@@ -28,28 +29,21 @@ class BatchInfo(object):
         factory=lambda: os.environ.get("APPLITOOLS_BATCH_NAME"),
         metadata={JsonInclude.THIS: True},
     )  # type: Optional[Text]
+    started_at = attr.ib(
+        factory=lambda: datetime.now(general_utils.UTC),
+        metadata={JsonInclude.THIS: True},
+    )  # type: Union[datetime, Text]
     sequence_name = attr.ib(
+        init=False,
         factory=lambda: os.environ.get("APPLITOOLS_BATCH_SEQUENCE"),
         metadata={JsonInclude.NAME: "batchSequenceName"},
     )  # type: Optional[Text]
-    started_at = attr.ib(
-        factory=lambda: datetime.now(general_utils.UTC),
-        metadata={JsonInclude.THIS: True},
-    )  # # type: Text
     id = attr.ib(
+        init=False,
         factory=lambda: os.environ.get("APPLITOOLS_BATCH_ID", str(uuid.uuid4())),
         metadata={JsonInclude.THIS: True},
     )  # type: Text
 
-    @property
-    def id_(self):
-        # TODO: Remove in this way of initialization in future
-        return self.id
-
-    @id_.setter
-    def id_(self, value):
-        self.id = value
-
     def with_batch_id(self, id):
         argument_guard.not_none(id)
         self.id = id
@@ -94,7 +88,7 @@ class Configuration(object):
     save_failed_tests = attr.ib(default=False)
     fail_on_new_test = attr.ib(default=False)
     failure_reports = attr.ib(default=FailureReports.ON_CLOSE)
-    send_dom = attr.ib(default=False)
+    send_dom = attr.ib(default=True)
     use_dom = attr.ib(default=False)
     enable_patterns = attr.ib(default=False)
     default_match_settings = attr.ib(default=ImageMatchSettings())

eyes_common/applitools/common/utils/json_utils.py

@@ -101,7 +101,7 @@ def _filter(attr_, value):
 
 def to_serializable(val):
     if isinstance(val, datetime):
-        return val.isoformat() + "Z"
+        return val.strftime("%Y-%m-%dT%H:%M:%SZ")
     elif isinstance(val, enum.Enum):
         return val.value
     elif attr.has(val.__class__):

eyes_core/applitools/core/__version__.py

@@ -1 +1 @@
-__version__ = "4.0.4"
+__version__ = "4.0.5"

eyes_images/applitools/images/__version__.py

@@ -1 +1 @@
-__version__ = "4.0.4"
+__version__ = "4.0.5"

eyes_selenium/applitools/selenium/__version__.py

@@ -1 +1 @@
-__version__ = "4.0.4"
+__version__ = "4.0.5"

tests/unit/eyes_common/test_batch_info.py

@@ -28,6 +28,12 @@ def test_create_batch_info(monkeypatch):
     assert bi.sequence_name == "sequence name"
 
 
+def test_batch_info_with_date():
+    now = datetime.now()
+    bi = BatchInfo(None, now)
+    assert bi.started_at == now
+
+
 def test_create_batch_with_batch_id():
     bi = BatchInfo("My name").with_batch_id("custom id")
     assert bi.id == "custom id"
@@ -47,14 +53,3 @@ def test_set_env_params_in_batch_info():
     assert bi.name == "name"
     assert bi.id == "id"
     assert bi.sequence_name == "sequence name"
-
-
-def test_get_set_id_in_batch_info():
-    bi = BatchInfo()
-    bi.id = "id_1"
-    assert bi.id == "id_1"
-
-    # backward compatibility
-    bi.id_ = "id_2"
-    assert bi.id == "id_2"
-    assert bi.id_ == "id_2"

tests/unit/eyes_selenium/test_eyes.py

@@ -1,4 +1,5 @@
 import json
+import datetime
 
 import pytest
 from mock import patch
@@ -110,12 +111,16 @@ def test_baseline_env_name(eyes, driver_mock):
         assert session_info.baseline_env_name == "Baseline Env"
 
 
-def test_batch_info_sequence_name(eyes, driver_mock):
-    eyes.batch = BatchInfo("Batch Info")
+def test_batch_info_serializing(eyes, driver_mock):
+    date = datetime.datetime.strptime("2019-06-04T10:27:15Z", "%Y-%m-%dT%H:%M:%SZ")
+    eyes.batch = BatchInfo("Batch Info", date)
     eyes.batch.sequence_name = "Sequence"
 
     if not eyes._visual_grid_eyes:
         session_info = open_and_get_start_session_info(eyes, driver_mock)
         info_json = json_utils.to_json(session_info)
         batch_info = json.loads(info_json)["startInfo"]["batchInfo"]
+
+        assert batch_info["name"] == "Batch Info"
         assert batch_info["batchSequenceName"] == "Sequence"
+        assert batch_info["startedAt"] == "2019-06-04T10:27:15Z"