From 5edb528aab97cf51a83012bdc318c97007c52222 Mon Sep 17 00:00:00 2001 From: Deleu Date: Wed, 6 Sep 2017 16:29:05 -0300 Subject: [PATCH 1/4] Let Firefox users disable console --- src/Browser.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Browser.php b/src/Browser.php index 21f000ff6..ed40c7733 100644 --- a/src/Browser.php +++ b/src/Browser.php @@ -229,13 +229,15 @@ public function screenshot($name) */ public function storeConsoleLog($name) { - $console = $this->driver->manage()->getLog('browser'); - - if (! empty($console)) { - file_put_contents( - sprintf('%s/%s.log', rtrim(static::$storeConsoleLogAt, '/'), $name) - , json_encode($console, JSON_PRETTY_PRINT) - ); + if (static::$storeConsoleLogAt !== false) { + $console = $this->driver->manage()->getLog('browser'); + + if (!empty($console)) { + file_put_contents( + sprintf('%s/%s.log', rtrim(static::$storeConsoleLogAt, '/'), $name) + , json_encode($console, JSON_PRETTY_PRINT) + ); + } } return $this; From 876b2ebfdc1fee459e166cdd7574c21fe1209024 Mon Sep 17 00:00:00 2001 From: Deleu Date: Wed, 6 Sep 2017 16:31:52 -0300 Subject: [PATCH 2/4] Loose the checking --- src/Browser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Browser.php b/src/Browser.php index ed40c7733..faf590489 100644 --- a/src/Browser.php +++ b/src/Browser.php @@ -229,7 +229,7 @@ public function screenshot($name) */ public function storeConsoleLog($name) { - if (static::$storeConsoleLogAt !== false) { + if (! is_null(static::$storeConsoleLogAt)) { $console = $this->driver->manage()->getLog('browser'); if (!empty($console)) { From 5eb2adeb80ae4127ef835a9b337d18a5eafd7e4c Mon Sep 17 00:00:00 2001 From: Deleu Date: Wed, 6 Sep 2017 16:46:29 -0300 Subject: [PATCH 3/4] Add Console tests --- tests/BrowserTest.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/BrowserTest.php b/tests/BrowserTest.php index 5558b0446..4a8d82ef5 100644 --- a/tests/BrowserTest.php +++ b/tests/BrowserTest.php @@ -118,6 +118,26 @@ public function test_page_macros() $this->assertTrue($browser->page->macroed); } + + public function test_retrieve_console() + { + $driver = Mockery::mock(StdClass::class); + $driver->shouldReceive('manage->getLog')->with('browser')->andReturnNull(); + $browser = new Browser($driver); + Browser::$storeConsoleLogAt = 'not-null'; + + $browser->storeConsoleLog('file'); + } + + public function test_disable_console() + { + $driver = Mockery::mock(StdClass::class); + $driver->shouldNotReceive('manage'); + $browser = new Browser($driver); + Browser::$storeConsoleLogAt = null; + + $browser->storeConsoleLog('file'); + } } From 0f6e88ef6c9687180a64f610475cb62460ab8a79 Mon Sep 17 00:00:00 2001 From: Deleu Date: Wed, 6 Sep 2017 16:48:31 -0300 Subject: [PATCH 4/4] Loosen up check even more --- src/Browser.php | 2 +- tests/BrowserTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Browser.php b/src/Browser.php index faf590489..882c9ed11 100644 --- a/src/Browser.php +++ b/src/Browser.php @@ -229,7 +229,7 @@ public function screenshot($name) */ public function storeConsoleLog($name) { - if (! is_null(static::$storeConsoleLogAt)) { + if (static::$storeConsoleLogAt) { $console = $this->driver->manage()->getLog('browser'); if (!empty($console)) { diff --git a/tests/BrowserTest.php b/tests/BrowserTest.php index 4a8d82ef5..24816c14e 100644 --- a/tests/BrowserTest.php +++ b/tests/BrowserTest.php @@ -118,7 +118,7 @@ public function test_page_macros() $this->assertTrue($browser->page->macroed); } - + public function test_retrieve_console() { $driver = Mockery::mock(StdClass::class);