added EULA test to webquery

Author: Skycoder42

src/plugins/updater/qpackagekit/qpackagekitupdaterbackend.cpp

@@ -173,6 +173,7 @@ void QPackageKitUpdaterBackend::package(Transaction::Info info, const QString &p
 	case Transaction::InfoImportant:
 	case Transaction::InfoSecurity:{
 		// TODO check if secondary info is given
+		qCDebug(logPackageKitBackend).nospace() << packageID;
 		auto parts = packageID.split(QStringLiteral(";"));
 		if (!_packageFilter.contains(parts[0]))
 			break;

src/plugins/updater/qwebquery/qwebqueryupdateinstaller.cpp

@@ -66,7 +66,7 @@ void QWebQueryUpdateInstaller::startInstallImpl()
 		const auto eulas = data.value(QStringLiteral("eulas")).toList();
 		for (const auto &eulaVal : eulas) {
 			QString text;
-			auto required = false;
+			auto required = true;
 			if (eulaVal.userType() == QMetaType::QVariantMap) {
 				const auto eulaMap = eulaVal.toMap();
 				text = eulaMap.value(QStringLiteral("text")).toString();
@@ -125,9 +125,10 @@ void QWebQueryUpdateInstaller::replyDone()
 		_hash.reset();
 		_hashResult.clear();
 	}
-	_file->close();
-
-	finishInstall();
+	if (_file) {
+		_file->close();
+		finishInstall();
+	}
 }
 
 void QWebQueryUpdateInstaller::replyData()

tests/auto/plugins/WebQueryTest/tst_webquery.cpp

@@ -121,6 +121,17 @@ QList<UpdateInfo> WebQueryTest::createInfos(const QVersionNumber &versionFrom, c
 						{QStringLiteral("arguments"), QStringList {
 							QVariant{true}.toString(),
 							versionTo.toString()
+						}},
+						{QStringLiteral("eulas"), QVariantList {
+							QStringLiteral("EULA 1"),
+							QVariantMap {
+								{QStringLiteral("text"), QStringLiteral("EULA 2")},
+								{QStringLiteral("required"), true},
+							},
+							QVariantMap {
+								{QStringLiteral("text"), QStringLiteral("EULA 3")},
+								{QStringLiteral("required"), false},
+							}
 						}}
 					}
 				}

tests/auto/plugins/testlib/plugintest.cpp

@@ -197,7 +197,7 @@ void PluginTest::testPerformInstall()
 			installer, [installer](const QVariant &id, const QString &, bool required) {
 		if (required)
 			installer->eulaHandled(id, true);
-	});
+	}, Qt::QueuedConnection);
 
 	// install the updates
 	installer->setComponents(updates);