Skip to content
This repository was archived by the owner on May 10, 2018. It is now read-only.

Commit 1c0fcd3

Browse files
committed
Enabled tests, update appveyor, trimmed long log text, minor travis change
1 parent 57acc41 commit 1c0fcd3

File tree

4 files changed

+62
-61
lines changed

4 files changed

+62
-61
lines changed

Diff for: .travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ script:
4141

4242
after_script:
4343
- bash <(curl -s https://codecov.io/bash)
44-
- curl -s https://gist.githubusercontent.com/uuf6429/b6df80e2aedd80dd9e5af4cf5575795a/raw/264eaa37db2e56c180977100335f489a6b4d2209/loghighlight.php | php -- tmp/output.log
44+
- php -r "readfile('https://gist.githubusercontent.com/uuf6429/b6df80e2aedd80dd9e5af4cf5575795a/raw/264eaa37db2e56c180977100335f489a6b4d2209/loghighlight.php');" | php -- tmp/output.log

Diff for: appveyor.yml

+53-54
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,53 @@
1-
build: false
2-
platform:
3-
- x86
4-
- x64
5-
clone_folder: c:\projects\MinkElectronDriver
6-
7-
environment:
8-
matrix:
9-
- php_ver_target: 5.6
10-
nodejs_version: 6
11-
- php_ver_target: 7.0
12-
nodejs_version: 6
13-
- php_ver_target: 5.6
14-
nodejs_version: 7
15-
- php_ver_target: 7.0
16-
nodejs_version: 7
17-
18-
cache:
19-
- '%LOCALAPPDATA%\Composer\files -> composer.lock'
20-
- composer.phar
21-
- C:\ProgramData\chocolatey\bin -> .appveyor.yml
22-
- C:\ProgramData\chocolatey\lib -> .appveyor.yml
23-
- c:\tools\php -> .appveyor.yml
24-
25-
init:
26-
- SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
27-
- SET COMPOSER_NO_INTERACTION=1
28-
- SET PHP=1
29-
30-
install:
31-
# Install nodejs
32-
- ps: Install-Product node $env:nodejs_version
33-
# Install php
34-
- IF EXIST c:\tools\php (SET PHP=0)
35-
- ps: appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
36-
- cd c:\tools\php
37-
- IF %PHP%==1 copy php.ini-production php.ini /Y
38-
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini
39-
- IF %PHP%==1 echo extension_dir=ext >> php.ini
40-
- IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
41-
- IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
42-
- IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
43-
# Install composer
44-
- IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
45-
- IF NOT EXIST composer.phar (appveyor DownloadFile https://getcomposer.org/download/1.3.0/composer.phar)
46-
- composer self-update --no-progress --ansi
47-
# Install project composer dependencies
48-
- cd c:\projects\MinkElectronDriver
49-
- composer install --no-progress --ansi
50-
- composer show --ansi
51-
52-
test_script:
53-
- cd c:\projects\MinkElectronDriver
54-
- vendor/bin/phpunit --colors=always -c phpunit.xml.dist
1+
build: false
2+
platform:
3+
- x86
4+
- x64
5+
clone_folder: c:\projects\MinkElectronDriver
6+
7+
environment:
8+
matrix:
9+
- php_ver_target: 7.0
10+
nodejs_version: 6
11+
- php_ver_target: 7.0
12+
nodejs_version: 7
13+
14+
cache:
15+
- '%LOCALAPPDATA%\Composer\files -> composer.lock'
16+
- composer.phar
17+
- C:\ProgramData\chocolatey\bin -> .appveyor.yml
18+
- C:\ProgramData\chocolatey\lib -> .appveyor.yml
19+
- c:\tools\php -> .appveyor.yml
20+
21+
init:
22+
- SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
23+
- SET COMPOSER_NO_INTERACTION=1
24+
- SET PHP=1
25+
26+
install:
27+
# Install nodejs
28+
- ps: Install-Product node $env:nodejs_version
29+
# Install php
30+
- IF EXIST c:\tools\php (SET PHP=0)
31+
- ps: appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
32+
- cd c:\tools\php
33+
- IF %PHP%==1 copy php.ini-production php.ini /Y
34+
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini
35+
- IF %PHP%==1 echo extension_dir=ext >> php.ini
36+
- IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
37+
- IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
38+
- IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
39+
# Install composer
40+
- IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
41+
- IF NOT EXIST composer.phar (appveyor DownloadFile https://getcomposer.org/download/1.3.0/composer.phar)
42+
- composer self-update --no-progress --ansi
43+
# Install project composer dependencies
44+
- cd c:\projects\MinkElectronDriver
45+
- composer install --no-progress --ansi
46+
- composer show --ansi
47+
48+
test_script:
49+
- cd c:\projects\MinkElectronDriver
50+
- vendor/bin/phpunit --colors=always -c phpunit.xml.dist
51+
52+
on_finish:
53+
- php -r "readfile('https://gist.githubusercontent.com/uuf6429/b6df80e2aedd80dd9e5af4cf5575795a/raw/264eaa37db2e56c180977100335f489a6b4d2209/loghighlight.php');" | php -- tmp/output.log

Diff for: src/ElectronServer.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,14 @@ Electron.app.on('ready', function() {
599599
},
600600

601601
getScreenshotResponse: function (cb) {
602-
Logger.debug('getScreenshotResponse() => %j', screenshotResponse);
602+
var b64key = 'base64data',
603+
b64Len = (screenshotResponse[b64key] || {length: 0}).length,
604+
maxData = 2000,
605+
logData = b64Len > maxData
606+
? {'base64data': screenshotResponse[b64key].substr(0, maxData) + '[trimmed ' + (b64Len - maxData) + ' chars]'}
607+
: screenshotResponse;
608+
609+
Logger.debug('getScreenshotResponse() => %j', logData);
603610

604611
cb(screenshotResponse);
605612
},

Diff for: tests/WebDriverTest.php

-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ class WebDriverTest extends TestCase
2020
*/
2121
protected $driver;
2222

23-
public static function setUpBeforeClass()
24-
{
25-
self::markTestSkipped('Temporarily skipped custom tests.');
26-
}
27-
2823
public function setUp()
2924
{
3025
parent::setUp();

0 commit comments

Comments
 (0)