From 45d81b0eec67d1f367b8e532244afdf173d801f1 Mon Sep 17 00:00:00 2001 From: Simon Zalar Date: Mon, 5 Jun 2017 23:47:00 +0200 Subject: [PATCH 01/12] added screenshot dir --- src/Dusk.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Dusk.php b/src/Dusk.php index 95690d8..2e5f48b 100644 --- a/src/Dusk.php +++ b/src/Dusk.php @@ -15,6 +15,7 @@ class Dusk */ private $browser; + private $dir; /** * Create a new instance. @@ -88,7 +89,17 @@ public function getDriver() */ public function screenshot($filename) { - $this->getDriver()->takeScreenshot("/tmp/{$filename}.png"); + $this->getDriver()->takeScreenshot($this->dir . "/{$filename}.png"); + + return $this; + } + + public function screenshotDir($dir = null) + { + if( empty($dir) ){ + return $this->dir; + } + $this->dir = $dir; return $this; } From 4969cc8aa500d2ac1624311df60ac09ed343d983 Mon Sep 17 00:00:00 2001 From: Simon Zalar Date: Mon, 3 Jul 2017 22:06:57 +0200 Subject: [PATCH 02/12] Fixed error --- src/Dusk.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Dusk.php b/src/Dusk.php index 2e5f48b..22b3424 100644 --- a/src/Dusk.php +++ b/src/Dusk.php @@ -29,6 +29,7 @@ public function __construct(DriverInterface $driver = null) } $this->browser = new Browser($driver->getDriver()); + $this->driver = $driver; } From 3030809bb90cdb98c41ad96ecad987d9b5b9c4b9 Mon Sep 17 00:00:00 2001 From: Simon Zalar Date: Mon, 14 Aug 2017 15:56:28 +0200 Subject: [PATCH 03/12] Update composer.json --- composer.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 37b0935..85c0574 100644 --- a/composer.json +++ b/composer.json @@ -5,6 +5,12 @@ "keywords": ["laravel", "browser", "engine", "screen", "scraping"], "homepage": "https://github.com/duncan3dc/dusk", "license": "Apache-2.0", + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/SimZal/dusk-1.git" + } + ], "authors": [{ "name": "Craig Duncan", "email": "git@duncanc.co.uk", @@ -12,7 +18,7 @@ "role": "Developer" }], "require": { - "laravel/dusk": ">=1.0,<1.2", + "laravel/dusk": "dev-improvements", "php": "^5.6|^7.0" }, "require-dev": { From b65cb1bbd534de03dded4400f61752b422332341 Mon Sep 17 00:00:00 2001 From: Simon Zalar Date: Mon, 14 Aug 2017 16:03:51 +0200 Subject: [PATCH 04/12] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 85c0574..180e07b 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "role": "Developer" }], "require": { - "laravel/dusk": "dev-improvements", + "laravel/dusk": "dev-master", "php": "^5.6|^7.0" }, "require-dev": { From db07adc4790f7bbc8fcab6213a7791e6cc12855b Mon Sep 17 00:00:00 2001 From: Simon Zalar Date: Mon, 14 Aug 2017 16:05:46 +0200 Subject: [PATCH 05/12] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 180e07b..0348793 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "role": "Developer" }], "require": { - "laravel/dusk": "dev-master", + "laravel/dusk-1": "dev-master", "php": "^5.6|^7.0" }, "require-dev": { From c5f5f987f4b6bcb1ec56ae4b032511279cf163d8 Mon Sep 17 00:00:00 2001 From: Simon Zalar Date: Mon, 14 Aug 2017 16:52:59 +0200 Subject: [PATCH 06/12] Update composer.json --- composer.json | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 0348793..2e2ce9d 100644 --- a/composer.json +++ b/composer.json @@ -6,10 +6,18 @@ "homepage": "https://github.com/duncan3dc/dusk", "license": "Apache-2.0", "repositories": [ - { - "type": "vcs", - "url": "https://github.com/SimZal/dusk-1.git" - } + { + "type": "package", + "package": { + "version": "dev-improvements", + "name": "SimZal/dusk", + "source": { + "url": "https://github.com/SimZal/dusk-1.git", + "type": "git", + "reference": "improvements" + } + } + } ], "authors": [{ "name": "Craig Duncan", @@ -18,7 +26,7 @@ "role": "Developer" }], "require": { - "laravel/dusk-1": "dev-master", + "laravel/dusk": "*", "php": "^5.6|^7.0" }, "require-dev": { From 2e6bce216a5f86637677c06e1b07a480cc8ea3fc Mon Sep 17 00:00:00 2001 From: Simon Zalar Date: Mon, 14 Aug 2017 16:54:33 +0200 Subject: [PATCH 07/12] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2e2ce9d..d09baed 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "role": "Developer" }], "require": { - "laravel/dusk": "*", + "SimZal/dusk": "*", "php": "^5.6|^7.0" }, "require-dev": { From 9866ff9ef83b66c3015d6da1250de94504995138 Mon Sep 17 00:00:00 2001 From: Simon Zalar Date: Mon, 14 Aug 2017 16:55:34 +0200 Subject: [PATCH 08/12] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d09baed..33d54a3 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "type": "package", "package": { "version": "dev-improvements", - "name": "SimZal/dusk", + "name": "SimZal/dusk-1", "source": { "url": "https://github.com/SimZal/dusk-1.git", "type": "git", @@ -26,7 +26,7 @@ "role": "Developer" }], "require": { - "SimZal/dusk": "*", + "SimZal/dusk-1": "*", "php": "^5.6|^7.0" }, "require-dev": { From 7f3433fd3dce6c8da6be05fe783285e2838abfa5 Mon Sep 17 00:00:00 2001 From: Simon Zalar Date: Mon, 14 Aug 2017 17:01:18 +0200 Subject: [PATCH 09/12] Update composer.json --- composer.json | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 33d54a3..a3d000b 100644 --- a/composer.json +++ b/composer.json @@ -7,16 +7,8 @@ "license": "Apache-2.0", "repositories": [ { - "type": "package", - "package": { - "version": "dev-improvements", - "name": "SimZal/dusk-1", - "source": { - "url": "https://github.com/SimZal/dusk-1.git", - "type": "git", - "reference": "improvements" - } - } + "type": "vcs", + "url": "https://github.com/SimZal/dusk-1.git" } ], "authors": [{ @@ -26,7 +18,7 @@ "role": "Developer" }], "require": { - "SimZal/dusk-1": "*", + "laravel/dusk": "dev-improvements", "php": "^5.6|^7.0" }, "require-dev": { From 63b3e4eebf30503083b449ba3005489a189829b7 Mon Sep 17 00:00:00 2001 From: Simon Zalar Date: Mon, 14 Aug 2017 17:19:43 +0200 Subject: [PATCH 10/12] Update composer.json --- composer.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/composer.json b/composer.json index a3d000b..37b0935 100644 --- a/composer.json +++ b/composer.json @@ -5,12 +5,6 @@ "keywords": ["laravel", "browser", "engine", "screen", "scraping"], "homepage": "https://github.com/duncan3dc/dusk", "license": "Apache-2.0", - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/SimZal/dusk-1.git" - } - ], "authors": [{ "name": "Craig Duncan", "email": "git@duncanc.co.uk", @@ -18,7 +12,7 @@ "role": "Developer" }], "require": { - "laravel/dusk": "dev-improvements", + "laravel/dusk": ">=1.0,<1.2", "php": "^5.6|^7.0" }, "require-dev": { From a98e7bb9a2dcceace5dd9511347158ee217c8573 Mon Sep 17 00:00:00 2001 From: Simon Zalar Date: Thu, 17 Jan 2019 13:02:27 +0700 Subject: [PATCH 11/12] Update Chrome.php --- src/Drivers/Chrome.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Drivers/Chrome.php b/src/Drivers/Chrome.php index 369b81c..75d5f51 100644 --- a/src/Drivers/Chrome.php +++ b/src/Drivers/Chrome.php @@ -5,6 +5,8 @@ use Facebook\WebDriver\Remote\DesiredCapabilities; use Facebook\WebDriver\Remote\RemoteWebDriver; use Laravel\Dusk\SupportsChrome; +use Facebook\WebDriver\Chrome\ChromeOptions; +use Facebook\WebDriver\Remote\WebDriverCapabilityType; class Chrome implements DriverInterface { @@ -27,7 +29,17 @@ public function __construct() */ public function getDriver() { - return RemoteWebDriver::create("http://localhost:9515", DesiredCapabilities::chrome()); + $options = (new ChromeOptions)->addArguments([ + '--headless', + '--disable-gpu', + '--no-sandbox', + '--ignore-certificate-errors', + ]); + $cap = DesiredCapabilities::chrome(); + $cap->setCapability(ChromeOptions::CAPABILITY, $options); + $cap->setCapability(WebDriverCapabilityType::ACCEPT_SSL_CERTS, true); + $cap->setCapability('acceptInsecureCerts', true); + return RemoteWebDriver::create("http://localhost:9515", $cap); } From 1c14e9ba7828f05b1b0cfb511d4a6a9927ec3335 Mon Sep 17 00:00:00 2001 From: Simon Zalar Date: Mon, 14 Sep 2020 20:27:57 +0700 Subject: [PATCH 12/12] Update Chrome.php --- src/Drivers/Chrome.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Drivers/Chrome.php b/src/Drivers/Chrome.php index 75d5f51..54e3fc6 100644 --- a/src/Drivers/Chrome.php +++ b/src/Drivers/Chrome.php @@ -34,6 +34,7 @@ public function getDriver() '--disable-gpu', '--no-sandbox', '--ignore-certificate-errors', + 'window-size=1280,960', ]); $cap = DesiredCapabilities::chrome(); $cap->setCapability(ChromeOptions::CAPABILITY, $options);