chatview: fix footer on banned contacts

isBlocked doesn't exist, it's isBanned.
Also link spfm and webengine to tests (in order to fix
tst_ChatViewFooter.qml)

Change-Id: Ic4ac0565ba5975213728b16e3e3d5718aa9851b6

src/app/mainview/components/ChatView.qml

@@ -252,7 +252,7 @@ Rectangle {
                     visible: {
                         if (CurrentAccount.type  === Profile.Type.SIP)
                             return true
-                        if (CurrentConversation.isBlocked)
+                        if (CurrentConversation.isBanned)
                             return false
                         else if (CurrentConversation.needsSyncing)
                             return false

tests/CMakeLists.txt

@@ -35,6 +35,7 @@ add_executable(qml_tests
                ${QML_RESOURCES}
                ${QML_RESOURCES_QML}
                ${TEST_QML_RESOURCES}
+               ${SFPM_OBJECTS}
                $<TARGET_OBJECTS:test_common_obj>)
 
 target_link_libraries(qml_tests

tests/qml/main.cpp

@@ -17,20 +17,21 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "mainapplication.h"
-#include "qmlregister.h"
 #include "appsettingsmanager.h"
 #include "connectivitymonitor.h"
-#include "systemtray.h"
+#include "mainapplication.h"
 #include "previewengine.h"
+#include "qmlregister.h"
+#include "systemtray.h"
+#include "videoprovider.h"
 
 #include <atomic>
 
+#include <QFontDatabase>
+#include <QQmlContext>
+#include <QQmlEngine>
 #include <QScopedPointer>
 #include <QtQuickTest/quicktest.h>
-#include <QQmlEngine>
-#include <QQmlContext>
-#include <QFontDatabase>
 #ifdef WITH_WEBENGINE
 #include <QtWebEngineCore>
 #include <QtWebEngineQuick>
@@ -43,17 +44,13 @@
 #include <gnutls/gnutls.h>
 #endif
 
-class Setup : public QObject
+class Setup : public QObject {
-{
   Q_OBJECT
 
 public:
-    Setup(bool muteDring = false)
+  Setup(bool muteDring = false) : muteDring_(muteDring) {}
-        : muteDring_(muteDring)
-    {}
 
-    void init()
+  void init() {
-    {
     connectivityMonitor_.reset(new ConnectivityMonitor(this));
     settingsManager_.reset(new AppSettingsManager(this));
     systemTray_.reset(new SystemTray(settingsManager_.get(), this));
@@ -64,24 +61,20 @@ public:
     gnutls_global_init();
 #endif
 
-        lrcInstance_.reset(
+    lrcInstance_.reset(new LRCInstance(nullptr, nullptr, "",
-            new LRCInstance(nullptr, nullptr, "", connectivityMonitor_.get(), muteDring_));
+                                       connectivityMonitor_.get(), muteDring_));
     lrcInstance_->subscribeToDebugReceived();
 
     auto downloadPath = settingsManager_->getValue(Settings::Key::DownloadPath);
-        lrcInstance_->accountModel().downloadDirectory = downloadPath.toString() + "/";
+    lrcInstance_->accountModel().downloadDirectory =
+        downloadPath.toString() + "/";
   }
 
-    void qmlEngineRegistration(QQmlEngine* engine)
+  void qmlEngineRegistration(QQmlEngine *engine) {
-    {
     // Expose custom types to the QML engine.
-        Utils::registerTypes(engine,
+    Utils::registerTypes(engine, systemTray_.get(), lrcInstance_.get(),
-                             systemTray_.get(),
+                         settingsManager_.get(), previewEngine_.get(),
-                             lrcInstance_.get(),
+                         &screenInfo_, this);
-                             settingsManager_.get(),
-                             previewEngine_.get(),
-                             &screenInfo_,
-                             this);
   }
 
 public Q_SLOTS:
@@ -89,10 +82,7 @@ public Q_SLOTS:
   /*!
    * Called once before qmlEngineAvailable.
    */
-    void applicationAvailable()
+  void applicationAvailable() { init(); }
-    {
-        init();
-    }
 
   /*!
    * Called when the QML engine is available. Any import paths, plugin paths,
@@ -104,8 +94,15 @@ public Q_SLOTS:
    * This function can be used to register QML types and add import paths,
    * amongst other things.
    */
-    void qmlEngineAvailable(QQmlEngine* engine)
+  void qmlEngineAvailable(QQmlEngine *engine) {
-    {
+    auto videoProvider = new VideoProvider(lrcInstance_->avModel(), this);
+    engine->rootContext()->setContextProperty("videoProvider", videoProvider);
+#ifdef WITH_WEBENGINE
+    engine->rootContext()->setContextProperty("WITH_WEBENGINE", QVariant(true));
+#else
+    engine->rootContext()->setContextProperty("WITH_WEBENGINE",
+                                              QVariant(false));
+#endif
     qmlEngineRegistration(engine);
   }
 
@@ -127,9 +124,7 @@ private:
   bool muteDring_{false};
 };
 
-int
+int main(int argc, char **argv) {
-main(int argc, char** argv)
-{
   QDir tempDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
 
   auto jamiDataDir = tempDir.absolutePath() + "\\jami_test\\jami";

tests/qml/src/tst_ChatViewFooter.qml

@@ -22,8 +22,9 @@ import QtQuick.Layouts
 
 import QtTest
 
-import net.jami.Models 1.1
+import net.jami.Adapters 1.1
 import net.jami.Constants 1.1
+import net.jami.Models 1.1
 
 import "../../../src/app/mainview/components"
 
@@ -62,29 +63,6 @@ ColumnLayout {
                 messageBarTextArea.clearText()
                 compare(sendMessageButton.visible, false)
 
-                // File added into filesToSendContainer will cause sendMessageButton to show
-                filesToSendContainer.filesToSendListModel.addToPending(
-                            ":/src/app/resources/png_test.png")
-                compare(filesToSendContainer.filesToSendCount, 1)
-                compare(sendMessageButton.visible, true)
-
-                // Files cleared from filesToSendContainer will cause sendMessageButton to hide
-                filesToSendContainer.filesToSendListModel.flush()
-                compare(filesToSendContainer.filesToSendCount, 0)
-                compare(sendMessageButton.visible, false)
-
-                // When the text and files both exist,
-                // clear one of them will still make sendMessageButton to show
-                messageBarTextArea.insertText("test")
-                filesToSendContainer.filesToSendListModel.addToPending(
-                            ":/src/app/resources/png_test.png")
-                messageBarTextArea.clearText()
-                compare(sendMessageButton.visible, true)
-
-                messageBarTextArea.insertText("test")
-                filesToSendContainer.filesToSendListModel.flush()
-                compare(sendMessageButton.visible, true)
-
                 // Both are cleared
                 messageBarTextArea.clearText()
                 compare(sendMessageButton.visible, false)