From 9b6bfd35b202de422c6464bdfa84e19aae4b72d6 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Wed, 15 Apr 2020 12:18:32 -0700
Subject: [PATCH] Version 0.7.1

---
 CHANGELOG             |  3 +++
 CloudronManifest.json |  2 +-
 test/test.js          | 11 +++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 18d5a6b..ca538ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -107,3 +107,6 @@
 [0.7.0]
 * Set turn_uris to an array and not a string
 
+[0.7.1]
+* Users will now automatically join the #discuss channel (only in new installations)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index c5d1652..f575ade 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Secure & decentralized communication",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "healthCheckPath": "/",
   "httpPort": 8008,
   "memoryLimit": 536870912,
diff --git a/test/test.js b/test/test.js
index 27b89db..45423d1 100644
--- a/test/test.js
+++ b/test/test.js
@@ -75,6 +75,16 @@ describe('Application life cycle test', function () {
         });
     }
 
+    function checkAutoJoinRoom(done) {
+        superagent.get('https://' + app.fqdn + '/_matrix/client/r0/joined_rooms?access_token=' + token).end(function (error, result) {
+            if (error) return done(error);
+            if (result.statusCode !== 200) return done(new Error('Room listing failed with status ' + result.statusCode));
+
+            if (result.body.joined_rooms.length !== 1) return done(new Error('User must have auto-joined discuss channel:' + result.statusCode));
+            done();
+        });
+    }
+
     function createRoom(done) {
         superagent.post('https://' + app.fqdn + '/_matrix/client/r0/createRoom?access_token=' + token).send({
             room_alias_name: 'general'
@@ -118,6 +128,7 @@ describe('Application life cycle test', function () {
 
     it('check landing page', checkLandingPage);
     it('can login', checkLogin);
+    it('check autojoin', checkAutoJoinRoom);
     it('create room', createRoom);
     it('check room', checkRoom);