Skip to content

Commit

Permalink
Update Composer config for PHPUnit 4.2
Browse files Browse the repository at this point in the history
Remove composer dependency on selenium since it is not available for PHPUnit 4.2, and was not used anyway
Fix OSX test URLs
  • Loading branch information
Synchro committed Aug 11, 2014
1 parent 3234fe3 commit dad2c22
Show file tree
Hide file tree
Showing 3 changed files with 320 additions and 210 deletions.
4 changes: 2 additions & 2 deletions Tests/UAS/ParserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public function testSafari()
);
$this->assertEquals($uas['os_family'], 'OS X');
$this->assertEquals($uas['os_name'], 'OS X 10.8 Mountain Lion');
$this->assertEquals($uas['os_url'], 'http://www.apple.com/osx/');
$this->assertEquals($uas['os_url'], 'http://en.wikipedia.org/wiki/OS_X_Mountain_Lion');
$this->assertEquals($uas['os_company'], 'Apple Computer, Inc.');
$this->assertEquals($uas['os_company_url'], 'http://www.apple.com/');
$this->assertEquals($uas['os_icon'], 'macosx.png');
Expand Down Expand Up @@ -216,7 +216,7 @@ public function testEnv()
);
$this->assertEquals($uas['os_family'], 'OS X');
$this->assertEquals($uas['os_name'], 'OS X 10.8 Mountain Lion');
$this->assertEquals($uas['os_url'], 'http://www.apple.com/osx/');
$this->assertEquals($uas['os_url'], 'http://en.wikipedia.org/wiki/OS_X_Mountain_Lion');
$this->assertEquals($uas['os_company'], 'Apple Computer, Inc.');
$this->assertEquals($uas['os_company_url'], 'http://www.apple.com/');
$this->assertEquals($uas['os_icon'], 'macosx.png');
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
"php": ">=5.3.0"
},
"require-dev": {
"phpunit/phpunit": "4.1.*",
"phpunit/phpunit-selenium": "dev-master",
"phpunit/phpunit": "4.2.*",
"ext-xdebug": "*",
"mikey179/vfsStream": "1.3.*@dev",
"satooshi/php-coveralls": "dev-master",
Expand Down

0 comments on commit dad2c22

Please sign in to comment.