Commit b4a658fb authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge changes I0c96e364,I906089c8 into 15.04_STABLE

* changes:
  Move WebService "markTestSkipped" to setup (Bug 1515473)
  Call parent::setUp() in WebServiceTestBase (Bug 1515473)
parents 9e765200 ba3f804f
......@@ -77,6 +77,10 @@ class WebServiceTestBase extends MaharaUnitTest {
* Setup test data
*/
protected function setUp() {
parent::setUp();
$this->markTestSkipped('cURL requests need to be mocked properly. Skipping for now.');
// default current user to admin
global $USER;
$USER->id = 1;
......@@ -277,7 +281,6 @@ class WebServiceTestBase extends MaharaUnitTest {
* of iterations, auth types, and protocols
*/
public function testRun() {
$this->markTestSkipped('cURL requests need to be mocked properly. Skipping for now.');
// do we have any tests
if (!$this->testrest and !$this->testxmlrpc and !$this->testsoap) {
log_debug("Web service unit tests are not run as not setup (see /webservice/simpletest/testwebservice.php)");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment