Merge pull request #24085 from owncloud/feedback-on-app-migrations

App migration steps need to push feedback to the user ....

3 files changed, 9 insertions, 13 deletions

diff --git a/tests/data/app/expected-info.json b/tests/data/app/expected-info.json
index d86ffed482b..e05d02f7641 100644
--- a/tests/data/app/expected-info.json
+++ b/tests/data/app/expected-info.json
@@ -67,5 +67,9 @@
 				"max-version": "8"
 			}
 		}
+	},
+	"repair-steps": {
+		"pre-migration": [],
+		"post-migration": []
 	}
 }
diff --git a/tests/lib/app/codechecker/infocheckertest.php b/tests/lib/app/codechecker/infocheckertest.php
index b31c5fe3a7a..c6df5a715a1 100644
--- a/tests/lib/app/codechecker/infocheckertest.php
+++ b/tests/lib/app/codechecker/infocheckertest.php
@@ -43,7 +43,7 @@ class InfoCheckerTest extends TestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		$infoParser = new InfoParser(\OC::$server->getHTTPHelper(), \OC::$server->getURLGenerator());
+		$infoParser = new InfoParser(\OC::$server->getURLGenerator());
 
 		$this->infoChecker = new InfoChecker($infoParser);
 	}
diff --git a/tests/lib/app/infoparser.php b/tests/lib/app/infoparser.php
index 1e5257abec3..cb89dd0131c 100644
--- a/tests/lib/app/infoparser.php
+++ b/tests/lib/app/infoparser.php
@@ -10,35 +10,27 @@
 namespace Test\App;
 
 use OC;
+use OCP\IURLGenerator;
 use Test\TestCase;
 
 class InfoParser extends TestCase {
 
-	/**
-	 * @var \OC\App\InfoParser
-	 */
+	/** @var \OC\App\InfoParser */
 	private $parser;
 
 	public function setUp() {
-		$config = $this->getMockBuilder('\OCP\IConfig')
-			->disableOriginalConstructor()->getMock();
-		$clientService = $this->getMock('\OCP\Http\Client\IClientService');
-		$httpHelper = $this->getMockBuilder('\OC\HTTPHelper')
-			->setConstructorArgs([$config, $clientService])
-			->setMethods(['getHeaders'])
-			->getMock();
 		$urlGenerator = $this->getMockBuilder('\OCP\IURLGenerator')
 			->disableOriginalConstructor()
 			->getMock();
 
-		//linkToDocs
+		/** @var IURLGenerator | \PHPUnit_Framework_MockObject_MockObject $urlGenerator */
 		$urlGenerator->expects($this->any())
 			->method('linkToDocs')
 			->will($this->returnCallback(function ($url) {
 				return "https://docs.example.com/server/go.php?to=$url";
 			}));
 
-		$this->parser = new \OC\App\InfoParser($httpHelper, $urlGenerator);
+		$this->parser = new \OC\App\InfoParser($urlGenerator);
 	}
 
 	/**