EXT: Add the current client version (#9823)

* add version info to the status * test that * fix test? * duh
mozilla-mobile · Sep 3, 2024 · 040eca1 · 040eca1
1 parent cee1543
commit 040eca1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/webextensionadapter.cpp b/src/webextensionadapter.cpp
@@ -132,6 +132,7 @@ QJsonObject WebExtensionAdapter::serializeStatus() {
  QJsonObject obj;
  obj["authenticated"] = App::isUserAuthenticated();
  obj["location"] = locationObj;
+ obj["version"] = Constants::versionString();
  obj["connectedSince"] =
  QString::number(vpn->controller()->connectionTimestamp());
  {

diff --git a/tests/functional/testWebExtensionApi.js b/tests/functional/testWebExtensionApi.js
@@ -12,7 +12,8 @@ const {
  getMessageStream,
  ExtensionMessage,
  readResponseOfType
-} = require('./utils/webextension.js')
+} = require('./utils/webextension.js');
+
 
 if(!vpn.runningOnWasm()) {
 
@@ -23,8 +24,10 @@ describe('WebExtension API', function() {
  it('A Webextension can query the Status of the VPN', async () => {
  const sock = await connectExtension();
  const messagePipe = getMessageStream(sock);
+ const statusPromise = readResponseOfType('status', messagePipe);
  sentToClient(new ExtensionMessage('status'), sock);
- await readResponseOfType('status', messagePipe);
+ const msg = await statusPromise
+ assert(msg.status.version, `A Version is sent in msg: ${JSON.stringify(msg)}` )
  sock.destroy();
  });
  it('A Webextension can activate the VPN', async () => {