Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
David Bomba 2016-02-18 08:11:25 +11:00
commit 6383954a85
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/acceptance.suite.yml
View File

@ -8,7 +8,7 @@ class_name: AcceptanceTester
modules: modules:
enabled: enabled:
- WebDriver: - WebDriver:
url: 'http://ninja.dev:8000/' url: 'http://ninja.dev:8000'
host: 127.0.0.1 host: 127.0.0.1
window_size: 1024x768 window_size: 1024x768
wait: 5 wait: 5

2
tests/acceptance/APICest.php
View File

@ -117,7 +117,7 @@ class APICest
$response = curl_exec($curl); $response = curl_exec($curl);
curl_close($curl); curl_close($curl);
Debug::debug('Response: ' . $response); //Debug::debug('Response: ' . $response);
return json_decode($response); return json_decode($response);
} }