summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--.travis.yml2
-rw-r--r--composer.json3
-rw-r--r--composer.lock56
-rwxr-xr-xtests/test_tools/PradoGenericSelenium2Test.php2
5 files changed, 60 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 85b344e6..78ffc0aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,9 @@ bin/dbunit
bin/jsonlint
bin/validate-json
bin/sauce_config
+bin/sauce_connect
bin/paratest
+sauce_connect.log
#OSX
.DS_Store
diff --git a/.travis.yml b/.travis.yml
index 8c0cfc70..f3e2e280 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ before_script:
- export PATH=./bin/:$PATH
- export SAUCE_BUILD=$TRAVIS_BUILD_NUMBER
- export SAUCE_TUNNEL_IDENTIFIER=$TRAVIS_JOB_NUMBER
- - php -S localhost:8888 &
+ - php -S 0.0.0.0:8888 &
- sleep 3
script:
diff --git a/composer.json b/composer.json
index 0a0728cb..778ccfa8 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,8 @@
"phing/phing" : "2.*",
"apigen/apigen": "4.*",
"satooshi/php-coveralls": "dev-master",
- "sauce/sausage": ">=0.15.2"
+ "sauce/sausage": ">=0.15.2",
+ "sauce/connect": ">=3.0"
},
"provide" : {
"pradosoft/prado" : "3.3.0"
diff --git a/composer.lock b/composer.lock
index e0cf0854..6f69ce8d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "a760e82b3a8a4b55a03fec12985918d3",
- "content-hash": "8a6c14386339bd664a33692967ba9691",
+ "hash": "8fe72dcdfcf230bb9e81e5ad2a2e4b75",
+ "content-hash": "7196dbb247307acaab30365ad366758e",
"packages": [],
"packages-dev": [
{
@@ -2806,6 +2806,58 @@
"time": "2016-01-04 18:41:30"
},
{
+ "name": "sauce/connect",
+ "version": "v3.1.32",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/saucelabs/sauce-connect-composer.git",
+ "reference": "936388a5b03d05e2fdc9e5c725eb93511a32ae4c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/saucelabs/sauce-connect-composer/zipball/936388a5b03d05e2fdc9e5c725eb93511a32ae4c",
+ "reference": "936388a5b03d05e2fdc9e5c725eb93511a32ae4c",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0",
+ "sauce/sausage": ">=0.5.0"
+ },
+ "bin": [
+ "bin/sauce_connect"
+ ],
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "Sauce": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Jonathan Lipps",
+ "email": "jlipps@saucelabs.com",
+ "homepage": "http://www.saucelabs.com",
+ "role": "Lead"
+ }
+ ],
+ "description": "PHP package for the Sauce Connect Java binary",
+ "homepage": "http://github.com/saucelabs/sauce-connect-composer",
+ "keywords": [
+ "Sauce",
+ "SauceLabs",
+ "api",
+ "phpunit",
+ "selenium",
+ "testing",
+ "tunnel"
+ ],
+ "time": "2014-04-11 17:57:12"
+ },
+ {
"name": "sauce/sausage",
"version": "0.17.0",
"source": {
diff --git a/tests/test_tools/PradoGenericSelenium2Test.php b/tests/test_tools/PradoGenericSelenium2Test.php
index e006b157..9d252109 100755
--- a/tests/test_tools/PradoGenericSelenium2Test.php
+++ b/tests/test_tools/PradoGenericSelenium2Test.php
@@ -2,7 +2,7 @@
class PradoGenericSelenium2Test extends Sauce\Sausage\WebDriverTestCase
{
- protected $base_url = 'http://localhost:8888';
+ protected $base_url = 'http://localhost:8888/tests/FunctionalTests/';
public static $browsers = array(
// run FF15 on Windows 8 on Sauce
array(