fix: bugfix for log beginning copied to every test log

wix · May 18, 2018 · 7c6ecd5 · 7c6ecd5
1 parent f3c5f2b
commit 7c6ecd5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/detox/src/artifacts/log/ios/SimulatorLogRecorder.js b/detox/src/artifacts/log/ios/SimulatorLogRecorder.js
@@ -2,23 +2,27 @@ const tempfile = require('tempfile');
 const Recorder = require('../../core/factory/Recorder');
 const SimulatorLogRecording = require('./SimulatorLogRecording');
 
-// TODO: implement
 class SimulatorLogRecorder extends Recorder {
   constructor(config) {
     super(config);
 
     this.appleSimUtils = config.appleSimUtils;
     this.udid = config.udid;
+    this.started = false;
   }
 
   createRecording() {
     const { stdout, stderr } = this.appleSimUtils.getLogsPaths(this.udid);
 
-    return new SimulatorLogRecording({
+    const recording = new SimulatorLogRecording({
       stdoutPath: stdout,
       stderrPath: stderr,
       temporaryLogPath: tempfile('.log'),
+      fromBeginning: !this.started,
     });
+
+    this.started = true;
+    return recording;
   }
 }
 

diff --git a/detox/src/artifacts/log/ios/SimulatorLogRecording.js b/detox/src/artifacts/log/ios/SimulatorLogRecording.js
@@ -9,12 +9,14 @@ class SimulatorLogRecording extends RecordingArtifact {
     stdoutPath,
     stderrPath,
     temporaryLogPath,
+    fromBeginning,
   }) {
     super();
 
     this._logPath = temporaryLogPath;
     this._stdoutPath = stdoutPath;
     this._stderrPath = stderrPath;
+    this._fromBeginning = fromBeginning;
 
     this._logStream = null;
     this._stdoutTail = null;
@@ -44,7 +46,7 @@ class SimulatorLogRecording extends RecordingArtifact {
 
   _createTail(file, prefix) {
     const tail = new Tail(file, {
-      fromBeginning: true,
+      fromBeginning: this._fromBeginning,
       logger: {
         info: (...args) => npmlog.verbose(`simulator-log-${prefix}`, ...args),
         error: (...args) => npmlog.error(`simulator-log-${prefix}`, ...args),
@@ -53,10 +55,20 @@ class SimulatorLogRecording extends RecordingArtifact {
       this._appendLine(prefix, line);
     });
 
-    tail.watchEvent.call(tail, "change");
+    if (this._fromBeginning) {
+      this._triggerTailReadUsingHack(tail);
+    }
+
     return tail;
   }
 
+  /***
+   * @link https://github.com/lucagrulla/node-tail/issues/40
+   */
+  _triggerTailReadUsingHack(tail) {
+    tail.watchEvent.call(tail, "change");
+  }
+
   _appendLine(prefix, line) {
     this._logStream.write(prefix);
     this._logStream.write(': ');